From 81d9838b3ab55e66cd3553ba079157e27b09933c Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 21 四月 2021 21:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 a1f380d..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
@@ -559,8 +559,13 @@
return R.fail("订单不存在");
}
if(!(comShopOrderDO.getStatus()==2)
- || !(comShopOrderDO.getDeleteStatus()==1)){
+ || !(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);
@@ -580,11 +585,17 @@
if(comShopOrderDO==null){
return R.fail("订单不存在");
}
- if(!(comShopOrderDO.getStatus()==2)){
+ if(!(comShopOrderDO.getStatus()==2)
+ || !(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);
int updated = comShopOrderDAO.updateById(comShopOrderDO);
if(updated==1){
return R.ok("开始配送");
--
Gitblit v1.7.1