Merge remote-tracking branch 'origin/test' into test

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

@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * 装车范围校验检查参数
@@ -22,7 +21,6 @@ public class NeedAlertSuperviseInfoParam {
 
 
     @ApiModelProperty(value = "类型 1-监装 2-监卸", example = "1")
-    @NotNull(message = "类型不能为空")
     private Integer type;
 
 }

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

@@ -200,9 +200,14 @@ public class AppDriverOrderChildController {
     public Result<OrderChildLoadRangeCheckResultVO> loadRangeCheck(@RequestBody @Validated OrderChildLoadRangeCheckParam param) {
         return orderChildService.loadRangeCheck(param).toResult();
     }
+
     @ApiOperation(value = "是否需要弹出监装信息", notes = "<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));
     }
 

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

@@ -2196,8 +2196,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         if (dif.compareTo(BigDecimal.ZERO) != 0) {
             BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(orderGoods.getOrderNo());
-            if(orderResidueWeight.compareTo(dif) < 0){
-               throw new ServiceSystemException(ORDER_WEIGHT_LACK);
+            if(orderResidueWeight.compareTo(BigDecimal.ZERO) <= 0){
+                throw new ServiceSystemException(ORDER_WEIGHT_LACK);
             }
             //运单修改装车吨数，从货单进行扣减
             log.info("货单号：{}，运单号 ：{},扣减吨数：{}",orderGoods.getOrderGoodsNo(),childNo, dif);
@@ -3330,7 +3330,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         req.setMobile(mobile);
         req.setContent(jsonObject.toString());
         req.setExpire(300L);
-        clxMessageOpenapiFeign.sendAliSms(req);
+        Result<String> result = clxMessageOpenapiFeign.sendAliSms(req);
+        log.info("发送上传装货信息提示短信：【当前车牌号{}，运单{}未上传装车信息，请上传后再驶离货源地，如需帮助请联系客服。】,结果：{}", truckNo, childNo, result);
     }
 
     /**
@@ -3359,7 +3360,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         req.setMobile(mobile);
         req.setContent(jsonObject.toString());
         req.setExpire(300L);
-        clxMessageOpenapiFeign.sendAliSms(req);
+        Result<String> result = clxMessageOpenapiFeign.sendAliSms(req);
+        log.info("发送发送监装提示短信：【当前车牌号{}，运单{}需要进行现场监装，请您前往{}进行配合，如需帮助请联系客服。】,结果：{}", truckNo, childNo, supervisionAddress, result);
     }
 
     private BigDecimal[] getTruckLocation(String truckNo ,BigDecimal longitude, BigDecimal latitude) {