hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-28 16:58:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mall + pay：

Browse Source 
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
This commit is contained in:
YunaiV
2023-07-17 16:38:31 +08:00
parent d0a7f41875
commit 7cf4c5415e
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/AbstractPayClient.java
View File

@@ -46,7 +46,7 @@ public abstract class AbstractPayClient<Config extends PayClientConfig> implemen
*/ */
public final void init() { public final void init() {
doInit(); doInit();
log.info("[init][配置({}) 初始化完成]", config); log.info("[init][客户端({}) 初始化完成]", getId());
} }
/** /**
@@ -59,7 +59,7 @@ public abstract class AbstractPayClient<Config extends PayClientConfig> implemen
if (config.equals(this.config)) { if (config.equals(this.config)) {
return; return;
} }
log.info("[refresh][配置({})发生变化，重新初始化]", config); log.info("[refresh][客户端({})发生变化，重新初始化]", getId());
this.config = config; this.config = config;
// 初始化 // 初始化
this.init(); this.init();

2
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppBaseVO.java
View File

@@ -29,7 +29,7 @@ public class PayAppBaseVO {
@Schema(description = "支付结果的回调地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://127.0.0.1:48080/pay-callback") @Schema(description = "支付结果的回调地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://127.0.0.1:48080/pay-callback")
@NotNull(message = "支付结果的回调地址不能为空") @NotNull(message = "支付结果的回调地址不能为空")
@URL(message = "支付结果的回调地址必须为 URL 格式") @URL(message = "支付结果的回调地址必须为 URL 格式")
private String payNotifyUrl; private String orderNotifyUrl;
@Schema(description = "退款结果的回调地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://127.0.0.1:48080/refund-callback") @Schema(description = "退款结果的回调地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://127.0.0.1:48080/refund-callback")
@NotNull(message = "退款结果的回调地址不能为空") @NotNull(message = "退款结果的回调地址不能为空")

4
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
View File

@@ -155,7 +155,7 @@ public class PayOrderServiceImpl implements PayOrderService {
// 商户相关的字段 // 商户相关的字段
.setOutTradeNo(orderExtension.getNo()) // 注意，此处使用的是 PayOrderExtensionDO.no 属性！ .setOutTradeNo(orderExtension.getNo()) // 注意，此处使用的是 PayOrderExtensionDO.no 属性！
.setSubject(order.getSubject()).setBody(order.getBody()) .setSubject(order.getSubject()).setBody(order.getBody())
.setNotifyUrl(genChannelPayNotifyUrl(channel)) .setNotifyUrl(genChannelOrderNotifyUrl(channel))
.setReturnUrl(reqVO.getReturnUrl()) .setReturnUrl(reqVO.getReturnUrl())
// 订单相关字段 // 订单相关字段
.setPrice(order.getPrice()).setExpireTime(order.getExpireTime()); .setPrice(order.getPrice()).setExpireTime(order.getExpireTime());
@@ -205,7 +205,7 @@ public class PayOrderServiceImpl implements PayOrderService {
* @param channel 支付渠道 * @param channel 支付渠道
* @return 支付渠道的回调地址 配置地址 + "/" + channel id * @return 支付渠道的回调地址 配置地址 + "/" + channel id
*/ */
private String genChannelPayNotifyUrl(PayChannelDO channel) { private String genChannelOrderNotifyUrl(PayChannelDO channel) {
return payProperties.getOrderNotifyUrl() + "/" + channel.getId(); return payProperties.getOrderNotifyUrl() + "/" + channel.getId();
} }

4
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
View File

