From 4e672f7e1d4e8d9b1fa38f9791b076ca5d8ee284 Mon Sep 17 00:00:00 2001 From: wyn <1074145239@qq.com> Date: Thu, 30 Apr 2026 23:08:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BuyOrderController.java | 12 ++++++------ .../weChatPay/service/impl/WxpayServiceImpl.java | 15 ++------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 3518470..6a7533c 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -615,13 +615,13 @@ public class BuyOrderController { log.setTitle("积分已退还"); log.setContent("积分已退还到账户，可在我的->积分中查看明细"); }else if(log.getType()==2){ - log.setTitle(log.getStatus()==1?"到账成功":"已退款，支付宝处理中"); - log.setContent(log.getStatus()==1?"已退到您的支付宝，到账时间以支付宝处理时间为准，可前往「支付宝-账单」查看":"已将退款资金提交给支付宝处理，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账"); + log.setTitle(log.getStatus()==1?"到账成功":(log.getStatus()==2?"支付宝处理中":"提交支付宝处理")); + log.setContent(log.getStatus()==1?"已退到您的支付宝，到账时间以支付宝处理时间为准，可前往「支付宝-账单」查看":(log.getStatus()==2?"已将退款提交给支付宝处理":"支付宝处理中，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账")); }else if(log.getType()==1){ - log.setTitle(log.getStatus()==1?"到账成功":"已退款，微信处理中"); - log.setContent(log.getStatus()==1?"已退到您的微信，到账时间以微信处理时间为准，可前往「微信-账单」查看":"已将退款资金提交给微信处理，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账"); + log.setTitle(log.getStatus()==1?"到账成功":(log.getStatus()==2?"微信处理中":"提交微信处理")); + log.setContent(log.getStatus()==1?"已退到您的微信，到账时间以微信处理时间为准，可前往「微信-账单」查看":(log.getStatus()==2?"已将退款提交给微信处理":"微信处理中，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账")); }else if(log.getType()==0){ - log.setTitle(log.getStatus()==3?"重新申请退款":"发起退款"); + log.setTitle("发起退款"); log.setContent("系统会在1-2天内提交处理"); } @@ -675,7 +675,7 @@ public class BuyOrderController { if(Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())){ return R.error("当前订单支付方式暂不支持退单"); } - //设置状态为已退款 + //设置状态为退款中 buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUNDING); buyOrderService.updateById(buyOrder); diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index 7d7a316..4d2ae80 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -411,21 +411,10 @@ public class WxpayServiceImpl extends ServiceImpl>>>>>>>>>App请求微信退款申请接口"); JSONObject responseJson = wxPayUtil.doPostWexinV3(wechatPayConfig.getRefundUrl(), json.toJSONString(),mchName); -// JSONObject responseJson = new JSONObject(); -// responseJson.put("status","SUCCESS"); -// responseJson.put("refund_id",System.currentTimeMillis()); System.out.println(responseJson); log.info(">>>>>>>>>>>微信退款返回的信息是 resJson = {}", responseJson.toJSONString()); - if ("SUCCESS".equals(responseJson.get("status"))){ - buyOrderRefundLogService.insertRefundLog(refundInfo.getRefundId(),1,2); - - BuyOrderRefund buyOrderRefund = buyOrderRefundService.getById(refundInfo.getRefundId()); - buyOrderRefund.setWxRefundNo(responseJson.getString("refund_id")); - buyOrderRefundService.updateById(buyOrderRefund); - }else{ - buyOrderRefundLogService.insertRefundLog(refundInfo.getRefundId(),1,3); - } + buyOrderRefundLogService.insertRefundLog(refundInfo.getRefundId(),1,2); // return responseJson.toJSONString(); } private void userCoinJf(BuyOrder order){ @@ -501,7 +490,7 @@ public class WxpayServiceImpl extends ServiceImpl