From d5169c9fa423292a1efc372b804b0a1eecad8dee Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 12:37:15 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index d226d7e..918f70c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -477,6 +477,11 @@
orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
}
+ //如果状态时取消状态，更新时间为去取消时间
+ if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx){
+ orderVO.setCancelTime(shopOrderDO.getUpdateAt());
+ }
+
return R.ok(orderVO);
}
@@ -641,7 +646,7 @@
if (comShopOrderDO == null) {
return R.fail("订单不存在");
}
- if (!(comShopOrderDO.getStatus() == 1) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
+ if (!(comShopOrderDO.getStatus() == 8) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
return R.fail("订单发货失败,订单状态不允许发货");
}
--
Gitblit v1.7.1