Merge branch 'v21.1_jianzhuang_20240807' into dev

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

@@ -308,4 +308,13 @@ public enum OrderChildEnum {
         private final String msg;
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum SuperviseTypeEnum {
+        SUPERVISE_LOAD(1, "监装"),
+        SUPERVISE_UNLOAD(2, "监卸");
+        private final int code;
+        private final String msg;
+    }
+
 }

performance-web/src/main/java/com/clx/performance/config/ClxMessageConfig.java

@@ -38,10 +38,10 @@ public class ClxMessageConfig {
     /**
      * 上传装货信息短信模板
      */
-    private String uploadLoadInfo;
+    private String uploadLoadInfoTemplateCode;
     /**
      * 提示监装信息短信模板
      */
-    private String noticeSupervision;
+    private String noticeSupervisionTemplateCode;
 
 }

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

@@ -1743,9 +1743,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         result.setSendSamplingPic(orderInfoFeign.getSendSamplingPic());
         result.setSendQualityPosition(orderInfoFeign.getSendQualityPosition());
         result.setSendSamplingVideo(orderInfoFeign.getSendSamplingVideo());
-        // TODO 两个属性需要瑞新接口提供
-        result.setSuperviseContacts(null);
-        result.setSuperviseMobile(null);
+        Object[] superviseInfo = getSuperviseInfo(orderChild.getOrderNo(), orderChild.getChildNo());
+        result.setSuperviseContacts(superviseInfo != null ? (String) superviseInfo[0] : null);
+        result.setSuperviseMobile(superviseInfo != null ? (String) superviseInfo[1] : null);
 
         //查询结算信息
         Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
@@ -1775,6 +1775,49 @@ public class OrderChildServiceImpl implements OrderChildService {
         return result;
     }
 
+    /**
+     * 获取监装
+     * @param orderNo
+     * @param childNo
+     * @return
+     */
+    private Object[] getSuperviseInfo(String orderNo, String childNo) {
+        NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
+        App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
+        //组装配置信息
+        RequestConfig config = new RequestConfig()
+                .setAppId(app.getAppNo())
+                .setAppKey(app.getAppKey())
+                .setGatewayUrl(app.getCallback());
+        //通过订单号查询监装监卸信息
+        SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
+        action.setOrderNo(orderNo);
+        action.setType(OrderChildEnum.SuperviseTypeEnum.SUPERVISE_LOAD.getCode());
+        Result<SupervisionLoadInfoDto> supervisionLoadInfoDto = OpenClient.doAction(config, action);
+        if (!supervisionLoadInfoDto.succeed()) {//接口调用失败
+            return null;
+        }
+        SupervisionLoadInfoDto supervisionLoadInfo = supervisionLoadInfoDto.getData();//监装信息
+        if (Objects.nonNull(supervisionLoadInfo)) {//有监装信息
+            //通过运单号查询监装监卸子任务状态
+            SupplyChainSupervisionLoadTruckAction truckAction = new SupplyChainSupervisionLoadTruckAction();
+            truckAction.setChildNo(childNo);
+            truckAction.setType(OrderChildEnum.SuperviseTypeEnum.SUPERVISE_LOAD.getCode());
+            Result<SupervisionLoadTruckInfoDto> supervisionLoadTruckInfoDto = OpenClient.doAction(config, truckAction);
+            if (!supervisionLoadTruckInfoDto.succeed()) {//接口调用失败
+                return null;
+            }
+            SupervisionLoadTruckInfoDto supervisionLoadTruckInfo = supervisionLoadTruckInfoDto.getData();
+            if (Objects.nonNull(supervisionLoadTruckInfo)) {
+                if (supervisionLoadTruckInfo.getLoadStatus()) {
+                    return new Object[]{supervisionLoadInfo.getTaskContracts(), supervisionLoadInfo.getTaskMobile(), supervisionLoadInfo.getTaskAddress()};
+                }
+            }
+
+        }
+        return null;
+    }
+
     //查看运单车辆是否开启了中交兴路
     public String isOpenZJXL(Integer orderChildStatus,String truckNo){
         if(orderChildStatus <= OrderChildEnum.Status.UNLOAD.getCode()){
@@ -3261,11 +3304,12 @@ public class OrderChildServiceImpl implements OrderChildService {
                         if (Objects.equals(child.getStatus(), OrderChildEnum.Status.ARRIVE_SEND.getCode())) {
                             sendLoadSms(child.getDriverMobile(), child.getTruckNo(), child.getChildNo());
                         }
-                        // todo 监装位置
-                        String supervisionAddress = "";
                         // 已装货
                         if (Objects.equals(child.getStatus(), OrderChildEnum.Status.LOAD.getCode())) {
-                            sendSupervisionSms(child.getDriverMobile(), child.getTruckNo(), child.getChildNo(), supervisionAddress);
+                            Object[] superviseInfo = getSuperviseInfo(child.getOrderNo(), child.getChildNo());
+                            if (superviseInfo != null) {
+                                sendSupervisionSms(child.getDriverMobile(), child.getTruckNo(), child.getChildNo(), (String) superviseInfo[2]);
+                            }
                         }
                         // 修改 通知状态 为已通知
                         child.setExitNoticeStatus(OrderChildEnum.ExitNoticeStatus.NOTIFIED.getCode());
@@ -3302,7 +3346,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         AliSmsMessageReq req = new AliSmsMessageReq();
         // 模板CODE
         //SMS_470795021
-        req.setTemplateCode(messageConfig.getUploadLoadInfo());
+        req.setTemplateCode(messageConfig.getUploadLoadInfoTemplateCode());
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("truckNo", truckNo);
         jsonObject.set("childNo", childNo);
@@ -3330,7 +3374,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         AliSmsMessageReq req = new AliSmsMessageReq();
         //模板CODE
         //SMS_470740013
-        req.setTemplateCode(messageConfig.getNoticeSupervision());
+        req.setTemplateCode(messageConfig.getNoticeSupervisionTemplateCode());
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("truckNo", truckNo);
         jsonObject.set("childNo", childNo);