admin/wisdomsite_video_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单修改

Browse Source
This commit is contained in:
pengjie 2025-08-14 18:01:26 +08:00
parent 951d184995
commit 2384f02588
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/ExternalService.java vendored
View File

@ -1,6 +1,7 @@
package net.lab1024.sa.admin.module.business.external.server; 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.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; import net.lab1024.sa.admin.module.business.other.domain.entity.PaymentOrderEntity;
public interface ExternalService { public interface ExternalService {
@ -53,7 +54,7 @@ public interface ExternalService {
String deviceTz(String deviceId); String deviceTz(String deviceId);
String order(PaymentOrderEntity paymentOrderEntity); String order(PaymentOrderEntity paymentOrderEntity, PackageDetailEntity packageDetailEntity);
String refund(PaymentOrderEntity paymentOrderEntity); String refund(PaymentOrderEntity paymentOrderEntity);
} }

5
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/external/server/impl/TangeServiceImpl.java vendored
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import net.lab1024.sa.admin.module.business.device.domain.tange.DeviceQuery; 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.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.admin.module.business.other.domain.entity.PaymentOrderEntity;
import net.lab1024.sa.base.common.util.SmartRequestUtil; import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.constant.RedisKeyConst; import net.lab1024.sa.base.constant.RedisKeyConst;
@ -644,7 +645,7 @@ public class TangeServiceImpl extends AbstractHandler {
} }
@Override @Override
public String order(PaymentOrderEntity paymentOrderEntity) { public String order(PaymentOrderEntity paymentOrderEntity, PackageDetailEntity packageDetailEntity) {
String endPoint = GetApiServerHost(); String endPoint = GetApiServerHost();
String method = "POST"; String method = "POST";
String uri = "/v2/cloud-payment/order"; String uri = "/v2/cloud-payment/order";
@ -652,7 +653,7 @@ public class TangeServiceImpl extends AbstractHandler {
Map<String, Object> params = new TreeMap<String, Object>(); Map<String, Object> params = new TreeMap<String, Object>();
params.put("device_id", paymentOrderEntity.getDeviceId()); params.put("device_id", paymentOrderEntity.getDeviceId());
params.put("service_id", paymentOrderEntity.getTemplateId()); params.put("service_id", packageDetailEntity.getTemplateId());
params.put("immediate_use", true); params.put("immediate_use", true);
// 将body参数转换为JSON对象 // 将body参数转换为JSON对象
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();

12
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/service/PaymentOrderService.java
View File

@ -228,21 +228,21 @@ public class PaymentOrderService {
if (eventType.equals("TRANSACTION.SUCCESS")) { if (eventType.equals("TRANSACTION.SUCCESS")) {
String outTradeNo = jsonObject.getString("out_trade_no"); String outTradeNo = jsonObject.getString("out_trade_no");
PaymentOrderEntity history = paymentOrderDao.selectOne(Wrappers.<PaymentOrderEntity>lambdaQuery().eq(PaymentOrderEntity::getPayOrderNo, outTradeNo)); PaymentOrderEntity history = paymentOrderDao.selectOne(Wrappers.<PaymentOrderEntity>lambdaQuery().eq(PaymentOrderEntity::getPayOrderNo, outTradeNo));
if (history != null) {
wrapper.set(PaymentOrderEntity::getState, 1); wrapper.set(PaymentOrderEntity::getState, 1);
wrapper.set(PaymentOrderEntity::getPayTime, new Date()); wrapper.set(PaymentOrderEntity::getPayTime, new Date());
wrapper.set(PaymentOrderEntity::getEffectiveTime, DateUtil.offsetDay(new Date(), history.getEffectiveDay())); wrapper.set(PaymentOrderEntity::getEffectiveTime, DateUtil.offsetDay(new Date(), history.getEffectiveDay()));
PaymentOrderEntity paymentOrderEntity = paymentOrderDao.selectOne(Wrappers.<PaymentOrderEntity>lambdaQuery() wrapper.eq(PaymentOrderEntity::getPayOrderNo, outTradeNo);
.eq(PaymentOrderEntity::getPayOrderNo, outTradeNo)); paymentOrderManager.update(wrapper);
if (paymentOrderEntity != null) {
// 调用探歌下单 // 调用探歌下单
String externalResult = externalService.order(paymentOrderEntity); PackageDetailEntity packageDetailEntity = packageDetailDao.selectById(history.getTemplateId());
String externalResult = externalService.order(history, packageDetailEntity);
JSONObject externalObj = JSONObject.parseObject(externalResult); JSONObject externalObj = JSONObject.parseObject(externalResult);
if (externalObj.getInteger("code") == 200) { if (externalObj.getInteger("code") == 200) {
wrapper.set(PaymentOrderEntity::getTangeOrderId, externalObj.getJSONObject("data").getString("merchant_number")); wrapper.set(PaymentOrderEntity::getTangeOrderId, externalObj.getJSONObject("data").getString("merchant_number"));
} }
} }
wrapper.eq(PaymentOrderEntity::getPayOrderNo, outTradeNo);
paymentOrderManager.update(wrapper);
} else if (eventType.equals("REFUND.SUCCESS")) { } else if (eventType.equals("REFUND.SUCCESS")) {
String outRefundNo = jsonObject.getString("out_refund_no"); String outRefundNo = jsonObject.getString("out_refund_no");
wrapper.set(PaymentOrderEntity::getState, 2); wrapper.set(PaymentOrderEntity::getState, 2);