Merge branch 'v31.4_app_sample_20241025' into master_jdk17

clx-performance-web/src/main/java/com/clx/performance/controller/app/AppDriverOrderChildController.java

@@ -204,10 +204,6 @@ public class AppDriverOrderChildController {
     @Operation(summary = "是否需要弹出监装信息", description = "<br>By:姜武杰")
     @PostMapping("/needAlertSuperviseInfo")
     public Result<NeedAlertSuperviseInfoResultVO> needAlertSuperviseInfo(@RequestBody @Validated NeedAlertSuperviseInfoParam param) {
-        // todo :jiangwujie 临时设置type 前端给type后删除
-        if (param.getType() == null) {
-            param.setType(1);
-        }
         return Result.ok(orderChildService.needAlertSuperviseInfo(param));
     }
 

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

@@ -37,6 +37,7 @@ import com.clx.performance.dto.payment.WalletResidueCardDTO;
 import com.clx.performance.dto.zjxl.TruckLocationDTO;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
 import com.clx.performance.enums.*;
+import com.clx.performance.enums.SyncPlatformEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.extranal.order.InvoicingCompanyService;
 import com.clx.performance.extranal.order.QuotationService;
@@ -1829,9 +1830,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         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.setSendSamplingPic(superviseInfo==null? null :orderInfoFeign.getSendSamplingPic());
-        result.setSendQualityPosition(superviseInfo==null? null :orderInfoFeign.getSendQualityPosition());
-        result.setSendSamplingVideo(superviseInfo==null? null :orderInfoFeign.getSendSamplingVideo());
+        result.setSendSamplingPic(orderInfoFeign.getSendSamplingPic());
+        result.setSendQualityPosition(orderInfoFeign.getSendQualityPosition());
+        result.setSendSamplingVideo(orderInfoFeign.getSendSamplingVideo());
 
         // 采样 监卸信息
         SuperviseInfo superviseUnloadInfo = getSuperviseInfo(orderChild.getOrderNo(), OrderChildEnum.SuperviseTypeEnum.SUPERVISE_UNLOAD.getCode());
@@ -3701,9 +3702,18 @@ public class OrderChildServiceImpl implements OrderChildService {
     public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
         //查询运单信息
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(DATA_NOT_FIND);
-        SuperviseInfo superviseInfo = getSuperviseInfoWithSubStatus(orderChild.getOrderNo(), orderChild.getChildNo(), orderChild.getTruckNo());
         //返回对象
         NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
+        //数煤宝的订单
+        if(Objects.equals(orderChild.getOrderSource(), SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())){
+            FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());//feign订单
+            if(Objects.nonNull(orderInfoFeign)){
+                result.setNeedAlert(OrderChildEnum.NeedAlertEnum.FAIL.getCode());
+                result.setLocation(orderInfoFeign.getSendQualityPosition());
+                return result;
+            }
+        }
+        SuperviseInfo superviseInfo = getSuperviseInfoWithSubStatus(orderChild.getOrderNo(), orderChild.getChildNo(), orderChild.getTruckNo());
         if (superviseInfo != null) {
             result.setNeedAlert(OrderChildEnum.NeedAlertEnum.FAIL.getCode());
             result.setLocation(superviseInfo.getTaskAddress());

performance-api/src/main/java/com/clx/performance/param/app/NeedAlertSuperviseInfoParam.java

 package com.clx.performance.param.app;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -21,6 +22,7 @@ public class NeedAlertSuperviseInfoParam {
 
 
     @Schema(description = "类型 1-监装 2-监卸", example = "1")
+    @NotNull(message = "类型不能为空")
     private Integer type;
 
 }