Merge branch 'release-fix' into release

sql/v2.1/20240903.sql

@@ -12,3 +12,13 @@ INSERT INTO `system_dict_data` (`sort`, `value`, `label`, `label_en`, `dict_type
 VALUES (26, '26', '编辑跟进纪录', 'Update Customer Followup', 'customer_operate_type', 0, 'default', '', NULL, '1', now(), '115', now(), b'0');
 INSERT INTO `system_dict_data` (`sort`, `value`, `label`, `label_en`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
 VALUES (27, '27', '提交跟进纪录', 'Commit Customer Followup', 'customer_operate_type', 0, 'default', '', NULL, '1', now(), '115', now(), b'0');
+
+
+INSERT INTO `system_dict_data` (`sort`, `value`, `label`, `label_en`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (28, '28', '设置是否显示提单价格', 'Set Customer Is Show Tidan Price', 'customer_operate_type', 0, 'default', '', NULL, '1', now(), '115', now(), b'0');
+INSERT INTO `system_dict_data` (`sort`, `value`, `label`, `label_en`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (29, '29', '设置到仓确认', 'Set Customer Arrival Confirm', 'customer_operate_type', 0, 'default', '', NULL, '1', now(), '115', now(), b'0');
+INSERT INTO `system_dict_data` (`sort`, `value`, `label`, `label_en`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (30, '30', '设置重货标准', 'Set Customer Wight Unit', 'customer_operate_type', 0, 'default', '', NULL, '1', now(), '115', now(), b'0');
+INSERT INTO `system_dict_data` (`sort`, `value`, `label`, `label_en`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (31, '31', '设置泡货标准', 'Set Customer Light Unit', 'customer_operate_type', 0, 'default', '', NULL, '1', now(), '115', now(), b'0');

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerService.java

@@ -421,6 +421,11 @@ public interface CustomerService extends IService<CustomerDO> {
     void changeCustomerDefaultPay(CustomerChangeDefaultPayReqVO customerChangeDefaultPayReqVO);
     void changeCustomerDefaultBilling(CustomerChangeDefaultBillingReqVO customerChangeDefaultBillingReqVO);
 
+    void changeCustomerIsShowTidanPrice(CustomerChangeIsShowTidanPriceReqVO customerChangeIsShowTidanPriceReqVO);
+    void changeCustomerArrivalConfirm(CustomerChangeArrivalConfirmReqVO customerChangeArrivalConfirmReqVO);
+    void changeCustomerWeightUnit(CustomerChangeWeightUnitReqVO customerChangeWeightUnitReqVO);
+    void changeCustomerLightUnit(CustomerChangeLightUnitReqVO customerChangeLightUnitReqVO);
+
     /**
      * @param areaCode          区号  eg: 86
      * @param phone             电话  eg: 13233334444

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/line/CustomerLineUpdateReqVO.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.*;
 @ToString(callSuper = true)
 public class CustomerLineUpdateReqVO extends CustomerLineBaseVO {
 
-    @ApiModelProperty(value = "自增ID")
+    @ApiModelProperty(value = "自增ID 有id时需要填，没有时设空")
     private Long id;
 
 }

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerChangeArrivalConfirmReqVO.java

+package cn.iocoder.yudao.module.customer.vo.customer.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@ApiModel("管理后台 - 到仓确认切换 Request VO")
+@Data
+@EqualsAndHashCode
+@ToString
+public class CustomerChangeArrivalConfirmReqVO {
+
+    @ApiModelProperty(value = "客户ID列表", required = true)
+    @NotEmpty(message = "客户ID列表不能为空")
+    private List<Long> customerIdList;
+
+    /**
+     * 到仓确认
+     */
+    @ApiModelProperty(value = "到仓确认", required = true)
+    private Integer arrivalConfirm;
+
+
+}

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerChangeIsShowTidanPriceReqVO.java

+package cn.iocoder.yudao.module.customer.vo.customer.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel("管理后台 - 是否显示提单价格切换 Request VO")
+@Data
+@EqualsAndHashCode
+@ToString
+public class CustomerChangeIsShowTidanPriceReqVO {
+
+    @ApiModelProperty(value = "客户ID列表", required = true)
+    @NotEmpty(message = "客户ID列表不能为空")
+    private List<Long> customerIdList;
+
+    /**
+     * 是否显示提单价格
+     */
+    @ApiModelProperty(value = "是否显示提单价格", required = true)
+    private Boolean isShowTidanPrice;
+
+
+}

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerChangeLightUnitReqVO.java

+package cn.iocoder.yudao.module.customer.vo.customer.vo;
+
+import cn.iocoder.yudao.module.customer.vo.customer.line.CustomerLineUpdateReqVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel("管理后台 - 泡货标准切换 Request VO")
+@Data
+@EqualsAndHashCode
+@ToString
+public class CustomerChangeLightUnitReqVO {
+
+    @ApiModelProperty(value = "客户ID列表", required = true)
+    @NotEmpty(message = "客户ID列表不能为空")
+    private List<Long> customerIdList;
+    /**
+     * 泡货标准(kg)
+     */
+    @ApiModelProperty(value = "泡货标准(kg) 可以为空。当为空时线路会被删除", required = true)
+    private BigDecimal lightUnit;
+
+
+    /**
+     * 客户线路集合
+     */
+    @ApiModelProperty(value = "客户线路集合", notes = "参见CustomerLineUpdateReqVO")
+    @Valid
+    private List<CustomerLineUpdateReqVO> customerLines;
+
+
+}

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerChangeWeightUnitReqVO.java

+package cn.iocoder.yudao.module.customer.vo.customer.vo;
+
+import cn.iocoder.yudao.module.customer.vo.customer.line.CustomerLineUpdateReqVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel("管理后台 - 重货标准切换 Request VO")
+@Data
+@EqualsAndHashCode
+@ToString
+public class CustomerChangeWeightUnitReqVO {
+
+    @ApiModelProperty(value = "客户ID列表", required = true)
+    @NotEmpty(message = "客户ID列表不能为空")
+    private List<Long> customerIdList;
+    /**
+     * 重货标准(CBM)
+     */
+    @ApiModelProperty(value = "重货标准 可以为空。 当为空时线路会被删除", required = true)
+    private BigDecimal weightUnit;
+
+
+    /**
+     * 客户线路集合
+     */
+    @ApiModelProperty(value = "客户线路集合", notes = "参见CustomerLineUpdateReqVO")
+    @Valid
+    private List<CustomerLineUpdateReqVO> customerLines;
+
+
+}

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

@@ -1143,6 +1143,40 @@ public class CustomerController {
         return success(true);
     }
 
+    @PutMapping("/change-customer-is-show-tidan-price")
+    @ApiOperation("设置客户是否显示提单价格")
+    @Idempotent(timeout = 5)
+    public CommonResult<Boolean> changeCustomerIsShowTidanPrice(@Valid @RequestBody CustomerChangeIsShowTidanPriceReqVO customerChangeIsShowTidanPriceReqVO) {
+        customerService.changeCustomerIsShowTidanPrice(customerChangeIsShowTidanPriceReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/change-customer-arrival-confirm")
+    @ApiOperation("设置客户到仓确认")
+    @Idempotent(timeout = 5)
+    public CommonResult<Boolean> changeCustomerArrivalConfirm(@Valid @RequestBody CustomerChangeArrivalConfirmReqVO customerChangeArrivalConfirmReqVO) {
+        customerService.changeCustomerArrivalConfirm(customerChangeArrivalConfirmReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/change-customer-weight-unit")
+    @ApiOperation("设置客户重货标准")
+    @Idempotent(timeout = 5)
+    public CommonResult<Boolean> changeCustomerWeightUnit(@Valid @RequestBody CustomerChangeWeightUnitReqVO customerChangeWeightUnitReqVO) {
+        customerService.changeCustomerWeightUnit(customerChangeWeightUnitReqVO);
+        return success(true);
+    }
+
+
+    @PutMapping("/change-customer-light-unit")
+    @ApiOperation("设置客户泡货标准")
+    @Idempotent(timeout = 5)
+    public CommonResult<Boolean> changeCustomerLightUnit(@Valid @RequestBody CustomerChangeLightUnitReqVO customerChangeLightUnitReqVO) {
+        customerService.changeCustomerLightUnit(customerChangeLightUnitReqVO);
+        return success(true);
+    }
+
+
 
     @PutMapping("/recycle-unconfirmed-customer")
     @ApiOperation("回收已分配未接收的客户")

yudao-module-ecw/yudao-module-ecw-api/src/main/java/cn/iocoder/yudao/module/ecw/enums/CustomerOperateTypeEnum.java

@@ -58,6 +58,13 @@ public enum CustomerOperateTypeEnum {
     FOLLOWUP_UPDATE(26, "编辑跟进纪录"),
     FOLLOWUP_COMMIT(27, "提交跟进纪录"),
 
+
+
+    CHANGE_IS_SHOW_TIDAN_PRICE(28, "设置是否显示提单价格"),
+    CHANGE_ARRIVAL_CONFIRM(29, "设置到仓确认"),
+    CHANGE_WEIGHT_UNIT(30, "设置重货标准"),
+    CHANGE_LIGHT_UNIT(31, "设置泡货标准"),
+
     DELETE(100, "删除"),