Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java

@@ -438,29 +438,23 @@ public class CustomerController {
                 respVO.setPromoterName(customer1.getName());
             }
         }
-        if (CollectionUtil.isNotEmpty(respVO.getProductList())) {
-            // 对商品数据进行分组返回
-            Map<Long, List<ProductRespVO>> productRespVOMap = respVO.getProductList().stream().collect(Collectors.groupingBy(ProductRespVO::getTypeId));
-            List<CustomerProductTypeGroupVO> products = productRespVOMap.entrySet().stream().map(entry -> {
-                CustomerProductTypeGroupVO productTypeGroupVO = new CustomerProductTypeGroupVO();
-                productTypeGroupVO.setTypeId(entry.getKey());
-                productTypeGroupVO.setProductIds(entry.getValue().stream().map(ProductRespVO::getId).collect(Collectors.toList()));
-                return productTypeGroupVO;
-            }).collect(Collectors.toList());
+        // 主营类别是必须的
         if (CollectionUtil.isNotEmpty(respVO.getProductTypeList())){
             // 允许选择了主营类别，但是该主营类别下面没有对应的商品
+            List<CustomerProductTypeGroupVO> products = new ArrayList<>();
             for (ProductTypeRespVO typeRespVO : respVO.getProductTypeList()) {
-                    if (!productRespVOMap.containsKey(typeRespVO.getId())) {
                 CustomerProductTypeGroupVO productTypeGroupVO = new CustomerProductTypeGroupVO();
                 productTypeGroupVO.setTypeId(typeRespVO.getId());
+                if (CollectionUtil.isNotEmpty(respVO.getProductList())) {
+                    List<Long> prodIds = respVO.getProductList().stream().filter(p -> p.getTypeId() == typeRespVO.getId()).map(ProductRespVO::getId).collect(Collectors.toList());
+                    productTypeGroupVO.setProductIds(CollectionUtil.isEmpty(prodIds) ? new ArrayList<>() : prodIds);
+                } else {
                     productTypeGroupVO.setProductIds(new ArrayList<>());
-                        products.add(productTypeGroupVO);
-                    }
                 }
+                products.add(productTypeGroupVO);
             }
             respVO.setProducts(products);
         }
-
         //设置银行账号
         CustomerBankQueryVO customerBankQueryVO = new CustomerBankQueryVO();
         customerBankQueryVO.setCustomerId(id);
@@ -501,25 +495,20 @@ public class CustomerController {
         if (Objects.isNull(respVO)) {
             throw exception(CUSTOMER_NOT_EXISTS);
         }
-        if (CollectionUtil.isNotEmpty(respVO.getProductList())) {
-            // 对商品数据进行分组返回
-            Map<Long, List<ProductRespVO>> productRespVOMap = respVO.getProductList().stream().collect(Collectors.groupingBy(ProductRespVO::getTypeId));
-            List<CustomerProductTypeGroupVO> products = productRespVOMap.entrySet().stream().map(entry -> {
-                CustomerProductTypeGroupVO productTypeGroupVO = new CustomerProductTypeGroupVO();
-                productTypeGroupVO.setTypeId(entry.getKey());
-                productTypeGroupVO.setProductIds(entry.getValue().stream().map(ProductRespVO::getId).collect(Collectors.toList()));
-                return productTypeGroupVO;
-            }).collect(Collectors.toList());
+        // 主营类别是必须的
         if (CollectionUtil.isNotEmpty(respVO.getProductTypeList())){
             // 允许选择了主营类别，但是该主营类别下面没有对应的商品
+            List<CustomerProductTypeGroupVO> products = new ArrayList<>();
             for (ProductTypeRespVO typeRespVO : respVO.getProductTypeList()) {
-                    if (!productRespVOMap.containsKey(typeRespVO.getId())) {
                 CustomerProductTypeGroupVO productTypeGroupVO = new CustomerProductTypeGroupVO();
                 productTypeGroupVO.setTypeId(typeRespVO.getId());
+                if (CollectionUtil.isNotEmpty(respVO.getProductList())) {
+                    List<Long> prodIds = respVO.getProductList().stream().filter(p -> p.getTypeId() == typeRespVO.getId()).map(ProductRespVO::getId).collect(Collectors.toList());
+                    productTypeGroupVO.setProductIds(CollectionUtil.isEmpty(prodIds) ? new ArrayList<>() : prodIds);
+                } else {
                     productTypeGroupVO.setProductIds(new ArrayList<>());
-                        products.add(productTypeGroupVO);
-                    }
                 }
+                products.add(productTypeGroupVO);
             }
             respVO.setProducts(products);
         }

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

@@ -2766,6 +2766,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                         // 处理未报价时，如果是已入仓产品去生成应收
                         isPayAdvanceException = this.addOrderReceivable(orderDO,
                                 1);
+                    } else if (orderDO.getShipmentState() > 0) {
+                        // 已出货订单修改计价都需要更新应收单
+                        isPayAdvanceException = this.addOrderReceivable(orderDO,
+                                1);
                     } else {
                         isPayAdvanceException = this.addOrderReceivable(orderDO,
                                 2);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -905,6 +905,10 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
 //                    .map(BoxPreloadGoodsBackVO::getWeight)
 //                    .reduce(BigDecimal.ZERO, BigDecimal::add);
         }
+        if (CollectionUtil.isNotEmpty(list) && list.size() > 0){
+            // 重新排序
+            list = list.stream().sorted(Comparator.comparing(MakeBillOfLadingListBackVO::getTidanNo)).collect(Collectors.toList());
+        }
         map.put("totalNum", totalNum);
         map.put("totalVolume", totalVolume);
         map.put("totalWeight", totalWeight);

yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/BoxPreloadGoodsController.java

@@ -163,6 +163,7 @@ public class BoxPreloadGoodsController {
 
     @PostMapping("/createAir")
     @ApiOperation("创建预装货物-空运, use this")
+    @Idempotent(timeout = 5)
     public CommonResult<PreloadResultVO> createBoxPreloadGoodsAir(@Valid @RequestBody BoxPreloadGoodsCreateReqVO createReqVO) {
         return success(boxPreloadGoodsService.createBoxPreloadGoodsAir(createReqVO));
     }