hbyt/cloud-battery-manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:小程序退款及公众号推送消息+配置回调地址

Browse Source
This commit is contained in:
lhb 2025-04-30 16:36:25 +08:00
parent f10bbd184e
commit 25d0c60809
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/TradeController.java
View File

@ -2,6 +2,7 @@ package com.evotech.hd.cloud.controller.order;
import java.util.List; import java.util.List;
import com.evotech.hd.common.core.entity.cloud.request.PrePayRequest;
import org.springdoc.core.annotations.ParameterObject; import org.springdoc.core.annotations.ParameterObject;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -71,4 +72,23 @@ public class TradeController {
return tradeService.wechatPayNotifyHandle(tradeDetail); return tradeService.wechatPayNotifyHandle(tradeDetail);
} }
@Operation(summary = "退款查询")
@GetMapping("/tradeList")
@ApiOperationSupport(order = 6)
public List<TradeDetail> tradeList(@ParameterObject PrePayRequest preltr) {
PageListTradeRequest pltr2 = new PageListTradeRequest();
pltr2.setWuid(preltr.getWuid());
pltr2.setPayType(preltr.getPayType());
pltr2.setTradeType(preltr.getTradeType());
return tradeService.tradeList(pltr2);
}
@Operation(summary = "微信退款余额回调业务处理")
@PostMapping({"/wechatpay/backnotify"})
@ApiOperationSupport(order = 7)
@Hidden
public Result<String> wechatBackNotifyHandle(@ParameterObject TradeDetail tradeDetail) {
return tradeService.wechatBackNotifyHandle(tradeDetail);
}
} }

4
wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatPayServiceImpl.java
View File

@ -218,8 +218,8 @@ public class WechatPayServiceImpl implements WechatPayService {
request.setTransactionId(transactionId); request.setTransactionId(transactionId);
request.setReason(reason); request.setReason(reason);
request.setOutRefundNo("HD1001REFUND" + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_FORMATTER) + RandomUtil.randomInt(1000, 10000)); request.setOutRefundNo("HD1001REFUND" + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_FORMATTER) + RandomUtil.randomInt(1000, 10000));
// request.setNotifyUrl(xcxProperties.getRefundNotifyUrl()); request.setNotifyUrl(xcxProperties.getRefundNotifyUrl());
request.setNotifyUrl("https://www.famhub.cn/gateway/wechat/wechatpay/refundsback/msg"); // request.setNotifyUrl("https://www.famhub.cn/gateway/wechat/wechatpay/refundsback/msg");
AmountReq amount = new AmountReq(); AmountReq amount = new AmountReq();
amount.setRefund(Long.valueOf(money)); amount.setRefund(Long.valueOf(money));
amount.setCurrency("CNY"); amount.setCurrency("CNY");