From ead4da19bf1f1806feae2f1d4458fbf976cb81ba Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Wed, 16 Apr 2025 17:23:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5=20,=202=20.=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9=E5=85=AC=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InvoiceRechargeServiceImpl.java | 19 +++++++++++++++++++ .../impl/AccountRechargeServiceImpl.java | 8 ++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/com/tenlion/operator/service/invoicerecharge/impl/InvoiceRechargeServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/invoicerecharge/impl/InvoiceRechargeServiceImpl.java index 39697d9..b9392ca 100644 --- a/src/main/java/cn/com/tenlion/operator/service/invoicerecharge/impl/InvoiceRechargeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/service/invoicerecharge/impl/InvoiceRechargeServiceImpl.java @@ -8,6 +8,11 @@ import cn.com.tenlion.operator.pojo.vos.invoicerecharge.InvoiceRechargeCheckVO; import cn.com.tenlion.operator.pojo.vos.invoicerecharge.InvoiceRechargeDataVO; import cn.com.tenlion.operator.service.invoiceconfig.IInvoiceConfigService; import cn.com.tenlion.operator.serviceother.operator.accountrecharge.IAccountRechargeService; +import cn.com.tenlion.operator.serviceother.operator.sys.callback.SysCallbackService; +import cn.com.tenlion.operator.util.TenlionSMS; +import cn.com.tenlion.projectconfig.util.ProjectConfigUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.pojo.ListPage; @@ -274,6 +279,20 @@ public class InvoiceRechargeServiceImpl extends DefaultBaseService implements II params.put("gmtModified", currentDate); params.put("isDelete", 0); invoiceRechargeDao.save(params); + + if(!isBack) { + JSONArray phoneArray = new JSONArray(); + String[] phones = ProjectConfigUtil.getText("HandleInvoicePhones").split(","); + for(String phone : phones) { + JSONObject obj1 = new JSONObject(); + obj1.put("phone", phone); + phoneArray.add(obj1); + } + Map templateParams = new HashMap<>(); + templateParams.put("dept", params.get("invoiceName").toString()); + templateParams.put("money", params.get("invoiceRechargeMoney").toString()); + TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00014", templateParams, phoneArray); + } return invoiceRechargeId; } diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java index f76b5d9..879e916 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java @@ -143,8 +143,9 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA String accountItemId = iAccountItemService.saveReturnId(vo); // 3. 调用第三方接口, 告知充值到账 + JSONObject jsonobject =new JSONObject(); + jsonobject.put("money", dto.getRechargeMoney()); sysCallbackService.save("系统充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + dto.getAccountId(), null); - // 更新到账状态 Map params1 = getHashMap(2); params1.put("accountRechargeIds", "1"); @@ -290,7 +291,9 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA // 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); + JSONObject jsonobject =new JSONObject(); + jsonobject.put("money", po.getRechargeMoney()); + sysCallbackService.save("对公充值到账", systemApiPathProperties.getCopyright() + "api/pay/recharge-success/user-id/" + po.getAccountId(), jsonobject); // 4. 短信通知到账 /** * TODO-CBC : 金额 大于 10 的 , 短信通知客户已到账 @@ -311,6 +314,7 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA templateParams.put("dept", po.getOrgName()); templateParams.put("date", startDate.format(targetFormatter)); TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00007", templateParams, phoneArray); + } }