This commit is contained in:
wyn
2026-04-30 23:08:14 +08:00
parent 594c99b4dc
commit 4e672f7e1d
2 changed files with 8 additions and 19 deletions

View File

@@ -615,13 +615,13 @@ public class BuyOrderController {
log.setTitle("积分已退还"); log.setTitle("积分已退还");
log.setContent("积分已退还到账户,可在我的->积分中查看明细"); log.setContent("积分已退还到账户,可在我的->积分中查看明细");
}else if(log.getType()==2){ }else if(log.getType()==2){
log.setTitle(log.getStatus()==1?"到账成功":"已退款,支付宝处理中"); log.setTitle(log.getStatus()==1?"到账成功":(log.getStatus()==2?"支付宝处理中":"提交支付宝处理"));
log.setContent(log.getStatus()==1?"已退到您的支付宝,到账时间以支付宝处理时间为准,可前往「支付宝-账单」查看":"已将退款资金提交给支付宝处理通常情况下退款会原路退回您的支付账户预计会在1-7天内到账"); log.setContent(log.getStatus()==1?"已退到您的支付宝,到账时间以支付宝处理时间为准,可前往「支付宝-账单」查看":(log.getStatus()==2?"已将退款提交给支付宝处理":"支付宝处理中通常情况下退款会原路退回您的支付账户预计会在1-7天内到账"));
}else if(log.getType()==1){ }else if(log.getType()==1){
log.setTitle(log.getStatus()==1?"到账成功":"已退款,微信处理中"); log.setTitle(log.getStatus()==1?"到账成功":(log.getStatus()==2?"微信处理中":"提交微信处理"));
log.setContent(log.getStatus()==1?"已退到您的微信,到账时间以微信处理时间为准,可前往「微信-账单」查看":"已将退款资金提交给微信处理通常情况下退款会原路退回您的支付账户预计会在1-7天内到账"); log.setContent(log.getStatus()==1?"已退到您的微信,到账时间以微信处理时间为准,可前往「微信-账单」查看":(log.getStatus()==2?"已将退款提交给微信处理":"微信处理中通常情况下退款会原路退回您的支付账户预计会在1-7天内到账"));
}else if(log.getType()==0){ }else if(log.getType()==0){
log.setTitle(log.getStatus()==3?"重新申请退款":"发起退款"); log.setTitle("发起退款");
log.setContent("系统会在1-2天内提交处理"); log.setContent("系统会在1-2天内提交处理");
} }
@@ -675,7 +675,7 @@ public class BuyOrderController {
if(Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())){ if(Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())){
return R.error("当前订单支付方式暂不支持退单"); return R.error("当前订单支付方式暂不支持退单");
} }
//设置状态为退款 //设置状态为退款
buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUNDING); buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUNDING);
buyOrderService.updateById(buyOrder); buyOrderService.updateById(buyOrder);

View File

@@ -411,21 +411,10 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
log.info(">>>>>>>>>>App请求微信退款申请接口"); log.info(">>>>>>>>>>App请求微信退款申请接口");
JSONObject responseJson = wxPayUtil.doPostWexinV3(wechatPayConfig.getRefundUrl(), json.toJSONString(),mchName); 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); System.out.println(responseJson);
log.info(">>>>>>>>>>>微信退款返回的信息是 resJson = {}", responseJson.toJSONString()); log.info(">>>>>>>>>>>微信退款返回的信息是 resJson = {}", responseJson.toJSONString());
if ("SUCCESS".equals(responseJson.get("status"))){ buyOrderRefundLogService.insertRefundLog(refundInfo.getRefundId(),1,2);
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);
}
// return responseJson.toJSONString(); // return responseJson.toJSONString();
} }
private void userCoinJf(BuyOrder order){ private void userCoinJf(BuyOrder order){
@@ -501,7 +490,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
refundInfo.setWxRefundNo( resourceMap.get("refund_id").toString()); refundInfo.setWxRefundNo( resourceMap.get("refund_id").toString());
buyOrderRefundService.updateById(refundInfo); buyOrderRefundService.updateById(refundInfo);
buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),1,3,resourceMap.get("reason").toString()); // buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),1,3,resourceMap.get("reason").toString());
} }
} }