From 21f339a2d8c548a4e7376a2af74473420f17655d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 18 Feb 2025 14:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BD=99=E9=A2=9D=E5=A2=9E?=
 =?UTF-8?q?=E5=87=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/account/dto/shopuser/ShopUserMoneyEditDTO.java    | 2 +-
 .../src/main/java/com/czg/enums/ShopUserFlowBizEnum.java  | 8 +++++++-
 .../service/account/service/impl/ShopUserServiceImpl.java | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java
index 8442375f4..130496d7e 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java
@@ -39,7 +39,7 @@ public class ShopUserMoneyEditDTO {
     @DecimalMax("9999")
     private BigDecimal money;
 
-    private String bizEnum;
+    private ShopUserFlowBizEnum bizEnum;
     /**
      * 备注
      */
diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java
index 74c8023dd..166d15a23 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java
@@ -23,7 +23,13 @@ public enum ShopUserFlowBizEnum {
     // 充值退款
     RECHARGE_REFUND("rechargeRefund"),
     // 管理员手动增减余额
-    ADMIN_IN("adminIn");
+    ADMIN_IN("adminIn"),
+    //管理员退款充值
+    ADMIN_REFUND("adminRefund"),
+    //adminOut
+    ADMIN_OUT("adminOut"),
+    //adminInOut
+    ADMIN_IN_OUT("adminInOut"),;
     private final String code;
 
     ShopUserFlowBizEnum(String code) {
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 5feb976d1..618e099e1 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
@@ -96,7 +96,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
         userFlow.setShopId(userInfo.getShopId());
         userFlow.setAmount(shopUserEditDTO.getMoney());
         userFlow.setBalance(shopUserEditDTO.getType() == 0 ? userInfo.getAmount().subtract(shopUserEditDTO.getMoney()) : userInfo.getAmount().add(shopUserEditDTO.getMoney()));
-        userFlow.setBizCode(shopUserEditDTO.getBizEnum());
+        userFlow.setBizCode(shopUserEditDTO.getBizEnum().getCode());
         userFlow.setType(shopUserEditDTO.getType() == 0 ? "-" : "+");
         userFlow.setRemark(shopUserEditDTO.getRemark());
         userFlow.setRelationId(shopUserEditDTO.getRelationId());