数据分流

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -497,6 +497,10 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             deliverNumbers = deliverNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
         }
         int count = metaHanaDeliverOrderMapper.selectCount();
+        List<TmsLogisticsStatus> tmslistNo = new ArrayList<TmsLogisticsStatus>();
+        List<TmsLogisticsStatus> tmslistYes = new ArrayList<TmsLogisticsStatus>();
+        List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
+        List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
         int m = 10000;
         int y = 0;
         if (count % m != 0) {
@@ -511,10 +515,6 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             }
             List<MetaHanaDeliverOrder> deliverOrderListstatusNo  = metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByNo(n, m);
             if (deliverOrderListstatusNo != null && deliverOrderListstatusNo.size() > 0) {
-                List<TmsLogisticsStatus> tmslistNo = new ArrayList<TmsLogisticsStatus>();
-                List<TmsLogisticsStatus> tmslistYes = new ArrayList<TmsLogisticsStatus>();
-                List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
-                List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
                 for (MetaHanaDeliverOrder deliver : deliverOrderListstatusNo
                 ) {
                     if (plants != null && plants.size() > 0) {
@@ -523,8 +523,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                         }
                     }
                     if (("未复核").equals(deliver.getReviewStatus())) {
-                        List<String> tms = tmslistNo.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
-                        if ((keytmsMap == null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber()))) {
+                        List<String> tms=new ArrayList<>();
+                        if(tmslistNo !=null && tmslistNo.size()>0){
+                             tms = tmslistNo.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
+                        }
+                        if ((keytmsMap == null) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber()))) {
                             TmsLogisticsStatus tmsLogisticsStatus = new TmsLogisticsStatus();
                             tmsLogisticsStatus.setCreateBy("HBS");
                             tmsLogisticsStatus.setCreateTime(new Date());
@@ -557,8 +560,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                             }
                         }
                     }else if(("已复核").equals(deliver.getReviewStatus())){
-                            List<String> tms = tmslistYes.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
-                            if ((keytmsMap == null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber()))) {
+                        List<String> tms=new ArrayList<>();
+                        if(tmslistYes !=null && tmslistYes.size()>0){
+                            tms = tmslistYes.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
+                            }
+                            if ((keytmsMap == null ) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber()))) {
                                 TmsLogisticsStatus tmsLogisticsStatus = new TmsLogisticsStatus();
                                 tmsLogisticsStatus.setCreateBy("HBS");
                                 tmsLogisticsStatus.setCreateTime(new Date());
@@ -667,6 +673,8 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                         List<DeliverQuantityConfirm> delivernewNumber = deliverQuantityConfirmMapper.selectDeliverQuantityConfirmList(numbernull);
                                         if (delivernewNumber != null && delivernewNumber.size() > 0) {
                                             deliverNumbers = delivernewNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
+                                            }
+                                        }
                                         }
                                     }
                                 }
@@ -685,7 +693,6 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                 if (deliverlist != null && deliverlist.size() > 0) {
                     deliverQuantityConfirmMapper.saveDeliverNumber(deliverlist);
                 }
-                }
 
            // List<MetaHanaDeliverOrder> deliverOrderListstatusYes = metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByYes(n,m);
            // if (deliverOrderListstatusYes != null && deliverOrderListstatusYes.size() > 0) {
@@ -694,8 +701,6 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                 List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();*/
              /*   for (MetaHanaDeliverOrder deliver : deliverOrderListstatusYes
                 ) {*/
-
-        }
     }
     public Set<String> getConfigValueSet(String dictType){
             Set<String> res = new HashSet<>();