提交 76d74adb authored 作者: 杨启发's avatar 杨启发

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

...@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor; ...@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* 装车范围校验检查参数 * 装车范围校验检查参数
...@@ -22,7 +21,6 @@ public class NeedAlertSuperviseInfoParam { ...@@ -22,7 +21,6 @@ public class NeedAlertSuperviseInfoParam {
@ApiModelProperty(value = "类型 1-监装 2-监卸", example = "1") @ApiModelProperty(value = "类型 1-监装 2-监卸", example = "1")
@NotNull(message = "类型不能为空")
private Integer type; private Integer type;
} }
...@@ -200,9 +200,14 @@ public class AppDriverOrderChildController { ...@@ -200,9 +200,14 @@ public class AppDriverOrderChildController {
public Result<OrderChildLoadRangeCheckResultVO> loadRangeCheck(@RequestBody @Validated OrderChildLoadRangeCheckParam param) { public Result<OrderChildLoadRangeCheckResultVO> loadRangeCheck(@RequestBody @Validated OrderChildLoadRangeCheckParam param) {
return orderChildService.loadRangeCheck(param).toResult(); return orderChildService.loadRangeCheck(param).toResult();
} }
@ApiOperation(value = "是否需要弹出监装信息", notes = "<br>By:姜武杰") @ApiOperation(value = "是否需要弹出监装信息", notes = "<br>By:姜武杰")
@PostMapping("/needAlertSuperviseInfo") @PostMapping("/needAlertSuperviseInfo")
public Result<NeedAlertSuperviseInfoResultVO> needAlertSuperviseInfo(@RequestBody @Validated NeedAlertSuperviseInfoParam param) { 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)); return Result.ok(orderChildService.needAlertSuperviseInfo(param));
} }
......
...@@ -2196,8 +2196,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -2196,8 +2196,8 @@ public class OrderChildServiceImpl implements OrderChildService {
} }
if (dif.compareTo(BigDecimal.ZERO) != 0) { if (dif.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(orderGoods.getOrderNo()); BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(orderGoods.getOrderNo());
if(orderResidueWeight.compareTo(dif) < 0){ if(orderResidueWeight.compareTo(BigDecimal.ZERO) <= 0){
throw new ServiceSystemException(ORDER_WEIGHT_LACK); throw new ServiceSystemException(ORDER_WEIGHT_LACK);
} }
//运单修改装车吨数,从货单进行扣减 //运单修改装车吨数,从货单进行扣减
log.info("货单号:{},运单号 :{},扣减吨数:{}",orderGoods.getOrderGoodsNo(),childNo, dif); log.info("货单号:{},运单号 :{},扣减吨数:{}",orderGoods.getOrderGoodsNo(),childNo, dif);
...@@ -3330,7 +3330,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -3330,7 +3330,8 @@ public class OrderChildServiceImpl implements OrderChildService {
req.setMobile(mobile); req.setMobile(mobile);
req.setContent(jsonObject.toString()); req.setContent(jsonObject.toString());
req.setExpire(300L); 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 { ...@@ -3359,7 +3360,8 @@ public class OrderChildServiceImpl implements OrderChildService {
req.setMobile(mobile); req.setMobile(mobile);
req.setContent(jsonObject.toString()); req.setContent(jsonObject.toString());
req.setExpire(300L); 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) { private BigDecimal[] getTruckLocation(String truckNo ,BigDecimal longitude, BigDecimal latitude) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论