From 428bb63ebaf67e9ba4f6bd338b88a5da1e5d2afa Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 22 四月 2021 09:44:23 +0800
Subject: [PATCH] fix:编辑商品修改逻辑代码
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 1eb12f5..5bfbc88 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -562,6 +562,11 @@
|| !(comShopOrderDO.getDeliveryStatus()==1)){
return R.fail("订单发货失败,订单状态不允许发货");
}
+
+ ComShopStoreDO storeDO = comShopStoreDAO.selectById(comShopOrderDO.getStoreId());
+ if(storeDO.getDeliveryType()!=2){
+ return R.fail("该商家不支持通过快递物流发货");
+ }
comShopOrderDO.setDeliveryStatus(2);
comShopOrderDO.setDeliveryType(2);
comShopOrderDO.setStatus(3);
@@ -584,6 +589,10 @@
|| !(comShopOrderDO.getDeliveryStatus()==1)){
return R.fail("当前订单不能配送");
}
+ ComShopStoreDO storeDO = comShopStoreDAO.selectById(comShopOrderDO.getStoreId());
+ if(storeDO.getDeliveryType()!=1){
+ return R.fail("该商家不支持通过商家配送");
+ }
comShopOrderDO.setDeliveryStatus(4);
comShopOrderDO.setDeliveryType(1);
comShopOrderDO.setStatus(3);
--
Gitblit v1.7.1