@@ -134,7 +134,7 @@ public class PayRefundServiceImpl implements PayRefundService {
.setRefundPrice(reqDTO.getPrice()) .setRefundPrice(reqDTO.getPrice())
.setOutTradeNo(orderExtension.getNo()) .setOutTradeNo(orderExtension.getNo())
.setOutRefundNo(refund.getNo()) .setOutRefundNo(refund.getNo())
.setNotifyUrl(genChannelPayNotifyUrl(channel)) .setNotifyUrl(genChannelRefundNotifyUrl(channel))
.setReason(reqDTO.getReason()); .setReason(reqDTO.getReason());
PayRefundRespDTO refundRespDTO = client.unifiedRefund(unifiedReqDTO); // TODO 增加一个 channelErrorCode、channelErrorMsg 字段 PayRefundRespDTO refundRespDTO = client.unifiedRefund(unifiedReqDTO); // TODO 增加一个 channelErrorCode、channelErrorMsg 字段
// 2.3 处理退款返回 // 2.3 处理退款返回
@@ -182,7 +182,7 @@ public class PayRefundServiceImpl implements PayRefundService {
* @param channel 支付渠道 * @param channel 支付渠道
* @return 支付渠道的回调地址 配置地址 + "/" + channel id * @return 支付渠道的回调地址 配置地址 + "/" + channel id
*/ */
private String genChannelPayNotifyUrl(PayChannelDO channel) { private String genChannelRefundNotifyUrl(PayChannelDO channel) {
return payProperties.getRefundNotifyUrl() + "/" + channel.getId(); return payProperties.getRefundNotifyUrl() + "/" + channel.getId();
} }

4
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java
View File

@@ -54,7 +54,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
// 准备参数 // 准备参数
PayAppCreateReqVO reqVO = randomPojo(PayAppCreateReqVO.class, o -> PayAppCreateReqVO reqVO = randomPojo(PayAppCreateReqVO.class, o ->
o.setStatus((RandomUtil.randomEle(CommonStatusEnum.values()).getStatus())) o.setStatus((RandomUtil.randomEle(CommonStatusEnum.values()).getStatus()))
.setPayNotifyUrl(randomURL()) .setOrderNotifyUrl(randomURL())
.setRefundNotifyUrl(randomURL())); .setRefundNotifyUrl(randomURL()));
// 调用 // 调用
@@ -73,7 +73,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
// 准备参数 // 准备参数
PayAppUpdateReqVO reqVO = randomPojo(PayAppUpdateReqVO.class, o -> { PayAppUpdateReqVO reqVO = randomPojo(PayAppUpdateReqVO.class, o -> {
o.setStatus(CommonStatusEnum.ENABLE.getStatus()); o.setStatus(CommonStatusEnum.ENABLE.getStatus());
o.setPayNotifyUrl(randomURL()).setRefundNotifyUrl(randomURL()); o.setOrderNotifyUrl(randomURL()).setRefundNotifyUrl(randomURL());
o.setId(dbApp.getId()); // 设置更新的 ID o.setId(dbApp.getId()); // 设置更新的 ID
}); });

8
yudao-ui-admin/src/views/pay/app/index.vue
View File

@@ -197,8 +197,8 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="支付结果的回调地址" prop="payNotifyUrl"> <el-form-item label="支付结果的回调地址" prop="orderNotifyUrl">
<el-input v-model="form.payNotifyUrl" placeholder="请输入支付结果的回调地址"/> <el-input v-model="form.orderNotifyUrl" placeholder="请输入支付结果的回调地址"/>
</el-form-item> </el-form-item>
<el-form-item label="退款结果的回调地址" prop="refundNotifyUrl"> <el-form-item label="退款结果的回调地址" prop="refundNotifyUrl">
<el-input v-model="form.refundNotifyUrl" placeholder="请输入退款结果的回调地址"/> <el-input v-model="form.refundNotifyUrl" placeholder="请输入退款结果的回调地址"/>
@@ -259,7 +259,7 @@ export default {
rules: { rules: {
name: [{required: true, message: "应用名不能为空", trigger: "blur"}], name: [{required: true, message: "应用名不能为空", trigger: "blur"}],
status: [{required: true, message: "开启状态不能为空", trigger: "blur"}], status: [{required: true, message: "开启状态不能为空", trigger: "blur"}],
payNotifyUrl: [{required: true, message: "支付结果的回调地址不能为空", trigger: "blur"}], orderNotifyUrl: [{required: true, message: "支付结果的回调地址不能为空", trigger: "blur"}],
refundNotifyUrl: [{required: true, message: "退款结果的回调地址不能为空", trigger: "blur"}], refundNotifyUrl: [{required: true, message: "退款结果的回调地址不能为空", trigger: "blur"}],
}, },
// 数据字典 // 数据字典
@@ -319,7 +319,7 @@ export default {
name: undefined, name: undefined,
status: undefined, status: undefined,
remark: undefined, remark: undefined,
payNotifyUrl: undefined, orderNotifyUrl: undefined,
refundNotifyUrl: undefined, refundNotifyUrl: undefined,
}; };
this.resetForm("form"); this.resetForm("form");