Merge pull request '退款功能BUG修复(商户提现后余额不足时进行退款,微信支付返回异常后订单处于退款中的状态,未重置到未退款的状态)' (#19) from bugfix/tgh20230703 into test

Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/19
pull/15/head
TanGH 2023-07-03 17:45:39 +08:00
commit acc88820e5
1 changed files with 8 additions and 0 deletions

View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.pay.config.WxPayOneAutoConfiguration;
import cn.iocoder.yudao.framework.pay.properties.WxPayProperties;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper;
import cn.iocoder.yudao.module.shop.response.member.InitOrderResponse;
import cn.iocoder.yudao.module.shop.utils.OrderUtil;
import cn.iocoder.yudao.module.system.api.tenant.TenantApi;
@ -42,6 +43,9 @@ public class WxPayStrategy implements IPayStrategy{
@Autowired
private TenantApi tenantApi;
@Autowired
private RechargeOrderMapper rechargeOrderMapper;
@Override
public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) {
Long requiredTenantId = TenantContextHolder.getRequiredTenantId();
@ -90,6 +94,10 @@ public class WxPayStrategy implements IPayStrategy{
log.info("退款回调[{}]", JSONUtil.toJsonPrettyStr(wxPayRefundV3Request));
}catch (Exception e){
log.error(e.getMessage(),e);
// 退款异常后将充值订单状态重置为未退款(维护阶段,暂不考虑优化代码)
orderDO.setRefundStatus(0);
rechargeOrderMapper.updateById(orderDO);
}
}