Merge remote-tracking branch 'origin/jd_dev' into jd_dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -2748,8 +2748,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 }
                 infoVO = new ApplyInfoVO();
                 infoVO.setName("收货人电话/Consignee's phone number");
-                infoVO.setOrgValue("+" + orderConsigneeBackVO.getCountryCode() + orderConsigneeBackVO.getPhone());
-                infoVO.setNewValue("+" + consigneeContactsDO.getAreaCode() + consigneeContactsDO.getPhoneNew());
+                infoVO.setOrgValue(StringUtils.isBlank(orderConsigneeBackVO.getPhone())? "空": ("+" + orderConsigneeBackVO.getCountryCode() + orderConsigneeBackVO.getPhone()));
+                infoVO.setNewValue(StringUtils.isBlank(consigneeContactsDO.getPhoneNew())? "空": ("+" + consigneeContactsDO.getAreaCode() + consigneeContactsDO.getPhoneNew()));
                 orderConsigneeBackVO.setCountryCode(consigneeContactsDO.getAreaCode());
                 orderConsigneeBackVO.setPhone(consigneeContactsDO.getPhoneNew());
                 applyInfoList.add(infoVO);
@@ -5914,7 +5914,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             }
         } else {
             if (Objects.nonNull(consigneeDO)) {
-                orderConsigneeService.updateById(consigneeDO);
+                // 这里可能是由无收货人修改为有收货人，主键id为null
+                orderConsigneeService.saveOrUpdate(consigneeDO);
                 if (orderBackVO.getIsCargoControl()) {
                     // 控货订单有收货人则限制修改收货人
                     isLimitUpdateConsignee = Boolean.TRUE;

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/productbrandempower/ProductBrandEmpowerServiceImpl.java

@@ -323,7 +323,7 @@ public class ProductBrandEmpowerServiceImpl extends AbstractService<ProductBrand
         Long norCustomerId = productBrankMapper.getNorCustomerIdByOrderId(reqVO.getOrderId());
         Long neeCustomerId = productBrankMapper.getNeeCustomerIdByOrderId(reqVO.getOrderId());
 
-        if (norCustomerId != null && norCustomerId != 0 || neeCustomerId != null && neeCustomerId != 0) {
+        if ((norCustomerId != null && norCustomerId != 0) || (neeCustomerId != null && neeCustomerId != 0)) {
             //查看品牌与客户授权关系
             ProductBrandEmpowerBaseVO norProductBrandEmpowerBaseVO = new ProductBrandEmpowerBaseVO();
             norProductBrandEmpowerBaseVO.setProductBrandId(reqVO.getBrandId());
@@ -338,7 +338,7 @@ public class ProductBrandEmpowerServiceImpl extends AbstractService<ProductBrand
             neeProductBrandEmpowerBaseVO.setCustomerId(Objects.isNull(neeCustomerId) ? 0 : neeCustomerId);
             neeProductBrandEmpowerBaseVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
             //查询的授权信息
-            List<ProductBrandEmpowerDO> neeList = getProductBrandEmpowerList(norProductBrandEmpowerBaseVO);
+            List<ProductBrandEmpowerDO> neeList = getProductBrandEmpowerList(neeProductBrandEmpowerBaseVO);
             //没有授权的客户
             if ((norList == null || norList.size() == 0) && (neeList == null || neeList.size() == 0)) {
                 //未授权要查看品牌的授权模式，以及当前客户是否有特殊设置

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentAirLoadExcelExportListener.java

@@ -498,11 +498,11 @@ public class ShipmentAirLoadExcelExportListener {
                         preloadDto.setMergePkgQua(totalMergeQuality);
                         preloadDto.setWorth(totalWorth);
                         preloadDtoList.add(preloadDto);
-//                        int andIncrement = colorRowNum.getAndIncrement();
-//                        colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
-//                        colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
-//                        colorRowList.add(andIncrement);
-//                        colorRowList2.add(andIncrement);
+                        int andIncrement = colorRowNum.getAndIncrement();
+                        colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
+                        colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
+                        colorRowList.add(andIncrement);
+                        colorRowList2.add(andIncrement);
                         allTotalNum = allTotalNum + totalNum;
                         allTotalVolume = allTotalVolume.add(totalVolume);
                         allTotalWeight = allTotalWeight.add(totalWeight);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java

@@ -409,14 +409,13 @@ public class ShipmentLoadExcelExportListener2 {
                                     }
                                 }
                             }
-//                            int andIncrement = colorRowNum.getAndIncrement();
+                            int andIncrement = colorRowNum.getAndIncrement();
 //                            colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
 //                            colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
 //
 //                            colorRowList.add(andIncrement);
 //                            colorRowList2.add(andIncrement);
-//                            colorRowNum.getAndAdd(1);
-                            colorRowNum.getAndAdd(2);
+                            colorRowNum.getAndAdd(1);
                             LoadDto preloadDto = new LoadDto();
                             preloadDto.setId("TOTAL");
                             preloadDto.setSumNum(totalNum);
@@ -437,6 +436,10 @@ public class ShipmentLoadExcelExportListener2 {
                                 preloadDto1.setSumVolume(allTotalVolume);
                                 preloadDto1.setSumWeight(allTotalWeight);
                                 preloadDto1.setWorth(allTotalWorth);
+                                colorMap2.put(String.valueOf(andIncrement+1),Integer.valueOf(IndexedColors.YELLOW.index));
+                                colorMap.put(String.valueOf(andIncrement+1),Integer.valueOf(IndexedColors.YELLOW.index));
+                                colorRowList.add(andIncrement+1);
+                                colorRowList2.add(andIncrement+1);
                                 list.add(preloadDto1);
                             }