From 1f4a55001f7da6aa7980721af0dd172f0a9e65eb Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Mon, 8 Jul 2024 15:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E9=80=92=E5=8D=95=20=E9=9D=9E?=
 =?UTF-8?q?=E6=AD=A3=E6=95=B0=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/yunxi/controller/DeviceController.java |  3 ++-
 .../impl/RecycleDeliveryOrderServiceImpl.java      | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

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<RecycleDelivery
     @Override
     @Transactional
     public void settlement(RecycleDeliveryOrder order) {
-        save(order);//保存订单
-        String client = order.getDeliverId();
-        String orderNo = order.getOrderNo();
-        BigDecimal amount = order.getAdjustPrice();
-        String companyId = order.getCompanyId();
-        clientService.addBalance(client, amount, orderNo, companyId);//结算
+        boolean save = save(order);//保存订单
+        if (save && order.getReportWeight().compareTo(BigDecimal.ZERO) > 0) {
+            String client = order.getDeliverId();
+            String orderNo = order.getOrderNo();
+            BigDecimal amount = order.getAdjustPrice();
+            String companyId = order.getCompanyId();
+            clientService.addBalance(client, amount, orderNo, companyId);//结算
+        }
     }
 
     @Override