From e00d783729e7fbef54c7a6c85f9d6f553d6d3343 Mon Sep 17 00:00:00 2001
From: "1215525055@qq.com" <1215525055@qq.com>
Date: Thu, 24 Apr 2025 19:14:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountItemResourceController.java        |  1 +
 .../impl/AccountRechargeServiceImpl.java      | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/operator/controller/resource/accountitem/AccountItemResourceController.java b/src/main/java/cn/com/tenlion/operator/controller/resource/accountitem/AccountItemResourceController.java
index 5bf8f70..9f1d65a 100644
--- a/src/main/java/cn/com/tenlion/operator/controller/resource/accountitem/AccountItemResourceController.java
+++ b/src/main/java/cn/com/tenlion/operator/controller/resource/accountitem/AccountItemResourceController.java
@@ -8,6 +8,7 @@ import cn.com.tenlion.operator.service.user.expand.UserExpandServiceImpl;
 import cn.com.tenlion.operator.util.EncryptUtil;
 import com.alibaba.fastjson.JSONObject;
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
+import ink.wgink.common.advice.ResponseAdvice;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.common.component.SecurityComponent;
 import ink.wgink.exceptions.SaveException;
diff --git a/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java
index 982c5d3..c6b13bc 100644
--- a/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java
@@ -182,6 +182,7 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA
         }
         params.put("rechargeRemark", rechargeRemark);
         accountRechargeDao.updateRemark(params);
+        AccountRechargeDTO dto = accountRechargeDao.get(params);
         if (StringUtils.isEmpty(po.getAccountItemId()) && po.getReconciliationStatus().equals("0")) {
             // 1. 生成流水记录
             AccountItemVO vo = new AccountItemVO();
@@ -193,8 +194,14 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA
             String accountItemId = iAccountItemService.saveReturnId(vo);
             // 2. 修改状态为2
             updateCheck(po.getAccountRechargeId(), RechargeCheckEnum.RECHARGE_SUCCESS, rechargeRemark, accountItemId, "", DateUtil.getTime());
-            // 3.通知到账
-            sysCallbackService.save("项目充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + po.getAccountId(), null);
+
+            // 套餐包购买的不通知
+            if(StringUtils.isEmpty(dto.getPackageInfoId())) {
+                // 3. 平台通知到账
+                JSONObject jsonobject =new JSONObject();
+                jsonobject.put("money", po.getRechargeMoney());
+                sysCallbackService.save("对公充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + po.getAccountId(), jsonobject);
+            }
         }
     }
 
@@ -666,7 +673,7 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA
     public synchronized void saveConfirmOnline(String id, String orderId, String successTime) {
         AccountRechargeDTO dto = get(id);
         if (StringUtils.isEmpty(dto.getAccountItemId()) &&
-                dto.getReconciliationStatus().equals(ReconciliationStatusEnum.UN_RECONCILIATION.getValue())) {
+            dto.getReconciliationStatus().equals(ReconciliationStatusEnum.UN_RECONCILIATION.getValue())) {
             // 1. 生成流水记录
             AccountItemVO vo = new AccountItemVO();
             vo.setType(1);
@@ -677,8 +684,14 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA
             String accountItemId = iAccountItemService.saveReturnId(vo);
             // 2. 修改状态为2
             updateCheck(dto.getAccountRechargeId(), RechargeCheckEnum.RECHARGE_SUCCESS, "线上充值", accountItemId, orderId, successTime);
-            // 3. 调用第三方接口, 告知充值到账
-            sysCallbackService.save("项目充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + dto.getAccountId(), null);
+
+            // 套餐包购买的不通知
+            if(StringUtils.isEmpty(dto.getPackageInfoId())) {
+                // 3. 平台通知到账
+                JSONObject jsonobject =new JSONObject();
+                jsonobject.put("money", dto.getRechargeMoney());
+                sysCallbackService.save("对公充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + dto.getAccountId(), jsonobject);
+            }
         }
     }