From 3978b640efbbd522aa7d5e1e1eb806ee399cf375 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Tue, 15 Feb 2022 12:14:53 +0800
Subject: [PATCH 1/2] fix Alipay error

---
 .../lab1024/smartadmin/module/system/alipay/AliPayService.java | 3 ---
 1 file changed, 3 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 a7818806..b6099900 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,7 +28,6 @@ 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("product_code", aliPayEntity.getProduct_code());
         bizContent.put("quit_url", AlipayConfig.return_url);
         AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
@@ -50,9 +49,7 @@ 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("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);

From c5444db2ee6b823840aee2175c18650e53949624 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Tue, 15 Feb 2022 14:53:07 +0800
Subject: [PATCH 2/2] fix Alipay error

---
 .../module/system/alipay/AliPayService.java   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 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 b6099900..36b5392c 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
@@ -26,7 +26,7 @@ public class AliPayService {
     public String generateOrderPhone(AliPayEntity aliPayEntity) throws Exception {
         JSONObject bizContent = new JSONObject();
         bizContent.put("subject","皇家宠物食品官方商城");
-        bizContent.put("total_amount",aliPayEntity.getTotal_amount());
+        bizContent.put("total_amount",String.format("%.2f", Double.parseDouble(aliPayEntity.getTotal_amount())));
         bizContent.put("out_trade_no",aliPayEntity.getOut_trade_no());
         bizContent.put("product_code", aliPayEntity.getProduct_code());
         bizContent.put("quit_url", AlipayConfig.return_url);
@@ -35,7 +35,7 @@ public class AliPayService {
         request.setNotifyUrl(AlipayConfig.notify_url);
         request.setReturnUrl(AlipayConfig.return_url);
         AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.gatewayUrl, AlipayConfig.app_id, AlipayConfig.merchant_private_key, "json", AlipayConfig.charset, AlipayConfig.alipay_public_key, AlipayConfig.sign_type);
-        AlipayTradeWapPayResponse alipayTradeWapPayResponse  = alipayClient.pageExecute(request);
+        AlipayTradeWapPayResponse alipayTradeWapPayResponse = alipayClient.pageExecute(request);
         if (alipayTradeWapPayResponse.isSuccess()) {
             String body = alipayTradeWapPayResponse.getBody();
             return body;
@@ -45,18 +45,18 @@ public class AliPayService {
     }
 
     public String generateOrderPC(AliPayEntity aliPayEntity) throws Exception {
-        JSONObject bizContent = new JSONObject();
-        bizContent.put("subject","皇家宠物食品官方商城");
-        bizContent.put("total_amount",aliPayEntity.getTotal_amount());
-        bizContent.put("out_trade_no",aliPayEntity.getOut_trade_no());
-        bizContent.put("product_code", aliPayEntity.getProduct_code());
+        AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.gatewayUrl, AlipayConfig.app_id, AlipayConfig.merchant_private_key, "json", AlipayConfig.charset, AlipayConfig.alipay_public_key, AlipayConfig.sign_type);
         AlipayTradePagePayRequest request = new AlipayTradePagePayRequest ();
-        request.setBizContent(bizContent.toString());
         request.setNotifyUrl(AlipayConfig.notify_url);
         request.setReturnUrl(AlipayConfig.return_url);
-        AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.gatewayUrl, AlipayConfig.app_id, AlipayConfig.merchant_private_key, "json", AlipayConfig.charset, AlipayConfig.alipay_public_key, AlipayConfig.sign_type);
+        JSONObject bizContent = new JSONObject();
+        bizContent.put("subject","皇家宠物食品官方商城");
+        bizContent.put("total_amount",String.format("%.2f", Double.parseDouble(aliPayEntity.getTotal_amount())));
+        bizContent.put("out_trade_no",aliPayEntity.getOut_trade_no());
+        bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY");
+        request.setBizContent(bizContent.toString());
 
-        AlipayTradePagePayResponse alipayTradePagePayResponse   = alipayClient.pageExecute(request);
+        AlipayTradePagePayResponse alipayTradePagePayResponse = alipayClient.pageExecute(request);
         if (alipayTradePagePayResponse.isSuccess()) {
             String body = alipayTradePagePayResponse.getBody();
             return body;