clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修改主单状态问题修复

This commit is contained in:
donqi 2022-11-14 01:01:47 +08:00
parent be38bd80d9
commit 1c4c3f66f3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -12,6 +12,8 @@ import com.ghy.common.enums.OrderStatus;
import com.ghy.common.enums.PayStatus; import com.ghy.common.enums.PayStatus;
import com.ghy.common.exception.base.BaseException; import com.ghy.common.exception.base.BaseException;
import com.ghy.common.utils.AdapayUtils; import com.ghy.common.utils.AdapayUtils;
import com.ghy.common.utils.ObjectUtils;
import com.ghy.common.utils.StringUtils;
import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderMaster; import com.ghy.order.domain.OrderMaster;
import com.ghy.order.mapper.OrderDetailMapper; import com.ghy.order.mapper.OrderDetailMapper;
@ -92,6 +94,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 查子单信息 // 查子单信息
OrderDetail detailInfo = this.orderDetailMapper.selectById(orderDetail.getId()); OrderDetail detailInfo = this.orderDetailMapper.selectById(orderDetail.getId());
// 判断是否需要更新主单状态.即是否有 // 判断是否需要更新主单状态.即是否有
// 1.更新大于当前 detail 1/2/3
for (OrderDetail detail : orderDetailMapper.selectByOrderMasterId(detailInfo.getOrderMasterId())) { for (OrderDetail detail : orderDetailMapper.selectByOrderMasterId(detailInfo.getOrderMasterId())) {
if (detail.getOrderStatus() < orderStatus) { if (detail.getOrderStatus() < orderStatus) {
flag = false; flag = false;
@ -100,7 +103,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
} }
if (flag) { if (flag) {
OrderMaster orderMaster = orderMasterMapper.selectById(detailInfo.getOrderMasterId()); OrderMaster orderMaster = orderMasterMapper.selectById(detailInfo.getOrderMasterId());
if (orderMaster.getOrderStatus() != OrderStatus.PLAIN.code()) { if (ObjectUtils.isEmpty(orderDetail.getExpectTimeStart())) {
orderMaster.setOrderStatus(orderStatus); orderMaster.setOrderStatus(orderStatus);
orderMasterMapper.updateOrderMaster(orderMaster); orderMasterMapper.updateOrderMaster(orderMaster);
} }