Merge branch 'test' into release

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customerContacts/CustomerContactsMapper.java

@@ -68,6 +68,7 @@ public interface CustomerContactsMapper extends BaseMapperX<CustomerContactsDO>
             "c.id as customer_id, ",
             "c.name as customer_name, ",
             "c.name_en as customer_name_en, ",
+            "c.number as customer_number, ",
             "c.default_pay as default_pay, ",
             "c.no_consignee as no_consignee, ",
             "cc.* , ",
@@ -110,6 +111,7 @@ public interface CustomerContactsMapper extends BaseMapperX<CustomerContactsDO>
             "c.id as customer_id, ",
             "c.name as customer_name, ",
             "c.name_en as customer_name_en, ",
+            "c.number as customer_number, ",
             "c.default_pay as default_pay, ",
             "c.no_consignee as no_consignee, ",
             "cc.* , ",

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dto/CustomerContactsDto.java

@@ -13,6 +13,9 @@ public class CustomerContactsDto {
     @ApiModelProperty(value = "客户联系人ID")
     private Long customerContactsId;
 
+    @ApiModelProperty(value = "客户编码")
+    private String customerNumber;
+
     @ApiModelProperty(value = "客户名称", required = true)
     @NotNull(message = "客户名称不能为空")
     private String customerName;

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouseLine/WarehouseLineQueryVO.java

@@ -21,8 +21,14 @@ public class WarehouseLineQueryVO {
     @ApiModelProperty(value = "运输方式")
     private Integer transportType;
 
+    @ApiModelProperty(value = "目的地城市id")
+    private List<Long> destCityId;
+
     @ApiModelProperty(value = "目的国家id")
-    private Long destCountryId;
+    private List<Long> destCountryId;
+
+    @ApiModelProperty(value = "目的仓")
+    private List<Long> destWarehouseId;
 
     @ApiModelProperty(value = "出货渠道ID,空运才有，海运可以为空")
     private Long channelId;

yudao-module-depository/yudao-module-depository-core/src/main/resources/mapper/warehouse/WarehouseLineMapper.xml

@@ -123,12 +123,32 @@
             </foreach>
         </if>
 
-        <if test="query.transportType != null">
-            AND line.transport_type = #{query.transportType}
+        <!--目的地-->
+        <if test="query.destCityId != null and query.destCityId.size()>0 ">
+            and destwarehouse.`shi` in
+            <foreach item='destCity' index='index' collection='query.destCityId' open='(' separator=',' close=')'>
+                #{destCity}
+            </foreach>
+        </if>
+
+        <!--目的国-->
+        <if test="query.destCountryId != null and query.destCountryId.size()>0 ">
+            and destwarehouse.`guojia` in
+            <foreach item='destCountry' index='index' collection='query.destCountryId' open='(' separator=',' close=')'>
+                #{destCountry}
+            </foreach>
         </if>
 
-        <if test="query.destCountryId != null">
-            AND destwarehouse.guojia = #{query.destCountryId}
+        <!--目的仓-->
+        <if test="query.destWarehouseId != null and query.destWarehouseId.size()>0 ">
+            AND line.dest_warehouse_id IN
+            <foreach item='destWarehouse' index='index' collection='query.destWarehouseId' open='(' separator=',' close=')'>
+                #{destWarehouse}
+            </foreach>
+        </if>
+
+        <if test="query.transportType != null">
+            AND line.transport_type = #{query.transportType}
         </if>
 
         <if test="query.channelId != null">

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/ErrorCodeConstants.java

@@ -429,4 +429,5 @@ public interface ErrorCodeConstants {
    // 该订单已经是非海外仓订单
     ErrorCode ORDER_NOT_IS_OVERSEAS_WAREHOUSE_ORDER = new ErrorCode(1004001170, "order.not.is.overseas.warehouse.order");
     ErrorCode ORDER_APPROVAL_IS_NOT_EXISTS = new ErrorCode(1004001171, "order.approval.is.not.exists");
+    ErrorCode FEE_APPLICATION_NOT_IS_ZERO = new ErrorCode(1004001172, "fee.application.not.is.zero");
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderApprovalTypeEnum.java

@@ -40,7 +40,6 @@ public enum OrderApprovalTypeEnum {
 
     DISCOUNT_APPLY_BATCH(31, "批量优惠申请", Arrays.asList(1, 2, 6, 11, 14, 23, 28, 32)), // 拆单申请/合单申请/订单修改/退仓/撤销拆单审批/优惠申请（当前商品有在途申请）/批量管理折扣申请（当前商品有在途申请）/管理优惠（当前商品有在途申请）
     ADMIN_DISCOUNT_BATCH(32, "批量管理折扣申请", Arrays.asList(1, 2, 6, 11, 14, 23, 28, 31)), // 拆单申请/合单申请/订单修改/退仓/撤销拆单审批/优惠申请（当前商品有在途申请）/批量优惠申请（当前商品有在途申请）/管理优惠（当前商品有在途申请）
-
     //分拣
     sorting(50, "分拣审批", Arrays.asList(6, 11, 13, 14, 22, 23, 28)), // 自编号全部申请互斥，跟原本一致，不修改, 自编号下订单除拆单申请/合单申请/调仓申请/订单修改/入仓申请/退仓申请外，其他申请不受限制，允许封柜反审批
 

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderFeeApplication/OrderFeeApplicationController.java

@@ -92,10 +92,6 @@ public class OrderFeeApplicationController {
             return error(ORDER_FEE_APPLICATION_REPEAT_COMMIT);
         }
         redisHelper.expire(redisKey, 1, TimeUnit.MINUTES);
-        OrderDO orderDO = orderService.getById(createReqVO.getOrderId());
-        if (orderDO.getAuditType() != 0) {
-            throw exception(ORDER_HAS_PROCESSING_APPROVAL, orderDO.getOrderNo());
-        }
         feeApplicationService.createFeeBatchApplication(createReqVO);
         redisHelper.delete(redisKey);
         return success(true);
@@ -123,13 +119,15 @@ public class OrderFeeApplicationController {
     @PutMapping("/update")
     @ApiOperation("更新订单费用申请")
     public CommonResult<Boolean> updateFeeApplication(@Valid @RequestBody OrderFeeApplicationUpdateReqVO updateReqVO) {
-        if (!Objects.isNull(updateReqVO)) {
-            OrderDO orderDO = orderService.getById(updateReqVO.getOrderId());
-            if (orderDO.getAuditType() != 0) {
-                throw exception(ORDER_HAS_PROCESSING_APPROVAL, orderDO.getOrderNo());
-            }
+
+        String redisKey = MessageFormat.format(ORDER_FEE_APPLICATION_KEY, updateReqVO.getOrderId().toString());
+        Long count = redisHelper.incrBy(redisKey, 1);
+        if (count > 1){
+            return error(ORDER_FEE_APPLICATION_REPEAT_COMMIT);
         }
+        redisHelper.expire(redisKey, 1, TimeUnit.MINUTES);
         feeApplicationService.updateFeeApplication(updateReqVO);
+        redisHelper.delete(redisKey);
         return success(true);
     }
 

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/productPrice/ProductPricePageReqVO.java

@@ -95,16 +95,18 @@ public class ProductPricePageReqVO extends PageParam {
 
     @ApiModelProperty(value = "始发地城市id")
     private Long startCityId;
+
     @ApiModelProperty(value = "目的地城市id")
-    private Long destCityId;
+    private List<Long> destCityId;
+
     @ApiModelProperty(value = "运输方式")
     private String transportType;
 
     @ApiModelProperty(value = "国家")
-    private Long destCountryId;
+    private List<Long> destCountryId;
 
     @ApiModelProperty(value = "目的仓")
-    private Long destWarehouseId;
+    private List<Long> destWarehouseId;
 
     @ApiModelProperty(value = "商品编码")
     private String productCode;
@@ -119,4 +121,6 @@ public class ProductPricePageReqVO extends PageParam {
 
     private List<String> existTypeList;
 
+
+
 }

yudao-module-product/yudao-module-product-core/src/main/resources/mapper/product/ProductPriceMapper.xml

@@ -109,17 +109,29 @@
 		<if test="params.startCityId != null">
 			and ew_start.shi = #{params.startCityId}
 		</if>
-		<if test="params.destCityId != null">
-			and ew_dest.shi = #{params.destCityId}
+
+		<!--目的地-->
+		<if test="params.destCityId != null and params.destCityId.size()>0 ">
+			and ew_dest.`shi` in
+			<foreach item='destCity' index='index' collection='params.destCityId' open='(' separator=',' close=')'>
+				#{destCity}
+			</foreach>
 		</if>
 
 		<!--目的国-->
-		<if test="params.destCountryId != null">
-			and ew_dest.guojia=#{params.destCountryId}
+		<if test="params.destCountryId != null and params.destCountryId.size()>0 ">
+			and ew_dest.`guojia` in
+			<foreach item='destCountry' index='index' collection='params.destCountryId' open='(' separator=',' close=')'>
+				#{destCountry}
+			</foreach>
 		</if>
+
 		<!--目的仓-->
-		<if test="params.destWarehouseId != null">
-			and ew_dest.id=#{params.destWarehouseId}
+		<if test="params.destWarehouseId != null and params.destWarehouseId.size()>0 ">
+			and ew_dest.`id` in
+			<foreach item='destWarehouse' index='index' collection='params.destWarehouseId' open='(' separator=',' close=')'>
+				#{destWarehouse}
+			</foreach>
 		</if>
 
 		<if test="params.blacklist != null">

yudao-server/src/main/resources/i18n/messages.properties

@@ -306,4 +306,5 @@ order.not.is.overseas.warehouse.order=
 area.code.not.null=
 currency.id.not.null=
 
-order.approval.is.not.exists=
+order.approval.is.not.exists=
\ No newline at end of file
+fee.application.not.is.zero=
\ No newline at end of file

yudao-server/src/main/resources/i18n/messages_en.properties

@@ -1120,4 +1120,5 @@ order.not.is.overseas.warehouse.order=This order is already a non overseas wareh
 area.code.not.null=The national mobile phone area code cannot be empty
 currency.id.not.null=The country ID cannot be empty
 
-order.approval.is.not.exists=Order approval type does not exist
+order.approval.is.not.exists=Order approval type does not exist
\ No newline at end of file
+fee.application.not.is.zero=The expense application amount is not 0, and cannot be directly deleted 
\ No newline at end of file

yudao-server/src/main/resources/i18n/messages_zh.properties

@@ -1120,4 +1120,5 @@ order.not.is.overseas.warehouse.order=\u8be5\u8ba2\u5355\u5df2\u7ecf\u662f\u975e
 area.code.not.null=\u56fd\u5bb6\u624b\u673a\u533a\u53f7\u4e0d\u80fd\u4e3a\u7a7a
 currency.id.not.null=\u56fd\u5bb6id\u4e0d\u80fd\u4e3a\u7a7a
 
-order.approval.is.not.exists=\u8ba2\u5355\u5ba1\u6279\u7c7b\u578b\u4e0d\u5b58\u5728
+order.approval.is.not.exists=\u8ba2\u5355\u5ba1\u6279\u7c7b\u578b\u4e0d\u5b58\u5728
\ No newline at end of file
+fee.application.not.is.zero=\u8d39\u7528\u7533\u8bf7\u91d1\u989d\u4e0d\u4e3a0\uff0c\u4e0d\u80fd\u8fdb\u884c\u76f4\u63a5\u5220\u9664