二期需求

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/dataobject/customer/CustomerDO.java

@@ -353,6 +353,15 @@ public class CustomerDO extends BaseDO {
      */
     private Boolean isPotential;
 
+    /**
+     * 默认付款，1-是，0-否
+     */
+    private Boolean defaultPay ;
+
+    /**
+     * 控货无收货人,1-是，0-否
+     */
+    private Boolean noConsignee ;
 
     /**
      * vip等级-中文

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

@@ -286,7 +286,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
                 customer.setEstimateEnterOpenSeaTime(null);
             } else {
                 // 接收后一个月，无任何报价、下单则掉入公海
-                Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(new Date(), 1).toJdkDate();
+                //Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(new Date(), 1).toJdkDate();
+                Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(new Date(), 3).toJdkDate(); //改为3个月
                 if (customer.getEstimateEnterOpenSeaTime() == null || customer.getEstimateEnterOpenSeaTime().compareTo(estimateEnterOpenSeaTime) == -1) {
                     customer.setEstimateEnterOpenSeaTime(estimateEnterOpenSeaTime);
                 }
@@ -1792,7 +1793,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
             throw exception(CUSTOMER_CANNOT_DELAY_APPROVAL_WITH_NO_ENTER_OPEN_SEA_TIME);
         }
         // TODO 待加入配置 最大延期时间
-        long maxTime = 31 * 24 * 60 * 60 * 1000L;
+        //long maxTime = 31 * 24 * 60 * 60 * 1000L;//原逻辑按一个月31天计算 ，现改为最多6个月
+        long maxTime = 6*31 * 24 * 60 * 60 * 1000L;//原逻辑按一个月31天计算 ，现改为最多6个月
 //        long minTime = 24 * 60 * 60 * 1000L;
         long time = DateUtils.getTimeInMillis(delayApprovalInfoDto.getEstimateEnterOpenSeaTime()) - DateUtils.getTimeInMillis(customerDO.getEstimateEnterOpenSeaTime());
         if (time <= 0 || time > maxTime) {
@@ -2355,7 +2357,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
         customer.setStatusUpdateTime(now);
 
         //设置预计进行公海池时间
-        Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 1).toJdkDate();
+        //Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 1).toJdkDate();
+        Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 3).toJdkDate(); //改为延期3个月
         if (customer.getEstimateEnterOpenSeaTime() == null || customer.getEstimateEnterOpenSeaTime().compareTo(estimateEnterOpenSeaTime) == -1) {
             customer.setEstimateEnterOpenSeaTime(estimateEnterOpenSeaTime);
             log.info("确认接收客户[{}]，设置预计掉入公海时间为[{}]", customer.getId(), estimateEnterOpenSeaTime);
@@ -2810,7 +2813,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
                 log.info("完成入仓客户[{}]包含海运整柜，设置不掉入公海", customer.getId());
             } else {
                 // 下单完成入仓，根据订单入仓的时间往后延期六个月
-                Date date = DateUtil.offsetMonth(rucangTime, 6).toJdkDate();
+                //Date date = DateUtil.offsetMonth(rucangTime, 6).toJdkDate();
+                Date date = DateUtil.offsetMonth(rucangTime, 12).toJdkDate();
                 if (customer.getEstimateEnterOpenSeaTime() == null || customer.getEstimateEnterOpenSeaTime().compareTo(date) == -1) {
                     customer.setEstimateEnterOpenSeaTime(date);
                 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -514,6 +514,9 @@ public class OrderDO extends BaseDO {
 
     @ApiModelProperty(value = "是否显示提单金额")
     private Boolean displayBillLadingPrice = true;
+
+    @ApiModelProperty(value = "是否有收货人，1-是，0-否")
+    private Boolean hasConsignee = true;
 //
 //    @ApiModelProperty(value = "拆单子订单是否变更运输方式")
 //    private Boolean splitChangeTransport = false;

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

@@ -596,7 +596,7 @@ region.label.code.not.null=The country locale import city code cannot be empty
 region.label.code.country.and.city=The format of import city code is -> Country (code)- City (code).
 region.label.code.country.and.city.and.air.country=The format of the import city code for country and region settings is ->Country (code) ->City (code) ->Country (air freight code)
 estimate.enter.open.sea.time.not.null=Estimated time of entry to the open seas cannot be null
-estimate.enter.open.sea.time.delay.transfinite=The extension is expected to last up to 31 days
+estimate.enter.open.sea.time.delay.transfinite=The extension is expected to last up to 180 days
 customer.approval.status.not.correct=The customer approval status is incorrect
 customer.approval.form.id.not.exists=The customer approval process instance ID does not exist
 customer.approval.info.not.find=Customer approval details not found

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

@@ -601,7 +601,7 @@ region.label.code.not.null=\u56FD\u5BB6\u533A\u57DF\u8BBE\u7F6E\u8FDB\u53E3\u57C
 region.label.code.country.and.city=\u56FD\u5BB6\u533A\u57DF\u8BBE\u7F6E\u8FDB\u53E3\u57CE\u5E02\u4EE3\u7801\u683C\u5F0F\u4E3A-> \u56FD\u5BB6(\u4EE3\u7801)-\u57CE\u5E02(\u4EE3\u7801)
 region.label.code.country.and.city.and.air.country=\u56FD\u5BB6\u533A\u57DF\u8BBE\u7F6E\u8FDB\u53E3\u57CE\u5E02\u4EE3\u7801\u683C\u5F0F\u4E3A-> \u56FD\u5BB6%28\u4EE3\u7801%29-\u57CE\u5E02%28\u4EE3\u7801%29-\u56FD\u5BB6%28\u7A7A\u8FD0\u4EE3\u7801%29
 estimate.enter.open.sea.time.not.null=\u9884\u8BA1\u8FDB\u5165\u516C\u6D77\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
-estimate.enter.open.sea.time.delay.transfinite=\u9884\u8BA1\u8FDB\u5165\u516C\u6D77\u5EF6\u671F\u65F6\u95F4\u6700\u592731\u5929
+estimate.enter.open.sea.time.delay.transfinite=\u9884\u8BA1\u8FDB\u5165\u516C\u6D77\u5EF6\u671F\u65F6\u95F4\u6700\u5927180\u5929
 customer.approval.status.not.correct=\u5BA2\u6237\u5BA1\u6279\u72B6\u6001\u9519\u8BEF
 customer.approval.form.id.not.exists=\u5BA2\u6237\u5BA1\u6279\u6D41\u7A0B\u5B9E\u4F8BID\u4E0D\u5B58\u5728
 customer.approval.info.not.find=\u5BA2\u6237\u5BA1\u6279\u8BE6\u60C5\u672A\u627E\u5230