From 886b47e07cd5b6ef41a998328e865af8433ddb15 Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Fri, 28 Jun 2024 09:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RecycleDeliveryOrderServiceImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
index 88cf81b..65da9a0 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
@@ -562,6 +562,14 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
         batch.setLastModifyUserId(userInfo.getUserId());
         batch.setLastModifyTime(LocalDateTime.now());
         int update = deliveryOrderMapper.auditBatch(batch);
+        batch.getIds().forEach(id -> {
+            RecycleDeliveryOrderEntity entity = this.getById(id);
+            BigDecimal price = entity.getAdjustPrice();
+            String orderNo = entity.getOrderNo();
+            String companyId = entity.getCompanyId();
+            String clientId = entity.getDeliverId();
+            addBalance(clientId, orderNo, price, companyId);
+        });
         return update;
     }
 
@@ -574,8 +582,9 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
      * @param companyId 商户id
      */
     private void addBalance(String clientId, String orderNo, BigDecimal amount, String companyId) {
-        if (amount.compareTo(BigDecimal.ZERO) == 0) {
+        if (amount.compareTo(BigDecimal.ZERO) <= 0) {
             log.error("结算金额为0,订单号:{},结算金额:{},结算商户:{},结算散户:{}", orderNo, amount, companyId, clientId);
+            return;
         }
         Date now = new Date();
         CompanyEntity company = companyService.getById(companyId);