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

重构退款逻辑，去掉退款后处理

Browse Source
This commit is contained in:
jason
2021-12-28 17:10:25 +08:00
parent 054c237b1f
commit 08103685f1
25 changed files with 234 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/PayRefundController.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.userserver.modules.pay.controller.order;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.coreservice.modules.pay.service.order.PayRefundCoreService;
import cn.iocoder.yudao.coreservice.modules.pay.service.order.dto.PayRefundReqDTO;
import cn.iocoder.yudao.coreservice.modules.pay.util.PaySeqUtils;
@@ -36,8 +37,9 @@ public class PayRefundController {
PayRefundReqDTO req = PayRefundConvert.INSTANCE.convert(reqVO);
req.setUserIp(getClientIP());
//TODO 测试暂时模拟生成商户退款订单
req.setMerchantRefundNo(PaySeqUtils.genMerchantRefundNo());
//req.setMerchantRefundNo("MO202111210814084370000");
if(StrUtil.isEmpty(reqVO.getMerchantRefundNo())) {
req.setMerchantRefundNo(PaySeqUtils.genMerchantRefundNo());
}
return CommonResult.success( PayRefundConvert.INSTANCE.convert(payRefundCoreService.submitRefundOrder(req)));
}

17
yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayRefundRespVO.java
View File

@@ -15,6 +15,23 @@ import lombok.experimental.Accessors;
@AllArgsConstructor
public class PayRefundRespVO {
/**
* 渠道返回结果
* 退款处理中和退款成功 返回 1
* 失败和其他情况 返回 2
*/
private Integer channelReturnResult;
/**
* 渠道返回code
*/
private String channelReturnCode;
/**
* 渠道返回消息
*/
private String channelReturnMsg;
/**
* 支付退款单编号， 自增
*/

2
yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/convert/order/PayRefundConvert.java
View File

@@ -19,5 +19,5 @@ public interface PayRefundConvert {
PayRefundReqDTO convert(PayRefundReqVO reqVO);
PayRefundRespVO convert(PayRefundRespDTO respBO);
PayRefundRespVO convert(PayRefundRespDTO req);
}