diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java index d406c28..7d1974f 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java @@ -411,7 +411,8 @@ public class DeviceController { order.setProductCode(orderVO.getProductCode()); order.setProductSubCode(orderVO.getProductSubCode()); order.setTotalPrice(orderVO.getTotalPrice()); - if ("1".equals(adjustSet)) {//自动审核 + if ("1".equals(adjustSet) + && orderVO.getWeight().compareTo(BigDecimal.ZERO) > 0) {//自动审核 order.setAdjustStatus(1); order.setAdjustWeight(orderVO.getWeight()); order.setAdjustPrice(orderVO.getTotalPrice()); diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java index b7e68dc..b76b6ec 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java @@ -47,12 +47,14 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl 0) { + String client = order.getDeliverId(); + String orderNo = order.getOrderNo(); + BigDecimal amount = order.getAdjustPrice(); + String companyId = order.getCompanyId(); + clientService.addBalance(client, amount, orderNo, companyId);//结算 + } } @Override