From 107298167376a751e03846d7322fd0d5dbf47360 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 26 一月 2024 17:51:56 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-再生俱乐部
---
phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java b/phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java
index 90f044a..73ba008 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java
@@ -172,8 +172,11 @@
userMoneyUnclaimed.setOriginChannel(originChannel);
userMoneyUnclaimed.setOperationReason(operationReason);
- if(OperationReasonConstants.OP_REASON_RECHARGE_REFUND.equals(operationReason)
- || OperationReasonConstants.OP_REASON_BRING_NEW_USER_GIFT_RETRU_CANCEL.equals(operationReason)){
+ //閫�娆�,浣滃簾閫�娆�,鑰佸甫鏂伴��鍥�,鑰佸甫鏂颁綔搴熼��鍥� 榛樿绯荤粺澶勭悊
+ if(OperationReasonConstants.OP_REASON_RECHARGE_REFUND.equals(operationReason) ||
+ OperationReasonConstants.OP_REASON_REFUND_CANCEL.equals(operationReason) ||
+ OperationReasonConstants.OP_REASON_BRING_NEW_USER_GIFT_RETRUN.equals(operationReason) ||
+ OperationReasonConstants.OP_REASON_BRING_NEW_USER_GIFT_RETRU_CANCEL.equals(operationReason)){
userMoneyUnclaimed.setOpType(BaseEntity.NO);
}
userMoneyUnclaimed.setCommonId(commonId);
--
Gitblit v1.8.0