fix: 校验成品油相关问题修改

release
liufeilong 2 years ago
parent d3e4dfca6c
commit 60e06d2ec9
  1. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java
  2. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java

@ -89,7 +89,7 @@ public class OrderSplitController {
return R.ok().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage());
} catch (Exception e) {
log.error("{}订单拆分接口异常,异常信息:{}", LOGGER_MSG, e);
return R.error();
return R.error(e.getMessage());
}
}
@ -248,7 +248,6 @@ public class OrderSplitController {
@SysLog(operation = "保存拆分订单rest接口", operationDesc = "对订单进行拆分后数据保存", key = "订单拆分")
public R saveOrderInfo(
@ApiParam(name = "orderInfo", value = "拆分订单的全信息") @RequestBody List<CommonOrderInfo> commonList) {
log.info("{}页面订单信息录入的接口,commonOrder:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList));
try {
log.info("{}页面订单信息录入的接口,前端传入的参数commonList:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList));
orderSplitService.splitOrder(commonList);
@ -259,7 +258,7 @@ public class OrderSplitController {
return R.error().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage());
} catch (Exception e) {
return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey())
.put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.RECEIVE_FAILD.getMessage());
.put(OrderManagementConstant.MESSAGE, e.getMessage());
}
}

@ -329,10 +329,7 @@ public class OrderSplitServiceImpl implements OrderSplitService {
continue;
}
//购方是否为空、税编是否为空校验、成品油校验
if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){
throw new Exception("购方信息为空,请补全!");
}
//税编是否为空校验、成品油校验
String cpy = "";
for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){
if(StrUtil.isBlank(orderItemInfo.getSpbm())){

Loading…
Cancel
Save