diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/ReverseStatusEnums.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/ReverseStatusEnums.java index 1b8a29e..f8ad7b5 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/ReverseStatusEnums.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/ReverseStatusEnums.java @@ -24,6 +24,8 @@ public enum ReverseStatusEnums { agree_refunded("agree_refunded", "同意退款"), + weixin_refunding("weixin_refunding", "微信退款中"), + refunded("refunded", "退款完成"), close("close", "退款关闭"); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index a627f2e..a98278e 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -348,7 +348,7 @@ public class AdminOrderController { reverseOrderEntity.setWeixinFundsAccount(JSON.toJSONString(refund.getFundsAccount())); reverseOrderEntity.setWeixinStatus(JSON.toJSONString(refund.getStatus())); reverseOrderEntity.setWeixinRefundId(refund.getRefundId()); - reverseOrderEntity.setStatus(ReverseStatusEnums.agree_refunded.getStatus()); // 设置 状态为同意退款 + reverseOrderEntity.setStatus(ReverseStatusEnums.weixin_refunding.getStatus()); // 设置 状态为同意退款 reverseOrderEntity.setWeixinTransactionId(refund.getTransactionId()); reverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount()); reverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund)); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java index 323828a..bd94e5e 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java @@ -173,6 +173,7 @@ public class AdminReverseController { vvReverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount()); vvReverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund)); vvReverseOrderEntity.setGmtPreRefund(new Date()); + vvReverseOrderEntity.setStatus(ReverseStatusEnums.weixin_refunding.getStatus()); vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); } return R.ok(); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppWeiXinRefundNotifyController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppWeiXinRefundNotifyController.java index 8646855..a3c36bc 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppWeiXinRefundNotifyController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppWeiXinRefundNotifyController.java @@ -111,7 +111,7 @@ public class AppWeiXinRefundNotifyController { if (!StringUtils.isEmpty(refund_status) && "SUCCESS".equals(refund_status)) { VvReverseOrderEntity vvReverseOrderEntity = reverseOrderDao.selectVvReverseOrderById(NumberUtil.objToLong(out_refund_no)); 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.setStatus(ReverseStatusEnums.refunded.getStatus()); vvReverseOrderEntity.setGmtRefundNotify(new Date()); @@ -128,8 +128,6 @@ public class AppWeiXinRefundNotifyController { vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity); } } - - //你自己的业务 parm.put("code", "SUCCESS"); parm.put("message", "成功");