Merge branch 'v22.8_sample_img_video_20240822' into dev

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

@@ -291,4 +291,56 @@ public class OrderChildVO {
         }
         return new ArrayList<>();
     }
+
+    @ApiModelProperty(value = "目的地现场联系人")
+    private String receiveContact;
+
+    @ApiModelProperty(value = "目的地联系人手机号")
+    private String receiveContactPhone;
+
+    @ApiModelProperty(value = "收货-是否需要系统排队 0 否  1 是")
+    private Integer receiveWaitSystem;
+
+    @ApiModelProperty(value = "收货-是否需要系统排队 描述：  需要 不需要")
+    public String getReceiveWaitSystemMsg() {
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(receiveWaitSystem);
+    }
+
+    @ApiModelProperty(value = "收货-排队系统名称")
+    private String receiveWaitSystemName;
+
+    @ApiModelProperty(value = "收货-排队系统形式  1:小程序  2:app")
+    private Integer receiveWaitMode;
+
+    @ApiModelProperty(value = "收货-排队系统形式 描述：  微信小程序  app")
+    public String getReceiveWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(receiveWaitMode);
+    }
+
+    @ApiModelProperty(value = "收货采样位置")
+    private String receiveQualityPosition;
+    @ApiModelProperty(value = "收货地采样视频")
+    private String receiveSamplingVideo;
+    @ApiModelProperty(value = "收货地采样照片")
+    private String receiveSamplingPic;
+    @ApiModelProperty(value = "监卸联系人")
+    private String superviseUnloadContacts;
+    @ApiModelProperty(value = "监卸联系人电话")
+    private String superviseUnloadMobile;
+
+    @ApiModelProperty(value = "收货地采样照片")
+    public List<String> getReceiveSamplingPicList() {
+        if (StringUtils.isNotBlank(receiveSamplingPic)) {
+            return JSONUtil.toList(receiveSamplingPic, String.class);
+        }
+        return new ArrayList<>();
+    }
+
+    @ApiModelProperty(value = "收货地采样视频")
+    public List<String> getReceiveSamplingVideoList() {
+        if (StringUtils.isNotBlank(receiveSamplingVideo)) {
+            return JSONUtil.toList(receiveSamplingVideo, String.class);
+        }
+        return new ArrayList<>();
+    }
 }

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

@@ -124,6 +124,9 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "收货待确认时间", example = "2020-01-01 10:10:10")
     private String unloadTime;
 
+    @ApiModelProperty(value = "货源地详细地址")
+    private String sendDetailAddress;
 
-
+    @ApiModelProperty(value = "目的地详细地址")
+    private String receiveDetailAddress;
 }
\ No newline at end of file

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

@@ -202,4 +202,29 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("当前货单总吨数是否超过总拉运量  1:超过  ")
     private Integer overOrderWeight;
+
+    @ApiModelProperty(value = "目的地现场联系人")
+    private String receiveContact;
+
+    @ApiModelProperty(value = "目的地联系人手机号")
+    private String receiveContactPhone;
+
+    @ApiModelProperty(value = "收货-是否需要系统排队 0 否  1 是")
+    private Integer receiveWaitSystem;
+
+    @ApiModelProperty(value = "收货-是否需要系统排队 描述：  需要 不需要")
+    public String getReceiveWaitSystemMsg() {
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(receiveWaitSystem);
+    }
+
+    @ApiModelProperty(value = "收货-排队系统名称")
+    private String receiveWaitSystemName;
+
+    @ApiModelProperty(value = "收货-排队系统形式  1:小程序  2:app")
+    private Integer receiveWaitMode;
+
+    @ApiModelProperty(value = "收货-排队系统形式 描述：  微信小程序  app")
+    public String getReceiveWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(receiveWaitMode);
+    }
 }
\ No newline at end of file

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

@@ -10,6 +10,7 @@ import com.clx.message.req.message.AliSmsMessageReq;
 import com.clx.order.enums.OrderEnum;
 import com.clx.order.enums.ResultEnum;
 import com.clx.order.enums.*;
