From eb4b67d05beba01a088dc4d2ad46d7c319f3d92b Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 22 十二月 2022 19:26:50 +0800
Subject: [PATCH] 用户日志处理调整

---
 phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java b/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
index 5263ef7..5071b52 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
@@ -131,34 +131,43 @@
         UserMoney userMoney = userMoneyService.selectUserIdDecrypt(userMoneyUnclaimed.getUserId());
         switch (userMoneyUnclaimed.getFundType()) {
             case UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND:
-                info.append(",鍌ㄥ�奸噾");
+                info.append(", 鍌ㄥ�奸噾");
                 before = new BigDecimal(userMoney.getStoredValueFund());
                 after = before.add(userMoneyUnclaimed.getOpNumber());
                 break;
             case UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND:
-                info.append(",澧炲�奸噾");
+                info.append(", 澧炲�奸噾");
                 before = new BigDecimal(userMoney.getValueAddedFund());
                 after = before.add(userMoneyUnclaimed.getOpNumber());
                 break;
             case UserMoneyUnclaimed.FUND_TYPE_INTEGRAL:
-                info.append(",绉垎");
+                info.append(", 绉垎");
                 before = new BigDecimal(userMoney.getIntegral());
                 after = before.add(userMoneyUnclaimed.getOpNumber());
                 break;
             case UserMoneyUnclaimed.FUND_TYPE_DEPOSIT:
-                info.append(",棰勫畾閲�");
+                info.append(", 棰勫畾閲�");
                 before = new BigDecimal(userMoney.getDeposit());
                 after = before.add(userMoneyUnclaimed.getOpNumber());
                 break;
         }
-        info.append(",鎿嶄綔鏁伴噺锛�").append(userMoneyUnclaimed.getOpNumber());
+        info.append(", 鎿嶄綔鏁伴噺锛�").append(userMoneyUnclaimed.getOpNumber());
         if (UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND == userMoneyUnclaimed.getFundType()) {
             // 澧炲�奸噾娣诲姞鏄惁闇�瑕侀鍙�
             int opType = userMoneyUnclaimed.getOpType() == null ? BaseEntity.YES : userMoneyUnclaimed.getOpType();
-            info.append(",鏄惁闇�瑕侀鍙栵細").append(BaseEntity.YES.equals(opType) ? "鏄�" : "鍚�");
+            info.append(", 鏄惁闇�瑕侀鍙栵細").append(BaseEntity.YES.equals(opType) ? "鏄�" : "鍚�");
+            if (BaseEntity.YES.equals(opType)){
+                before = null;
+                after = null;
+            }
         }
         if (BaseEntity.YES.equals(type)){
-            info.append(",棰嗗彇璧勯噾");
+            info.append(", 棰嗗彇璧勯噾: ").append(userMoneyUnclaimed.getOpNumber());
+        }
+        if (3 == type){
+            info.append(", 浣滃簾寰呴鍙栬祫閲�: ").append(userMoneyUnclaimed.getOpNumber());
+            before = null;
+            after = null;
         }
         jsonObject.put("key", info.toString());
         jsonObject.put("before", before);
@@ -233,6 +242,10 @@
      */
     @Override
     public void updateAll(UserMoneyUnclaimed userMoneyUnclaimed) {
+        if(BaseEntity.YES.equals(userMoneyUnclaimed.getIsDel())){
+            // 娣诲姞鐢ㄦ埛鏃ュ織
+            addUserLog(userMoneyUnclaimed, 3);
+        }
         int count = userMoneyUnclaimedMapper.updateAll(userMoneyUnclaimed);
         if (count != 1) {
             throw new TipsException("淇濆瓨澶辫触锛�");

--
Gitblit v1.8.0