xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 18:26:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!167 2022-2-15 Carl

Browse Source 
Merge pull request !167 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-02-15 04:04:17 +00:00 committed by Gitee
commit 167506c2e9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java
View File

@ -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);

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
View File

@ -357,7 +357,7 @@ public class OrderController {
}
@ApiOperation(value = "重新支付（JSAPI）", notes = "重新支付（JSAPI）")
@PostMapping("royalcanin/repayOrderWXH5")
@PostMapping("royalcanin/repayOrderJSAPI")
public ResponseDTO<String> repayOrderWXJSAPI(String orderNo) throws Exception {
OrderEntity ordersEntity = orderService.findByOrderId(orderNo);
if(ordersEntity != null){