Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -1909,7 +1909,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         if(ending.size() > 0){
             commodityCodeEntities = commodityMapper.queryCommodityByencodings(ending, Arrays.asList(param.getEntId()), Arrays.asList(param.getXhfNsrsbh()));
         }
-        Map<String, CommodityCodeEntity> collect = null;
+        Map<String, CommodityCodeEntity> collect = new HashMap<>();
         if(commodityCodeEntities != null && commodityCodeEntities.size() > 0){
             collect = commodityCodeEntities.stream().collect(Collectors.toMap(t -> t.getZxbm(), t -> t));
         }
@@ -1924,7 +1924,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 int i = 0;
                 //公司不维护
                 CommodityCodeEntity commodityCodeOld = collect.get(itemInfo.getZxbm());
-                if(collect == null || commodityCodeOld == null){
+                if(commodityCodeOld == null){
                     commodityCodeEntity.setId(baseService.getGenerateShotKey());
                     commodityCodeEntity.setCreateTime(new Date());
                     commodityCodeEntity.setUserId(userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():"sync");
@@ -1946,6 +1946,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 }
 
             } catch (Exception e) {
+                log.error("更新公司库物料异常{}",e);
                 sb.append(itemInfo.getSphxh()).append(",");
             }
         }