From a4e8dd62544c0a82005c766c1c9edaed933719c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sun, 28 Sep 2025 17:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8A=A5=E9=94=99=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/account/service/impl/ShopUserServiceImpl.java  | 3 +++
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
index 1006a774..4073a9dc 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
@@ -88,6 +88,9 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
             throw new ApiNotPrintException("增减用户余额操作失败");
         }
 
+        if (userInfo.getAmount() == null) {
+            userInfo.setAmount(BigDecimal.ZERO);
+        }
         userFlow.setUserId(userInfo.getUserId());
         userFlow.setShopId(userInfo.getSourceShopId());
         userFlow.setAmount(shopUserEditDTO.getType() == 0 ? shopUserEditDTO.getMoney().negate() : shopUserEditDTO.getMoney());
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 9198a00b..14c4d7f2 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -823,7 +823,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         if (StrUtil.isNotBlank(payment.getTradeNumber())) {
             log.info("订单处理过，payment id：{}", payment.getId());
-//            return;
+            return;
         }
         payment.setTradeNumber( czgCallBackDto.getPayOrderId());
         payment.setRespJson(resultJson.toString());