From 2384f02588fe39123976054e72f93df2ffbe1ca6 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 14 Aug 2025 18:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../external/server/ExternalService.java | 3 ++- .../external/server/impl/TangeServiceImpl.java | 5 +++-- .../other/service/PaymentOrderService.java | 18 +++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/ExternalService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/ExternalService.java index b56060a..1f07852 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/ExternalService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/ExternalService.java @@ -1,6 +1,7 @@ package net.lab1024.sa.admin.module.business.external.server; import net.lab1024.sa.admin.module.business.device.domain.tange.DeviceQuery; +import net.lab1024.sa.admin.module.business.other.domain.entity.PackageDetailEntity; import net.lab1024.sa.admin.module.business.other.domain.entity.PaymentOrderEntity; public interface ExternalService { @@ -53,7 +54,7 @@ public interface ExternalService { String deviceTz(String deviceId); - String order(PaymentOrderEntity paymentOrderEntity); + String order(PaymentOrderEntity paymentOrderEntity, PackageDetailEntity packageDetailEntity); String refund(PaymentOrderEntity paymentOrderEntity); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/impl/TangeServiceImpl.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/impl/TangeServiceImpl.java index 1487a8b..68f5c60 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/impl/TangeServiceImpl.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/impl/TangeServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import net.lab1024.sa.admin.module.business.device.domain.tange.DeviceQuery; import net.lab1024.sa.admin.module.business.external.config.TangeProperties; +import net.lab1024.sa.admin.module.business.other.domain.entity.PackageDetailEntity; import net.lab1024.sa.admin.module.business.other.domain.entity.PaymentOrderEntity; import net.lab1024.sa.base.common.util.SmartRequestUtil; import net.lab1024.sa.base.constant.RedisKeyConst; @@ -644,7 +645,7 @@ public class TangeServiceImpl extends AbstractHandler { } @Override - public String order(PaymentOrderEntity paymentOrderEntity) { + public String order(PaymentOrderEntity paymentOrderEntity, PackageDetailEntity packageDetailEntity) { String endPoint = GetApiServerHost(); String method = "POST"; String uri = "/v2/cloud-payment/order"; @@ -652,7 +653,7 @@ public class TangeServiceImpl extends AbstractHandler { Map params = new TreeMap(); params.put("device_id", paymentOrderEntity.getDeviceId()); - params.put("service_id", paymentOrderEntity.getTemplateId()); + params.put("service_id", packageDetailEntity.getTemplateId()); params.put("immediate_use", true); // 将body参数转换为JSON对象 JSONObject jsonObject = new JSONObject(); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/service/PaymentOrderService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/service/PaymentOrderService.java index 90d0820..64943d8 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/service/PaymentOrderService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/service/PaymentOrderService.java @@ -228,21 +228,21 @@ public class PaymentOrderService { if (eventType.equals("TRANSACTION.SUCCESS")) { String outTradeNo = jsonObject.getString("out_trade_no"); PaymentOrderEntity history = paymentOrderDao.selectOne(Wrappers.lambdaQuery().eq(PaymentOrderEntity::getPayOrderNo, outTradeNo)); - wrapper.set(PaymentOrderEntity::getState, 1); - wrapper.set(PaymentOrderEntity::getPayTime, new Date()); - wrapper.set(PaymentOrderEntity::getEffectiveTime, DateUtil.offsetDay(new Date(), history.getEffectiveDay())); - PaymentOrderEntity paymentOrderEntity = paymentOrderDao.selectOne(Wrappers.lambdaQuery() - .eq(PaymentOrderEntity::getPayOrderNo, outTradeNo)); - if (paymentOrderEntity != null) { + if (history != null) { + wrapper.set(PaymentOrderEntity::getState, 1); + wrapper.set(PaymentOrderEntity::getPayTime, new Date()); + wrapper.set(PaymentOrderEntity::getEffectiveTime, DateUtil.offsetDay(new Date(), history.getEffectiveDay())); + wrapper.eq(PaymentOrderEntity::getPayOrderNo, outTradeNo); + paymentOrderManager.update(wrapper); // 调用探歌下单 - String externalResult = externalService.order(paymentOrderEntity); + PackageDetailEntity packageDetailEntity = packageDetailDao.selectById(history.getTemplateId()); + String externalResult = externalService.order(history, packageDetailEntity); JSONObject externalObj = JSONObject.parseObject(externalResult); if (externalObj.getInteger("code") == 200) { wrapper.set(PaymentOrderEntity::getTangeOrderId, externalObj.getJSONObject("data").getString("merchant_number")); } } - wrapper.eq(PaymentOrderEntity::getPayOrderNo, outTradeNo); - paymentOrderManager.update(wrapper); + } else if (eventType.equals("REFUND.SUCCESS")) { String outRefundNo = jsonObject.getString("out_refund_no"); wrapper.set(PaymentOrderEntity::getState, 2);