+import com.clx.order.feign.AddressFeign;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -274,6 +275,8 @@ public class OrderChildServiceImpl implements OrderChildService {
     private ClxMessageOpenapiFeign clxMessageOpenapiFeign;
     @Autowired
     private ClxMessageConfig messageConfig;
+    @Autowired
+    private AddressFeign addressFeign;
 
 
 
@@ -1750,14 +1753,29 @@ public class OrderChildServiceImpl implements OrderChildService {
         result.setSendWaitSystemName(orderInfoFeign.getSendWaitSystemName());
         result.setSendWaitMode(orderInfoFeign.getSendWaitMode());
 
+        //目的地信息
+        result.setReceiveContact(orderInfoFeign.getReveiveContact());
+        result.setReceiveContactPhone(orderInfoFeign.getReveiveContactPhone());
+        result.setReceiveWaitSystem(orderInfoFeign.getReveiveWaitSystem());
+        result.setReceiveWaitSystemName(orderInfoFeign.getReveiveWaitSystemName());
+        result.setReceiveWaitMode(orderInfoFeign.getReveiveWaitMode());
+
         // 采样 监装信息
         result.setSendSamplingPic(orderInfoFeign.getSendSamplingPic());
         result.setSendQualityPosition(orderInfoFeign.getSendQualityPosition());
         result.setSendSamplingVideo(orderInfoFeign.getSendSamplingVideo());
-        SuperviseInfo superviseInfo = getSuperviseInfo(orderChild.getOrderNo(), orderChild.getChildNo());
+        SuperviseInfo superviseInfo = getSuperviseInfo(orderChild.getOrderNo(), OrderChildEnum.SuperviseTypeEnum.SUPERVISE_LOAD.getCode());
         result.setSuperviseContacts(superviseInfo != null ? superviseInfo.getSuperviseContacts() : null);
         result.setSuperviseMobile(superviseInfo != null ? superviseInfo.getSuperviseMobile() : null);
 
+        // 采样 监卸信息
+        result.setReceiveSamplingPic(orderInfoFeign.getReveiveSamplingPic());
+        result.setReceiveQualityPosition(orderInfoFeign.getReveiveQualityPosition());
+        result.setReceiveSamplingVideo(orderInfoFeign.getReveiveSamplingVideo());
+        SuperviseInfo superviseUnloadInfo = getSuperviseInfo(orderChild.getOrderNo(), OrderChildEnum.SuperviseTypeEnum.SUPERVISE_UNLOAD.getCode());
+        result.setSuperviseUnloadContacts(superviseUnloadInfo != null ? superviseUnloadInfo.getSuperviseContacts() : null);
+        result.setSuperviseUnloadMobile(superviseUnloadInfo != null ? superviseUnloadInfo.getSuperviseMobile() : null);
+
         //查询结算信息
         Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
         if(optional.isPresent()){
@@ -1796,13 +1814,12 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     /**
-     * 获取监装
+     * 获取监装、监卸信息
      * @param orderNo
-     * @param childNo
+     * @param type
      * @return
      */
-    private SuperviseInfo getSuperviseInfo(String orderNo, String childNo) {
-        NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
+    private SuperviseInfo getSuperviseInfo(String orderNo, int type) {
         App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
@@ -1812,7 +1829,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         //通过订单号查询监装监卸信息
         SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
         action.setOrderNo(orderNo);
-        action.setType(OrderChildEnum.SuperviseTypeEnum.SUPERVISE_LOAD.getCode());
+        action.setType(type);
         Result<SupervisionLoadInfoDto> supervisionLoadInfoDto = OpenClient.doAction(config, action);
         if (!supervisionLoadInfoDto.succeed()) {//接口调用失败
             return null;
@@ -2642,6 +2659,14 @@ public class OrderChildServiceImpl implements OrderChildService {
                 loadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
         carrierOrderChildDetailVO.setUnloadImageList(
                 unloadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
+
+        //货源地详细地址，目的地详细地址
+        FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
+        FeignAddressVO.Address sendAddress = data.getSendAddress();
+        FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
+        carrierOrderChildDetailVO.setSendDetailAddress(sendAddress.getProvince()+sendAddress.getCity()+sendAddress.getCounty()+sendAddress.getAddress());
+        carrierOrderChildDetailVO.setReceiveDetailAddress(receiveAddress.getProvince()+receiveAddress.getCity()+receiveAddress.getCounty()+receiveAddress.getAddress());
+
         return carrierOrderChildDetailVO;
     }
 

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

@@ -199,6 +199,14 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
             orderGoodsVO.setGoodsOrderDetailShow(1);
         }
+
+        //目的地信息
+        orderGoodsVO.setReceiveContact(orderInfoFeign.getReveiveContact());
+        orderGoodsVO.setReceiveContactPhone(orderInfoFeign.getReveiveContactPhone());
+        orderGoodsVO.setReceiveWaitSystem(orderInfoFeign.getReveiveWaitSystem());
+        orderGoodsVO.setReceiveWaitSystemName(orderInfoFeign.getReveiveWaitSystemName());
+        orderGoodsVO.setReceiveWaitMode(orderInfoFeign.getReveiveWaitMode());
+
         return orderGoodsVO;
     }
 

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

@@ -145,8 +145,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                             && item.getOrderedWeight().compareTo(BigDecimal.ZERO) != 0){
                         item.setOrderedRate(calcOrderedRate(item.getOrderedWeight(),item.getPendingWeight()));
                     }
-                    if(Objects.nonNull(item.getTaskWeight()) && Objects.nonNull(item.getSumUnloadWeight())){
-
+                    if(Objects.nonNull(item.getTaskWeight()) && item.getTaskWeight().compareTo(BigDecimal.ZERO) >0
+                            && Objects.nonNull(item.getSumUnloadWeight())){
                         //任务完成率 =  到站量 / 任务量
                         BigDecimal taskCompleteRatio =  item.getSumUnloadWeight()
                                 .divide(item.getTaskWeight(),

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

@@ -348,7 +348,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getDriverFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getDriverFreight()==null?null:dto.getDriverFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
             rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));