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

---
 .../src/main/java/com/czg/account/entity/ShopUserFlow.java   | 5 +++++
 .../src/main/java/com/czg/enums/ShopUserFlowBizEnum.java     | 5 +++--
 .../service/account/service/impl/ShopUserServiceImpl.java    | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java
index 60fcfe2d..ba90c595 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java
@@ -54,6 +54,11 @@ public class ShopUserFlow implements Serializable {
 
     private String remark;
 
+    /**
+     * 是否可退款
+     */
+    private Integer isCanRefund;
+
     /**
      * 关联id，
      * 订单支付/订单退款/霸王餐时 订单id
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 166d15a2..98b3b9d4 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
@@ -25,11 +25,12 @@ public enum ShopUserFlowBizEnum {
     // 管理员手动增减余额
     ADMIN_IN("adminIn"),
     //管理员退款充值
-    ADMIN_REFUND("adminRefund"),
+//    ADMIN_REFUND("adminRefund"),
     //adminOut
     ADMIN_OUT("adminOut"),
     //adminInOut
-    ADMIN_IN_OUT("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 a6195749..84ee6f10 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
@@ -91,6 +91,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
             throw new ApiNotPrintException("增减用户余额操作失败");
         }
 
+        userFlow.setIsCanRefund(0);
         userFlow.setUserId(userInfo.getUserId());
         userFlow.setShopId(userInfo.getShopId());
         userFlow.setAmount(shopUserEditDTO.getMoney());