修改bug

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -545,7 +545,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return ResponseDto.failure("无法发货");
         }
         List<String> backOrderIds = redisUtils.getBackOrderByOrderId(orderId);
-        for (String backOrderId:backOrderIds) {
+        for (String backOrderId : backOrderIds) {
             GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
             if (!(backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_3.getValue()) || backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_5.getValue()) || backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_9.getValue()))) {
                 return ResponseDto.failure("申请失败");
@@ -575,7 +575,6 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 mailVo.getLogisticsCompany(), StringUtils.join(mailVo.getOrderSkuVoIds(), ","), now
         });
 
-        orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_3.getValue());
         for (String orderSkuId : skuIds) {
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
             orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_3.getValue());
@@ -589,6 +588,17 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                     orderSkuVo.getOrderSkuId(), now, now
             });
         }
+        int sendSize = 0;
+        for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
+            GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+            if (orderSkuVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue() || orderSkuVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue()) {
+                sendSize++;
+            }
+        }
+        if (sendSize == orderVo.getOrderSkuVoIds().size()) {
+            orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_3.getValue());
+        }
+
         GoblinOrderOperationLog log = initLog(orderId, uid, now);
         log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_13.getValue());
         log.setRemark("发货：orderId=[" + orderId + "],orderSkuId=[" + StringUtils.join(skuIds, ",") + "],mailNo=[" + mailNo + "]");