From 0746ff4e83dc2e21b6fed86f4a20a6620001841b Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 15 Feb 2022 11:45:27 +0800 Subject: [PATCH 1/2] exchange img --- .../module/system/royalcanin/good/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 88c2090a..f19e716e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -357,7 +357,7 @@ public class OrderController { } @ApiOperation(value = "重新支付（JSAPI）", notes = "重新支付（JSAPI）") - @PostMapping("royalcanin/repayOrderWXH5") + @PostMapping("royalcanin/repayOrderJSAPI") public ResponseDTO repayOrderWXJSAPI(String orderNo) throws Exception { OrderEntity ordersEntity = orderService.findByOrderId(orderNo); if(ordersEntity != null){ From 823e929aa4cebc99aa2a5cccc0bfaf6cb18f9136 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 15 Feb 2022 12:01:39 +0800 Subject: [PATCH 2/2] fix Alipay error --- .../smartadmin/module/system/alipay/AliPayService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java index ea4c42b0..a7818806 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java @@ -28,8 +28,9 @@ public class AliPayService { bizContent.put("subject","皇家宠物食品官方商城"); bizContent.put("total_amount",aliPayEntity.getTotal_amount()); bizContent.put("out_trade_no",aliPayEntity.getOut_trade_no()); - bizContent.put("goods_detail", aliPayEntity.getGoodsDetail()); +// bizContent.put("goods_detail", aliPayEntity.getGoodsDetail()); bizContent.put("product_code", aliPayEntity.getProduct_code()); + bizContent.put("quit_url", AlipayConfig.return_url); AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest(); request.setBizContent(bizContent.toString()); request.setNotifyUrl(AlipayConfig.notify_url); @@ -49,8 +50,9 @@ public class AliPayService { bizContent.put("subject","皇家宠物食品官方商城"); bizContent.put("total_amount",aliPayEntity.getTotal_amount()); bizContent.put("out_trade_no",aliPayEntity.getOut_trade_no()); - bizContent.put("goods_detail", aliPayEntity.getGoodsDetail()); +// bizContent.put("goods_detail", aliPayEntity.getGoodsDetail()); bizContent.put("product_code", aliPayEntity.getProduct_code()); + bizContent.put("quit_url", AlipayConfig.return_url); AlipayTradePagePayRequest request = new AlipayTradePagePayRequest (); request.setBizContent(bizContent.toString()); request.setNotifyUrl(AlipayConfig.notify_url);