From 9a5ca744d788c4f83cde1e2fd8b58c2eedeaf27f Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Thu, 20 Feb 2025 21:21:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=85=85?= =?UTF-8?q?=E5=80=BC=E5=9B=9E=E8=B0=83=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AccountRechargeServiceImpl.java | 18 ++---------------- .../remote/IRemoteWangGengInvoiceService.java | 1 + 2 files changed, 3 insertions(+), 16 deletions(-) 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 ab17367..e1551f8 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 @@ -180,7 +180,8 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA String accountItemId = iAccountItemService.saveReturnId(vo); // 2. 修改状态为2 updateCheck(po.getAccountRechargeId(), RechargeCheckEnum.RECHARGE_SUCCESS, rechargeRemark, accountItemId, "", DateUtil.getTime()); - remoteWangGengInvoiceSerivceImpl.paySuccess(po.getAccountId()); + // 3.通知到账 + sysCallbackService.save("项目充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + po.getAccountId(), null); } } @@ -550,9 +551,6 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA } } - @Autowired - private IRemoteWangGengInvoiceService remoteWangGengInvoiceSerivceImpl; - @Override public synchronized void saveConfirmOnline(String id, String orderId, String successTime) { AccountRechargeDTO dto = get(id); @@ -568,18 +566,6 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA String accountItemId = iAccountItemService.saveReturnId(vo); // 2. 修改状态为2 updateCheck(dto.getAccountRechargeId(), RechargeCheckEnum.RECHARGE_SUCCESS, "线上充值", accountItemId, orderId, successTime); - if (!StringUtils.isBlank(dto.getSelfData())) { - try { - JSONObject selfData = JSON.parseObject(dto.getSelfData()); - if (selfData.containsKey("type") && StringUtils.equals("PROJ_PKG", selfData.getString("type"))) { - LOG.debug("通知付打包款成功"); - sysCallbackService.save("项目打包付款成功", systemApiPathProperties.getCopyright() + "api/pay/pkg-pay-success/proj-id/" + selfData.getString("projId"), null); - return; - } - } catch (Exception e) { - LOG.error(e.getMessage(), e); - } - } // 3. 调用第三方接口, 告知充值到账 sysCallbackService.save("项目充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + dto.getAccountId(), null); } diff --git a/src/main/java/cn/com/tenlion/operator/service/remote/IRemoteWangGengInvoiceService.java b/src/main/java/cn/com/tenlion/operator/service/remote/IRemoteWangGengInvoiceService.java index 819297d..9dbcb5c 100644 --- a/src/main/java/cn/com/tenlion/operator/service/remote/IRemoteWangGengInvoiceService.java +++ b/src/main/java/cn/com/tenlion/operator/service/remote/IRemoteWangGengInvoiceService.java @@ -40,6 +40,7 @@ public interface IRemoteWangGengInvoiceService { */ void update(String invoiceId, InvoiceExamineVO invoiceExamineVO); + @Deprecated void paySuccess(String userId); }