Merge remote-tracking branch 'origin/master' into v21.1_jianzhuang_20240807

performance-api/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.clx.cy</groupId>
     <artifactId>performance-api</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${clx-performance-api.version}</version>
     <name>performance-api</name>
 
     <parent>

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderGoodsEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum SendWaitModeEnum {
+        // 发货-排队系统形式  1:小程序  2:app
+        WECHAT_PROGRAM(1, "微信小程序"),
+        APP(2, "app");
+
+        private final Integer code;
+        private final String msg;
+
+
+        public static Optional<SendWaitModeEnum> getByCode(Integer code) {
+            if (code == null) {
+                return Optional.empty();
+            }
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(Integer code) {
+            return getByCode(code).map(SendWaitModeEnum::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum SendWaitSystemMsgEnum {
+
+        YES(1, "需要"),
+        NO(0, "不需要");
+
+        private final Integer code;
+        private final String msg;
+
+
+        public static Optional<SendWaitSystemMsgEnum> getByCode(Integer code) {
+            if (code == null) {
+                return Optional.empty();
+            }
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(Integer code) {
+            return getByCode(code).map(SendWaitSystemMsgEnum::getMsg).orElse(null);
+        }
+    }
+
+    public static void main(String[] args) {
+        System.out.println(SendWaitModeEnum.getMsgByCode(null));
+    }
+}

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -101,6 +101,20 @@ public enum PerformanceResultEnum implements ResultEnum {
     APP_POP_UP_DRIVER_RESIDUE_ERROR(-500, "app弹窗提示"),
     /**车主提示语 **/
     APP_POP_UP_OWNER_RESIDUE_ERROR(-499, "app弹窗提示"),
+    /**司机未绑卡提示语 **/
+    APP_POP_UP_DRIVER_NO_BANKCARD_ERROR(-498, "司机未绑卡"),
+    /**车主未绑卡提示语 **/
+    APP_POP_UP_OWNER_NO_BANKCARD_ERROR(-497, "车主未绑卡"),
+    /**司机钱包不存在提示语 **/
+    APP_POP_UP_DRIVER_WALLET_NULL_NOT_EXIST_ERROR(-494, "司机钱包不存在"),
+    /**车主钱包不存在提示语 **/
+    APP_POP_UP_OWNER_WALLET_NULL_NOT_EXIST_ERROR(-493, "车主钱包不存在"),
+    /**司机未实名 **/
+    APP_POP_UP_DRIVER_NOT_AUTH(-496, "司机钱包不存在"),
+    /**车主未实名 **/
+    APP_POP_UP_OWNER_NOT_AUTH(-495, "车主钱包不存在"),
+
+
     WALLET_CODE_IS_NULL(1704, "用户钱包不存在"),
 
     ORDER_GOODS_SAVE_FAIL(1801, "保存货单失败,请稍后再试"),

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

 package com.clx.performance.vo.app;
 
 import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.enums.OrderGoodsEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -230,4 +231,31 @@ public class OrderChildVO {
     @ApiModelProperty("接单保证金 平台服务费费率 弹窗和文案显示 0 不显示  1 显示")
     private Integer goodsOrderDetailShow =  0;
 
-}
\ No newline at end of file
+    /* 20240730 增加货源地信息 */
+
+    @ApiModelProperty(value = "货源地现场联系人")
+    private String sendContact;
+
+    @ApiModelProperty(value = "货源地联系人手机号")
+    private String sendContactPhone;
+
+    @ApiModelProperty(value = "发货-是否需要系统排队 0 否  1 是")
+    private Integer sendWaitSystem;
+
+    @ApiModelProperty(value = "发货-是否需要系统排队 描述：  需要 不需要")
+    public String getSendWaitSystemMsg() {
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(sendWaitSystem);
+    }
+
+    @ApiModelProperty(value = "发货-排队系统名称")
+    private String sendWaitSystemName;
+
+    @ApiModelProperty(value = "发货-排队系统形式  1:小程序  2:app")
+    private Integer sendWaitMode;
+
+    @ApiModelProperty(value = "发货-排队系统形式 描述：  微信小程序  app")
+    public String getSendWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(sendWaitMode);
+    }
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

 package com.clx.performance.vo.pc;
 
+import com.clx.performance.enums.OrderGoodsEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -169,4 +170,31 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("已派单数")
     private Integer dispatchedOrders;
+
+    /* 20240730 增加货源地信息 */
+
+    @ApiModelProperty(value = "货源地现场联系人")
+    private String sendContact;
+
+    @ApiModelProperty(value = "货源地联系人手机号")
+    private String sendContactPhone;
+
+    @ApiModelProperty(value = "发货-是否需要系统排队 0 否  1 是")
+    private Integer sendWaitSystem;
+
+    @ApiModelProperty(value = "发货-是否需要系统排队 描述：  需要 不需要")
+    public String getSendWaitSystemMsg() {
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(sendWaitSystem);
+    }
+
+    @ApiModelProperty(value = "发货-排队系统名称")
+    private String sendWaitSystemName;
+
+    @ApiModelProperty(value = "发货-排队系统形式  1:小程序  2:app")
+    private Integer sendWaitMode;
+
+    @ApiModelProperty(value = "发货-排队系统形式 描述：  微信小程序  app")
+    public String getSendWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(sendWaitMode);
+    }
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -163,6 +163,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
         orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
         orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
+        //货源地信息
+        orderGoodsVO.setSendContact(orderInfoFeign.getSendContact());
+        orderGoodsVO.setSendContactPhone(orderInfoFeign.getSendContactPhone());
+        orderGoodsVO.setSendWaitSystem(orderInfoFeign.getSendWaitSystem());
+        orderGoodsVO.setSendWaitSystemName(orderInfoFeign.getSendWaitSystemName());
+        orderGoodsVO.setSendWaitMode(orderInfoFeign.getSendWaitMode());
 
         //获取订单配置的违约金方案
         OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -177,7 +183,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
             orderGoodsVO.setGoodsOrderDetailShow(1);
         }
-
         return orderGoodsVO;
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java

@@ -130,7 +130,10 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                         item.setSeniorLogisticsManagerName(Joiner.on(",")
                                 .join(JSON.parseArray(item.getSeniorLogisticsManagerName())));
                     }
-                    if(Objects.nonNull(item.getPendingWeight()) && Objects.nonNull(item.getOrderedWeight())){
+                    if(Objects.nonNull(item.getPendingWeight())
+                            && item.getPendingWeight().compareTo(BigDecimal.ZERO) != 0
+                            && Objects.nonNull(item.getOrderedWeight())
+                            && item.getOrderedWeight().compareTo(BigDecimal.ZERO) != 0){
                         item.setOrderedRate(calcOrderedRate(item.getOrderedWeight(),item.getPendingWeight()));
                     }
                     if(Objects.nonNull(item.getTaskWeight()) && Objects.nonNull(item.getSumUnloadWeight())){