autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-14 12:20:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-27 16:57:42 +08:00
parent 36aa58bd6b
commit 3680782a0b
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -71,7 +71,7 @@ public class TempController extends BaseController {
public RestApiResponse<?> tempOrderRefund() { public RestApiResponse<?> tempOrderRefund() {
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
orderBasicInfoService.tempOrderRefund(); // orderBasicInfoService.tempOrderRefund();
response = new RestApiResponse<>(); response = new RestApiResponse<>();
} catch (BusinessException e) { } catch (BusinessException e) {
logger.warn("临时订单退款接口 warn", e); logger.warn("临时订单退款接口 warn", e);

14
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1137,10 +1137,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 退款有两种情况 1-订单结算退款 2-用户余额退款 // 退款有两种情况 1-订单结算退款 2-用户余额退款
String refundType = dto.getRefundType(); String refundType = dto.getRefundType();
if (StringUtils.equals(refundType, "1")) { if (StringUtils.equals(refundType, "1")) {
WechatPayRefundResponse response = refundForOrder(dto); WechatPayRefundResponse response = refundOrderWithWechatPay(dto);
logger.info("订单结算退款 result:{}", JSONObject.toJSONString(response)); logger.info("订单结算退款 result:{}", JSONObject.toJSONString(response));
} else if (StringUtils.equals(refundType, "2")) { } else if (StringUtils.equals(refundType, "2")) {
WechatPayRefundResponse response = refundForBalance(dto); WechatPayRefundResponse response = refundBalanceWithWechatPay(dto);
logger.info("用户余额退款 result:{}", JSONObject.toJSONString(response)); logger.info("用户余额退款 result:{}", JSONObject.toJSONString(response));
} else { } else {
logger.warn("没有找到退款处理逻辑"); logger.warn("没有找到退款处理逻辑");
@@ -1434,9 +1434,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
/** /**
* 订单退款处理逻辑 * 微信支付-订单退款处理逻辑
*/ */
private WechatPayRefundResponse refundForOrder(ApplyRefundDTO dto) { private WechatPayRefundResponse refundOrderWithWechatPay(ApplyRefundDTO dto) {
// 查出来原来的支付信息 // 查出来原来的支付信息
WxpayCallbackRecord record = wxpayCallbackRecordService.selectByOrderCode(dto.getOrderCode()); WxpayCallbackRecord record = wxpayCallbackRecordService.selectByOrderCode(dto.getOrderCode());
if (Objects.isNull(record)) { if (Objects.isNull(record)) {
@@ -1474,11 +1474,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
/** /**
* 余额退款处理逻辑 * 微信支付-余额退款处理逻辑
*
* @param dto
*/ */
private WechatPayRefundResponse refundForBalance(ApplyRefundDTO dto) { private WechatPayRefundResponse refundBalanceWithWechatPay(ApplyRefundDTO dto) {
// 查会员余额 // 查会员余额
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId());
if (memberVO == null) { if (memberVO == null) {