回调修改

src/main/java/com/izouma/nineth/service/GiftOrderService.java

@@ -146,11 +146,12 @@ public class GiftOrderService {
             bizContent.put("body", body.toJSONString());
 
             AlipayTradeWapPayRequest alipayRequest = new AlipayTradeWapPayRequest();
-            if (asset.getProjectId() == 1) {
-                alipayRequest.setReturnUrl(generalProperties.getHost() + "/cosmos/home");
-            } else {
-                alipayRequest.setReturnUrl(generalProperties.getHost() + "/9th/home");
-            }
+//            if (asset.getProjectId() == 1) {
+//                alipayRequest.setReturnUrl(generalProperties.getHost() + "/cosmos/home");
+//            } else {
+//                alipayRequest.setReturnUrl(generalProperties.getHost() + "/9th/home");
+//            }
+            alipayRequest.setReturnUrl(generalProperties.getHost() + "/modern/home");
             alipayRequest.setReturnUrl(generalProperties.getHost() + "/");
             alipayRequest.setNotifyUrl(alipayProperties.getNotifyUrl());
             alipayRequest.setBizContent(JSON.toJSONString(bizContent));

src/main/java/com/izouma/nineth/web/OrderPayController.java

@@ -46,7 +46,7 @@ public class OrderPayController {
     public String payOrderAlipayWx(Long id, Model model) throws BaseAdaPayException {
         Order order = orderRepo.findById(id).orElseThrow(new BusinessException("订单不存在"));
         if (order.getStatus() != OrderStatus.NOT_PAID) {
-            return "redirect:/9th/store";
+            return "redirect:/modern/store";
         }
         String payUrl = (String) orderService.payAdapay(id, "alipay_wap", null);
         model.addAttribute("payUrl", payUrl);

src/main/resources/application.yaml

@@ -115,9 +115,9 @@ wx:
     sub-app-id:
     sub-mch-id:
     key-path: classpath:/cert/apiclient_cert.p12
-    notify-url: https://nfttest.9space.vip/notify/order/weixin
-    refund-notify-url: https://nfttest.9space.vip/wx/refundNotify
-    return-url: https://nfttest.9space.vip/9th/orders
+    notify-url: https://moderntest.9space.vip/notify/order/weixin
+    refund-notify-url: https://moderntest.9space.vip/wx/refundNotify
+    return-url: https://moderntest.9space.vip/9th/orders
 storage:
   provider: aliyun
   local_path: /var/www/upload/
@@ -130,7 +130,7 @@ aliyun:
   sms-sign: 身份验证
   sms-code: SMS_11685095
 general:
-  host: https://nfttest.9space.vip
+  host: https://moderntest.9space.vip
   contract-name: nine_space_new
   name: 第九空间
   org: 广州麦塔沃司信息技术有限公司
@@ -179,8 +179,8 @@ alipay:
   api-key: CRv5YFAOIEGY5PgVf14Y9g==
   app-cert-path: classpath:cert/appCertPublicKey_2021002120645023.crt
   root-cert-path: classpath:cert/alipayRootCert.crt
-  notify-url: https://nfttest.9space.vip/notify/order/alipay
-  return-url: https://nfttest.9space.vip/9th/home
+  notify-url: https://moderntest.9space.vip/notify/order/alipay
+  return-url: https://moderntest.9space.vip/9th/home
 adapay:
   app-id: app_f8760acc-f4d8-46f6-8f70-d80e36517075
   debug: true
@@ -191,7 +191,7 @@ adapay:
   priv-key: MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCnIaIrFP598qcf/s3FqXxMTjrVAevnf1w5CAMdJqcRFv0WvdLEmNRxxqAYSLl/iQ8AyU4yqVwkwYqvn/aENBg0iQ5h5qboxb8T6xmrZLctk97TiIuCUwbd7Q5NBHJXzHlaKc1p1KBvTCJDMw8+t0Jh3sBkBvu7l0KPliEQHtPLBDkKvy3NBQD6BMy47kPersjSUH53HBvNpcjcPZGpUX/TmL3SNkS98RkoebFxuorK5UdazYN5xvarjfcYziShIjU3WIZJb52DGUxYWTk6vJKZrJhw7AhWIEQpH7qJxvml/B8RMQ4guHdtp3ojxwkHDtZdPU9rY8i6EHwba4qOYgobAgMBAAECggEAT36L5/oAYl+8ZleIAHBxEspS6WYUkvPdJbNN59uus04/60U2rxQSWFulYmeU87h5TmJxs18i2MjF8msfkhpFORfHo4FV+nm0PQEiIIezKRagcfUMhlx/c6eBmdh3mpNDVUN01NWxyb5ovZXXtnjsNikBUZKQwdVcb3d1GnnPO0xtt6/0xwiduCkA2ihS1tgnsYYDhMHgukIdZ3eczn3stRPQ+QyCt1JWS6DDd1nS3S2RyPZw8P9Z1zzJFVKH8z3bGqk3/98Lw7Hw+rKFnKhIA6/H9ZVORKw5OuGC3Ozy6cVbmUn8tuw3sC0NdR7w56dedB+fjJB8od0nahX1Cc6eQQKBgQDckcenslWqjs2PbncwW1wqlw7FdJX9rzJAg7kp9ItpHCoNi/kSgXeLphHXWJmyj7a1BkWynmTGxO48X3dPXUrDPFKJc42fSbxMgAQdtc/A2z+v7Ga/oUpH8jajKfKmcgeRX026R7gd9W0yi0EW+C0WdFhrzNKKY4shvnYy9lc+QwKBgQDB+mHSllqLqYru0bLrtKOKJXaR3N3INxDBZKnRqba4tUKN35IVIexiEMkHmC51jtjoRyA5Y+fc/8P11i9FbuShtRVGHWeyDibKlwff5zrETveSLTpSULBKZ6MsFSm0Fo1krSUC1QTUGG5VX/wwWm9AB2UKJqG5cMDd3i3RiPeDSQKBgBs1ED+rS83iF5Eduy4H1vKZ94R7wRSty7ERjoGSXK/2fWl2Xp7dwXVEYucBUtQnzg2+XFKQHzY1jH19+SWdCF/UzQmPa2S+n6+ACwHvL1VGtjBpJLN2nccKJZsyzW+imTRhYSEdP6TSZUnay4idzFH8v/tsJHxVkw/ygnn+0PwpAn8uOHsWsrzgioWQYmc/wss1H7ghCX/PNU/IxTOxwb7IRGiXZa5pWqv4sgc0yA5J9L+6mTgUdLnK7ybCbUbWRJY18fAfxOHwi26y10oJEA/wtuBG9H/xHUjkcc1vs5s8TiNi2d73zcpYv3mK3lQ5MVNQ7nIk+Q+QIE3UkBxa0UgpAoGBAMDwg0ebzBEZsV2cr/Er2b25LsXteDJ+V67plBNrv+A1/omA9a52sWek4bY0D+Uu6zPTDaLj9BhHC2wJmThYl0eLRKyDKYQslBR3h253Gsn3If6RH9/tSyDsQ88iAEI1f6QH27bGHL9VDrsLGEFg5E7ZEzFQuJPqoUvBOoURNwa6
   app-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwN6xgd6Ad8v2hIIsQVnbt8a3JituR8o4Tc3B5WlcFR55bz4OMqrG/356Ur3cPbc2Fe8ArNd/0gZbC9q56Eb16JTkVNA/fye4SXznWxdyBPR7+guuJZHc/VW2fKH2lfZ2P3Tt0QkKZZoawYOGSMdIvO+WqK44updyax0ikK6JlNQIDAQAB
   wx-app-id:
-  notify-url: https://nfttest.9space.vip/notify/adapay
+  notify-url: https://moderntest.9space.vip/notify/adapay
 ---
 
 spring:
@@ -209,14 +209,14 @@ spring:
     host: 127.0.0.1
     database: 1
 general:
-  host: https://nft.9space.vip
+  host: https://modern.9space.vip
 wx:
   pay:
-    notify-url: https://nft.9space.vip/notify/order/weixin
-    refund-notify-url: https://nft.9space.vip/wx/refundNotify
-    return-url: https://nft.9space.vip/9th/orders
+    notify-url: https://modern.9space.vip/notify/order/weixin
+    refund-notify-url: https://modern.9space.vip/wx/refundNotify
+    return-url: https://modern.9space.vip/9th/orders
 alipay:
-  notify-url: https://nft.9space.vip/notify/order/alipay
-  return-url: https://nft.9space.vip/9th/home
+  notify-url: https://modern.9space.vip/notify/order/alipay
+  return-url: https://modern.9space.vip/9th/home
 adapay:
-  notify-url: https://nft.9space.vip/notify/adapay
+  notify-url: https://modern.9space.vip/notify/adapay

src/main/resources/templates/AlipayHtml.ftlh

@@ -155,14 +155,15 @@
         $.get('/order/${orderId}/status', function (data) {
             console.log(data);
             if (data.status !== 'NOT_PAID') {
-                switch (data.projectId) {
-                    case 0:
-                        window.location = '/9th/orderDetail?id=${orderId}';
-                        break;
-                    case 1:
-                        window.location = '/cosmos/orderDetail?id=${orderId}';
-                        break;
-                }
+                window.location = '/modern/orderDetail?id=${orderId}';
+                <#--switch (data.projectId) {-->
+                <#--    case 0:-->
+                <#--        window.location = '/modern/orderDetail?id=${orderId}';-->
+                <#--        break;-->
+                <#--    case 1:-->
+                <#--        window.location = '/cosmos/orderDetail?id=${orderId}';-->
+                <#--        break;-->
+                <#--}-->
 
             }
         });