Compare commits

...

1 Commits

Author SHA1 Message Date
芋道源码
830c501def Add appKey to PayAppDO and update PayOrderApi to use appKey
---

For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/YunaiV/ruoyi-vue-pro?shareId=XXXX-XXXX-XXXX-XXXX).
2024-08-13 14:32:35 +08:00
4 changed files with 15 additions and 5 deletions

View File

@@ -18,10 +18,10 @@ public class PayOrderCreateReqDTO implements Serializable {
public static final int SUBJECT_MAX_LENGTH = 32; public static final int SUBJECT_MAX_LENGTH = 32;
/** /**
* 应用编号 * 应用密钥
*/ */
@NotNull(message = "应用编号不能为空") @NotEmpty(message = "应用密钥不能为空")
private Long appId; private String appKey;
/** /**
* 用户 IP * 用户 IP
*/ */

View File

@@ -43,4 +43,9 @@ public class PayOrderRespDTO {
// ========== 渠道相关字段 ========== // ========== 渠道相关字段 ==========
/**
* 应用密钥
*/
private String appKey;
} }

View File

@@ -59,4 +59,9 @@ public class PayAppDO extends BaseDO {
*/ */
private String transferNotifyUrl; private String transferNotifyUrl;
/**
* 应用密钥
*/
private String appKey;
} }

View File

@@ -111,11 +111,11 @@ public class PayOrderServiceImpl implements PayOrderService {
@Override @Override
public Long createOrder(PayOrderCreateReqDTO reqDTO) { public Long createOrder(PayOrderCreateReqDTO reqDTO) {
// 校验 App // 校验 App
PayAppDO app = appService.validPayApp(reqDTO.getAppId()); PayAppDO app = appService.validPayApp(reqDTO.getAppKey());
// 查询对应的支付交易单是否已经存在。如果是,则直接返回 // 查询对应的支付交易单是否已经存在。如果是,则直接返回
PayOrderDO order = orderMapper.selectByAppIdAndMerchantOrderId( PayOrderDO order = orderMapper.selectByAppIdAndMerchantOrderId(
reqDTO.getAppId(), reqDTO.getMerchantOrderId()); app.getId(), reqDTO.getMerchantOrderId());
if (order != null) { if (order != null) {
log.warn("[createOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(), log.warn("[createOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(),
order.getMerchantOrderId(), toJsonString(order)); // 理论来说,不会出现这个情况 order.getMerchantOrderId(), toJsonString(order)); // 理论来说,不会出现这个情况