feature(电子围栏): 运单详情接口增加增加 监装采样点，采样点照片，采样点视频信息

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

@@ -106,9 +106,9 @@ public enum PerformanceResultEnum implements ResultEnum {
     /**车主未绑卡提示语 **/
     APP_POP_UP_OWNER_NO_BANKCARD_ERROR(-497, "车主未绑卡"),
     /**司机钱包不存在提示语 **/
-    APP_POP_UP_DRIVER_WALLET_NULL_NOT_EXIST_ERROR(-498, "司机钱包不存在"),
+    APP_POP_UP_DRIVER_WALLET_NULL_NOT_EXIST_ERROR(-494, "司机钱包不存在"),
     /**车主钱包不存在提示语 **/
-    APP_POP_UP_OWNER_WALLET_NULL_NOT_EXIST_ERROR(-497, "车主钱包不存在"),
+    APP_POP_UP_OWNER_WALLET_NULL_NOT_EXIST_ERROR(-493, "车主钱包不存在"),
     /**司机未实名 **/
     APP_POP_UP_DRIVER_NOT_AUTH(-496, "司机钱包不存在"),
     /**车主未实名 **/

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;
@@ -241,10 +242,30 @@ public class OrderChildVO {
     @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")
\ No newline at end of file
+    public String getSendWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(sendWaitMode);
+    }
+
+    @ApiModelProperty(value = "发货采样位置")
+    private String sendQualityPosition;
+    @ApiModelProperty(value = "发货地采样视频")
+    private String sendSamplingVideo;
+    @ApiModelProperty(value = "发货地采样照片")
+    private String sendSamplingPic;
+    @ApiModelProperty(value = "监装联系人")
+    private String superviseContacts;
+    @ApiModelProperty(value = "监装联系人电话")
+    private String superviseMobile;
+}

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

@@ -184,7 +184,7 @@ public class OrderGoodsVO {
 
     @ApiModelProperty(value = "发货-是否需要系统排队 描述：  需要 不需要")
     public String getSendWaitSystemMsg() {
-        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(sendWaitMode);
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(sendWaitSystem);
     }
 
     @ApiModelProperty(value = "发货-排队系统名称")

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())){

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildOperateRecordSqlProvider.java

@@ -24,7 +24,7 @@ public class OrderChildOperateRecordSqlProvider {
                     "operator"
             );
             FROM("order_child_operate_record ");
-            ORDER_BY("create_time desc");
+            ORDER_BY("created_time desc");
         }}.toString();
     }
 }