|
|
@@ -71,39 +71,39 @@ public class WxPayController extends BaseController {
|
|
|
return wxPayService.handleNotify(notifyData, request);
|
|
|
}
|
|
|
|
|
|
-// /**
|
|
|
-// * 取消订单
|
|
|
-// *
|
|
|
-// * @param orderId 订单ID
|
|
|
-// * @return 处理结果
|
|
|
-// */
|
|
|
-// @ApiOperation(value = "取消订单")
|
|
|
-// @GetMapping("app-api/pay/cancel")
|
|
|
-// public AjaxResult cancelOrder(@RequestBody String orderId) {
|
|
|
-// return toAjax(wxPayService.cancelOrder(orderId));
|
|
|
-// }
|
|
|
-//
|
|
|
-// /**
|
|
|
-// * <pre>
|
|
|
-// * 微信支付-申请退款
|
|
|
-// * 详见 https://pay.weixin.qq.com/doc/v3/merchant/4012791862
|
|
|
-// * </pre>
|
|
|
-// *
|
|
|
-// * @return 退款操作结果
|
|
|
-// */
|
|
|
-// @ApiOperation(value = "退款")
|
|
|
-// @PostMapping("app-api/pay/refund")
|
|
|
-// public WxPayRefundV3Result refund(@RequestBody AppRefundParam param) throws WxPayException {
|
|
|
-// log.info("收到退款请求,订单号: {}", param.getOrderId());
|
|
|
-// try {
|
|
|
-// WxPayRefundV3Result result = wxPayService.refund(param);
|
|
|
-// log.info("退款处理完成,订单号: {}", param.getOrderId());
|
|
|
-// return result;
|
|
|
-// } catch (WxPayException e) {
|
|
|
-// log.error("退款处理失败,订单号: {}", param.getOrderId(), e);
|
|
|
-// throw e;
|
|
|
-// }
|
|
|
-// }
|
|
|
+ /**
|
|
|
+ * 取消订单
|
|
|
+ *
|
|
|
+ * @param orderId 订单ID
|
|
|
+ * @return 处理结果
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "取消订单")
|
|
|
+ @GetMapping("app-api/pay/cancel")
|
|
|
+ public AjaxResult cancelOrder(@RequestBody String orderId) {
|
|
|
+ return toAjax(wxPayService.cancelOrder(orderId));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * <pre>
|
|
|
+ * 微信支付-申请退款
|
|
|
+ * 详见 https://pay.weixin.qq.com/doc/v3/merchant/4012791862
|
|
|
+ * </pre>
|
|
|
+ *
|
|
|
+ * @return 退款操作结果
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "退款")
|
|
|
+ @PostMapping("app-api/pay/refund")
|
|
|
+ public WxPayRefundV3Result refund(@RequestBody AppRefundParam param) throws WxPayException {
|
|
|
+ log.info("收到退款请求,订单号: {}", param.getOrderId());
|
|
|
+ try {
|
|
|
+ WxPayRefundV3Result result = wxPayService.refund(param);
|
|
|
+ log.info("退款处理完成,订单号: {}", param.getOrderId());
|
|
|
+ return result;
|
|
|
+ } catch (WxPayException e) {
|
|
|
+ log.error("退款处理失败,订单号: {}", param.getOrderId(), e);
|
|
|
+ throw e;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* <pre>
|