提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/service/impl/OrderDetailVoServiceImpl.java

@@ -1,12 +1,18 @@
 package com.xingxi.web.controller.business.order.service.impl;
 
+import com.xingxi.business.Order.domain.Order;
 import com.xingxi.business.Order.domain.OrderDelivery;
 import com.xingxi.business.Order.domain.OrderDeliveryExpr;
+import com.xingxi.business.Order.domain.OrderDetail;
 import com.xingxi.business.Order.mapper.OrderDeliveryExprMapper;
 import com.xingxi.business.Order.mapper.OrderDeliveryMapper;
+import com.xingxi.business.Order.mapper.OrderDetailMapper;
+import com.xingxi.business.Order.mapper.OrderMapper;
 import com.xingxi.common.core.text.Convert;
 import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.common.enums.EOrderDeliveryStatus;
+import com.xingxi.common.enums.EOrderDetailStatus;
+import com.xingxi.common.enums.EOrderStatus;
 import com.xingxi.common.exception.BusinessException;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.ShiroUtils;
@@ -34,6 +40,10 @@ import java.util.List;
 @Service
 public class OrderDetailVoServiceImpl implements IOrderDetailVoService {
     @Resource
+    private OrderMapper orderMapper;
+    @Resource
+    private OrderDetailMapper orderDetailMapper;
+    @Resource
     private OrderDetailVoMapper orderDetailVoMapper;
     @Resource
     private OrderDeliveryMapper orderDeliveryMapper;
@@ -141,6 +151,17 @@ public class OrderDetailVoServiceImpl implements IOrderDetailVoService {
                         successNum++;
                         successMsg.append("<br/>" + successNum + "、发货单编号 " + vendorOrderDetailVo.getOrderDeliveryId() + " 导入成功");
                     }
+                    OrderDetail updateOrderDetail = orderDetailMapper.selectOrderDetailByOrderDetailId(checkObject.getOrderDetailId());
+                    updateOrderDetail.setOrderDetailStatus(EOrderDetailStatus.DELIVERED.getVal());
+                    updateOrderDetail.setUpdateUser(ShiroUtils.getLoginName());
+                    updateOrderDetail.setUpdateTime(nowDate);
+                    orderDetailMapper.updateOrderDetail(updateOrderDetail);
+
+                    Order updateOrder = orderMapper.selectOrderByOrderId(updateOrderDetail.getOrderId());
+                    updateOrder.setOrderStatus(EOrderStatus.DELIVERED.getVal());
+                    updateOrder.setUpdateUser(ShiroUtils.getLoginName());
+                    updateOrder.setUpdateTime(nowDate);
+                    orderMapper.updateOrder(updateOrder);
                 } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、发货单编号 " + vendorOrderDetailVo.getOrderDeliveryId() + " 已存在");