修改物流

platform-admin/src/main/java/com/platform/service/impl/TbCfOrderServiceImpl.java

@@ -11,6 +11,7 @@ import com.platform.utils.IdUtil;
 import com.platform.utils.ShiroUtils;
 import com.platform.utils.StringUtils;
 import com.platform.vo.PlatformOrderVo;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     private SysUserDao sysUserDao;
     @Autowired
     private TbCfItemOrderRDao tbCfItemOrderRDao;
+
     @Override
     public TbCfOrderEntity queryObject(String orderId) {
         return tbCfOrderDao.queryObject(orderId);
@@ -55,7 +57,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         tbCfOrder.setOrderId(IdUtil.createIdbyUUID());
         return tbCfOrderDao.save(tbCfOrder);
     }
-    
+
     @Override
     public int update(TbCfOrderEntity tbCfOrder) {
         return tbCfOrderDao.update(tbCfOrder);
@@ -85,53 +87,57 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     @Override
     public int saveOrUpdateAgentInfo(PlatformOrderVo tbCfPlatformOrder) {
         //tbCfPlatformOrder 有relativeId 则就是修改
-        int res=0;
-        if(StringUtils.isNotEmpty(tbCfPlatformOrder.getRelativeId())) {
+        int res = 0;
+        if (StringUtils.isNotEmpty(tbCfPlatformOrder.getRelativeId())) {
             tbCfPlatformOrder.setRelativeId(tbCfPlatformOrder.getRelativeId());
-            String userId=ShiroUtils.getUserId();
+            String userId = ShiroUtils.getUserId();
             tbCfPlatformOrder.setUserId(userId);
             tbCfPlatformOrder.setUserName(sysUserDao.queryById(userId));
             res = tbCfPlatformOrderDao.updates(tbCfPlatformOrder);
-            } else {
+        } else {
             tbCfPlatformOrder.setRelativeId(tbCfPlatformOrder.getOrdersId());
             tbCfPlatformOrder.setOrderId(tbCfItemOrderRDao.getOrderId(tbCfPlatformOrder.getOrdersId()));
             tbCfPlatformOrder.setCreateTime(new Date());
-            String userId=ShiroUtils.getUserId();
+            String userId = ShiroUtils.getUserId();
             tbCfPlatformOrder.setUserId(userId);
             tbCfPlatformOrder.setUserName(sysUserDao.queryById(userId));
             res = tbCfPlatformOrderDao.save(tbCfPlatformOrder);
         }
         //如果填写了快递单号，那么意味着已代购，需要更改发货状态
-        if(StringUtils.isNotEmpty(tbCfPlatformOrder.getpExpressNumber())) {
+        if (StringUtils.isNotEmpty(tbCfPlatformOrder.getpExpressNumber())) {
             TbCfItemOrderREntity tbCfItemOrderREntity2 = new TbCfItemOrderREntity();
             tbCfItemOrderREntity2.setOrderItemId(tbCfPlatformOrder.getOrdersId());
             tbCfItemOrderREntity2.setDeliveryFlag(DeliveryStatusEnum.PURCHASE.getValue());
             tbCfItemOrderREntity2.setOrderStatus(OrderStatusEnum.SHIPPED.getValue());
             tbCfItemOrderRDao.update(tbCfItemOrderREntity2);
             List<TbCfItemDetailEntity> orderItemList = tbCfOrderDao.getOrderItemList(tbCfPlatformOrder.getOrderId());
-            Set<Integer> status=new HashSet<>();
-            for(TbCfItemDetailEntity itemList:orderItemList){
-                TbCfItemOrderREntity tbCfItemOrder=tbCfItemOrderRDao.getOrderItemId(tbCfPlatformOrder.getOrderId(), itemList.getItemId());
+            boolean flag = false;
+            List<Integer> statusList = new ArrayList<>();
+            for (TbCfItemDetailEntity itemList : orderItemList) {
+                TbCfItemOrderREntity tbCfItemOrder = tbCfItemOrderRDao.getOrderItemId(tbCfPlatformOrder.getOrderId(), itemList.getItemId());
                 Integer orderStatus = tbCfItemOrder.getOrderStatus();
-                status.add(orderStatus);
+                statusList.add(orderStatus);
+            }
+            if (!orderItemList.contains("20")) {
+                flag = true;
             }
-            Iterator it = status.iterator();
-            while(it.hasNext()){
-                if(status.size()==1 && "40".equals(it.next())){
-                    TbCfOrderEntity tbCfOrderEntity=new TbCfOrderEntity();
-                    tbCfOrderEntity.setOrderId(tbCfPlatformOrder.getOrderId());
-                    tbCfOrderEntity.setOrderStatus(OrderStatusEnum.SHIPPED.getValue());
-                    tbCfOrderDao.update(tbCfOrderEntity);
-                }
+            if (flag) {
+                TbCfOrderEntity tbCfOrderEntity = new TbCfOrderEntity();
+                tbCfOrderEntity.setOrderId(tbCfPlatformOrder.getOrderId());
+                tbCfOrderEntity.setOrderStatus(OrderStatusEnum.SHIPPED.getValue());
+                tbCfOrderDao.update(tbCfOrderEntity);
             }
+
+
             //更新发货时间，如果原值为空就更新，否则保留原值
-            TbCfItemOrderREntity tbCfItemOrderREntity3= new TbCfItemOrderREntity();
+            TbCfItemOrderREntity tbCfItemOrderREntity3 = new TbCfItemOrderREntity();
             tbCfItemOrderREntity3.setOrderItemId(tbCfPlatformOrder.getOrdersId());
             tbCfItemOrderREntity3.setDeliveryTime(new Date());
             tbCfItemOrderRDao.updateDeliveryTime(tbCfItemOrderREntity3);
         }
         return res;
     }
+
     @Override
     public List<TbCfOrderEntity> queryOrderDetail(String ordersId) {
         return tbCfOrderDao.queryOrderDetail(ordersId);