quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-09 19:59:34 +08:00
parent 7d953717a2
commit d177690ac1
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/ReverseStatusEnums.java
View File

@ -24,6 +24,8 @@ public enum ReverseStatusEnums {
agree_refunded("agree_refunded", "同意退款"), agree_refunded("agree_refunded", "同意退款"),
weixin_refunding("weixin_refunding", "微信退款中"),
refunded("refunded", "退款完成"), refunded("refunded", "退款完成"),
close("close", "退款关闭"); close("close", "退款关闭");

2
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
View File

@ -348,7 +348,7 @@ public class AdminOrderController {
reverseOrderEntity.setWeixinFundsAccount(JSON.toJSONString(refund.getFundsAccount())); reverseOrderEntity.setWeixinFundsAccount(JSON.toJSONString(refund.getFundsAccount()));
reverseOrderEntity.setWeixinStatus(JSON.toJSONString(refund.getStatus())); reverseOrderEntity.setWeixinStatus(JSON.toJSONString(refund.getStatus()));
reverseOrderEntity.setWeixinRefundId(refund.getRefundId()); reverseOrderEntity.setWeixinRefundId(refund.getRefundId());
reverseOrderEntity.setStatus(ReverseStatusEnums.agree_refunded.getStatus()); // 设置 状态为同意退款 reverseOrderEntity.setStatus(ReverseStatusEnums.weixin_refunding.getStatus()); // 设置 状态为同意退款
reverseOrderEntity.setWeixinTransactionId(refund.getTransactionId()); reverseOrderEntity.setWeixinTransactionId(refund.getTransactionId());
reverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount()); reverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount());
reverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund)); reverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund));

1
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java
View File

@ -173,6 +173,7 @@ public class AdminReverseController {
vvReverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount()); vvReverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount());
vvReverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund)); vvReverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund));
vvReverseOrderEntity.setGmtPreRefund(new Date()); vvReverseOrderEntity.setGmtPreRefund(new Date());
vvReverseOrderEntity.setStatus(ReverseStatusEnums.weixin_refunding.getStatus());
vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity);
} }
return R.ok(); return R.ok();

4
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppWeiXinRefundNotifyController.java
View File

@ -111,7 +111,7 @@ public class AppWeiXinRefundNotifyController {
if (!StringUtils.isEmpty(refund_status) && "SUCCESS".equals(refund_status)) { if (!StringUtils.isEmpty(refund_status) && "SUCCESS".equals(refund_status)) {
VvReverseOrderEntity vvReverseOrderEntity = reverseOrderDao.selectVvReverseOrderById(NumberUtil.objToLong(out_refund_no)); VvReverseOrderEntity vvReverseOrderEntity = reverseOrderDao.selectVvReverseOrderById(NumberUtil.objToLong(out_refund_no));
log.info("AppWeiXinRefundNotifyController refundNotifyUrl reverseStatus:{}", vvReverseOrderEntity.getStatus()); log.info("AppWeiXinRefundNotifyController refundNotifyUrl reverseStatus:{}", vvReverseOrderEntity.getStatus());
if(ReverseStatusEnums.agree_refunded.getStatus().equals(vvReverseOrderEntity.getStatus())){ if(ReverseStatusEnums.weixin_refunding.getStatus().equals(vvReverseOrderEntity.getStatus())){
vvReverseOrderEntity.setGmtRefunded(new Date()); vvReverseOrderEntity.setGmtRefunded(new Date());
vvReverseOrderEntity.setStatus(ReverseStatusEnums.refunded.getStatus()); vvReverseOrderEntity.setStatus(ReverseStatusEnums.refunded.getStatus());
vvReverseOrderEntity.setGmtRefundNotify(new Date()); vvReverseOrderEntity.setGmtRefundNotify(new Date());
@ -128,8 +128,6 @@ public class AppWeiXinRefundNotifyController {
vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity); vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
} }
} }
//你自己的业务 //你自己的业务
parm.put("code", "SUCCESS"); parm.put("code", "SUCCESS");
parm.put("message", "成功"); parm.put("message", "成功");