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 i throw new ApiNotPrintException("增减用户余额操作失败"); } + userFlow.setIsCanRefund(0); userFlow.setUserId(userInfo.getUserId()); userFlow.setShopId(userInfo.getShopId()); userFlow.setAmount(shopUserEditDTO.getMoney());