From 58bf9c6d02dcc4cdc4b9b812f218cfddd20c1acf Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 28 Jan 2022 14:31:42 +0800 Subject: [PATCH 01/38] rel --- smart-admin-service/pom.xml | 7 ++++--- .../module/system/alipay/AlipayController.java | 3 ++- .../module/system/alipay/conf/AlipayConfig.java | 4 +++- .../system/royalcanin/good/service/GoodService.java | 6 ++---- .../system/royalcanin/good/service/OrderService.java | 3 ++- .../smartadmin/module/system/wxpay/MyConfig.java | 8 +++++--- .../smartadmin/module/system/wxpay/WxpayService.java | 2 +- .../src/main/resources/prod/application.properties | 12 ++++++------ .../src/main/resources/sql/smart-admin.sql | 8 ++++---- 9 files changed, 29 insertions(+), 24 deletions(-) diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml index 9431ef48..614d201d 100644 --- a/smart-admin-service/pom.xml +++ b/smart-admin-service/pom.xml @@ -325,9 +325,7 @@ dev - - true - + telework @@ -352,6 +350,9 @@ prod + + true + diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java index 1ee38537..d7349743 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java @@ -47,7 +47,8 @@ public class AlipayController { @Autowired private OrderService orderService; - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; +// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; @Autowired private MemberAccountService memberAccountService; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java index 4649b18f..badb8870 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java @@ -20,6 +20,7 @@ public class AlipayConfig { // 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号 // public static String app_id = "2016101800716209"; public static String app_id = "2021003108690157"; +// public static String app_id = "2088341384149564"; // 商户私钥，您的PKCS8格式RSA2私钥 // public static String merchant_private_key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL8350XEsOVVSg8+cKZEl6Jx7Tp63JFimk+lldS8chZ8hv3Netz5iMemQJYH328VEB5sKkIXfDiwT1fxR2cgsGdQgmG25omKM/47QfxTRp9C4II65AlMfLsPWOWefc/enaza/gMMzB5SvvFnbpX/71aJmqU7nJvATY8MwW4SxKXKMTEI/K7+jERReR4SxtGHeFTZ892ljr7IOqJbGPnd2CXzLO05AGGhOrsmtFMh9eysD1WzcDKoADJSi26oMI49mExGo3jMF111AcXSR4CgLsx5bSoe4XtXtVbqEr/tOCt4zAWoUbu/Mviog+60eMr9qaE719aobEZP7aI5ECd86NAgMBAAECggEAXRVBtqvU2bLaUCdhYF3LJ0QpjqIt7+P8l75nAOyv8rAiS+O4UCy6TAskEx+F/im/NiXy2eQofAe7+KvKVBDStVy+nl3Qs05O2776G7HurRjz1WUrh3AgC/g06oZgC32buPA9gA3ltez5c0KGfRcCD1FxKMrTtZ3pfHXSP/L/OuRhobxCZvEL5jcWHkxgOeaL37+UQSHJe3dhCPjjj1VOxBj0RLgcAPJ8/KoglcmWHacYvPxgRo26xahrW3yCofcb+cEzG5WhCc3uBK3eSWNB1knSwl2gVMcGmN8gOPBpAneSjqv6pqWUqgAOENxi2kRZYDyTNi3JHt2ZJMdDblU8AQKBgQD2Z+CjGGloaQTvcow/dqxF4a5EAnjeUSA+cdw7ttNqvszNofjvxv9RULKIf8jgrkO9cE5X9ezqHXaWOspyXbFhmPFginH9N5tTGggrzCpeHs7jW3EZKiYJIl2MRzxMVx1jaN8EfT8Z3u/4Ca/QwPvsGNj/Er7kwqLUvkGsLeOHjQKBgQDT5G/8R/T2LqJUvFiKntfY830WVAD9vUGst68ouxfaQKj2IOlOedjvQwRcInOX3GFnQyw8ncWOIZDQOnJdYpQdjQAx3queHmv8toCp+MKyPLLYJYu4LP6ahT/9vd9G9r0QUo57n75sVOcT5tj9ZKdykchPUWe1T02LEUZPxDwjAQKBgQCnf7meZMvSpAEs3EsmIP++iUkzBhMv3Sn0COZS2VciKw2Bg2d7Z2TL2/VhAKyGvy9hKWS4On6QLvMb8F8KG1KnK5Z5r+MI5LH7bai8TQ9H591vhAt/tb0hXHEHGK2On3Fk0Dc6EAHDDl9F1x/i4izeM43e5tlJHF4gDC0MZC1VSQKBgQDMS1yZXXtV/GJw1mN7y2iK+T/qTjXibx2p/DO6TqDRwjPlkpe/HQXGsdO7TVAr48RZvk8hZnB59+zahu+LECeEUlUUv/6xZd1x+zgUKQ72sEUy1wheG6uiqcSnzfA/SFfDLAXKNZtwcW+WJaWisfAsK1h4+SDHk91MruwerjHZAQKBgH6muiaSlg6DvAUBjtxaOE0bgchI+M/j7N4289syb/6A0iTUNeTREWk2kmBT/ZeZCFtrjJx+TdVauyjkRwKx0wEuf9H+WrUM+6i5j5nTrcUEAUTjCY7IRxGk8uhNLM7cyBNvpsD4olI5j2DmRsZWnv/bNuJH2FHbvXMwanZ22vM5"; @@ -27,7 +28,8 @@ public class AlipayConfig { // 支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。 // public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjBThgyJ3SJsx0IYUspiW+R/NDInruz2Tirr0vGmzfaNkBSDmyg2vNLmnkNrxbHApJkIRKWqGbC8yPybyjFz1nXP7oji0d/3sPKZZGdNEqOcZLaki8xPeXfOVu1T/uPH/9S084t94yQPNrD9BqehOlN+I4b/mXJ7tDGRnS2OVrQqDrPbg8pjH3OYa0bELkr71R92EHxCN4V2bSdCS1ag96/etgkodduOCmiBPVSmSRXas/GpRw92NVsRKvesWOatfjEjqST0Bz0nRuOuRnQIy1exxs/D2DHCVa6aO6TNogcPWe3C9dvxjxjw9IOiyhkGThWoWrdk8Ot+V8V8LeomcYwIDAQAB"; // public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr+fwsHUR8dosvQlrQk1uKu8bzWtt4BHRIK4PsY5IVPUuk/NbcSXH9HC/tyj/L4L68/9pxteG7nGMioveqSMx8d5jhf/1sHsBC2C/BiffjzfiaeKsPqIag2jM0GNVFnrtmx1xeKYwx8T3X87BH7T4lcrOqsjt7JCtXDgWlttEpiIJTLTPOgtMlFPLkwvvp/Dlc0f+t2Bo9bHaCkrOkq3AC9TACEzXCVBKIP670MD0rTLnCEr3E/9oKzQazcCydzj548LAmwSQ660Wh+w6pZrL8p43ODski4sbl5ulidw7MklDHKOdZFj/tWf2NqMQjmAdmthZ5oGilJhiLvHiUR1YyQIDAQAB"; - public static String alipay_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB"; + public static String alipay_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9yEe5sOFYFmEW0GdVCyvuU5vXCLsk2lwWmfC/bh/kcjBaBNTaFSiuG1VFPWsNIKWEHLdbEwMQnq4WxhqYN741wXxJlOpvsECFYtGSL6szx7BDaTYATQGVk963SeKYplz5ZPlXg1QiKgcqS3brvnpxxtcS1JKCJ/6iJXJkZXxK2QIDAQAB"; +// public static String alipay_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB"; // 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 public static String notify_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderAliPay"; // 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 02119fc5..cbc16377 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -1,6 +1,5 @@ package net.lab1024.smartadmin.module.system.royalcanin.good.service; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.module.system.royalcanin.good.dao.GoodsDao; @@ -10,12 +9,10 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductQueryEn import net.lab1024.smartadmin.util.AESUtil; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; -import net.lab1024.smartadmin.util.SmartIPUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,7 +21,8 @@ import java.util.concurrent.TimeUnit; @Service public class GoodService { - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; +// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; @Autowired private GoodsDao goodsDao; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 7434a4fc..46b34ef9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -46,7 +46,8 @@ public class OrderService { @Autowired private NotifyService notifyService; - private String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/"; + String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; +// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java index 5c1e109c..63de0f70 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java @@ -12,18 +12,19 @@ import java.io.*; public class MyConfig implements WXPayConfig { // private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/"; - private String path ="/home/royalcanin-dev/cert/pro/"; + private String path ="/var/www/html/shop/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/"; // public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX"; - public String notify_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderWX"; + public String notify_url = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/updateOrderWX"; // 微信支付h5 回调地址 - public static String NOTIFY_URL_H5 = "https://shop.royalcanin.com.cn/myorder/usertion?"; + public static String NOTIFY_URL_H5 = "https://shop.royalcanin.com.cn"; // 请求地址 public static String UFDODER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder"; + private byte[] certData; public MyConfig() throws Exception { @@ -50,6 +51,7 @@ public class MyConfig implements WXPayConfig { return "indexphpcorecertapicert201903200"; } //b69497999e8fd1f8f1f0a9591b24eb72 + //1DDE55AD98ED71D6EDD4A4A16996DE7B47773A8C public InputStream getCertStream() { ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index 6af36a4d..50fad8d9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -47,7 +47,7 @@ public class WxpayService { private MemberAccountService memberAccountService; String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - +// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; private String urlNative = "https://api.mch.weixin.qq.com/v3/pay/transactions/native"; public String testGenerateQRCode(WxPayEntity wxPayEntity)throws Exception{ diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index 94f75be2..a135e225 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -1,10 +1,10 @@ ######################### server ################### -server.servlet.context-path=/smart-admin-api -server.port=10088 +server.servlet.context-path=/royalcanin +server.port=10086 spring.profiles.active=@profiles.active@ ######################### tomcat ################### -server.tomcat.basedir=/home/logs/smart-admin/tomcat-logs +server.tomcat.basedir=/home/royalcanin-prod/tomcat-9/smart-admin/tomcat-logs server.tomcat.accesslog.enabled=true server.tomcat.accesslog.pattern=%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms) @@ -23,9 +23,9 @@ spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/smart-admin-file ######################### database ######################### -spring.datasource.url=jdbc:mysql://172.16.0.201:3306/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true -spring.datasource.username=smart-admin -spring.datasource.password=Admin@123457 +spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true +spring.datasource.username=azureuser@rc-hub-mysql +spring.datasource.password=(G=q0D5ez2Fz spring.datasource.initial-size=2 spring.datasource.min-idle=1 spring.datasource.max-active=100 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 8596a19d..95b951f7 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -14,8 +14,8 @@ -- 导出 smart-admin-dev 的数据库结构 DROP DATABASE IF EXISTS `smart-admin-dev`; -CREATE DATABASE IF NOT EXISTS `smart-admin-dev` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; -USE `smart-admin-dev`; +CREATE DATABASE IF NOT EXISTS `smart-admin-pro` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; +USE `smart-admin-pro`; -- 导出 表 smart-admin-dev.t_department 结构 DROP TABLE IF EXISTS `t_department`; @@ -1720,8 +1720,8 @@ INSERT INTO `t_royalcanin_productsearchtag` (`id`, `brand_code`, `brand_name`, ` (1032, '16518816', '品种', '0', '布偶', '1017', '1017014', 0, '2022-01-19 16:41:55'), (1033, '16518816', '品种', '0', '暹罗', '1017', '1017015', 0, '2022-01-19 16:41:55'), (1034, '16518816', '品种', '0', '缅因', '1017', '1017016', 0, '2022-01-19 16:41:55'), -(1035, '16518816，555131355', '年龄', '1', '幼年', '1018', '1018001', 0, '2022-01-19 16:41:55'), -(1036, '16518816，555131355', '年龄', '1', '成年', '1018', '1018002', 0, '2022-01-19 16:41:55'), +(1035, '16518816', '年龄', '1', '幼年', '1018', '1018001', 0, '2022-01-19 16:41:55'), +(1036, '16518816', '年龄', '1', '成年', '1018', '1018002', 0, '2022-01-19 16:41:55'), (1037, '16518816', '年龄', '1', '老年', '1018', '1018003', 0, '2022-01-19 16:41:55'), (1038, '16518816', '年龄', '0', '4-12月龄', '1018', '1018004', 0, '2022-01-19 16:41:55'), (1039, '16518816', '年龄', '0', '1-7岁', '1018', '1018005', 0, '2022-01-19 16:41:55'), From 6496bd0083e2d3db71adb82f1427163ed76fefe7 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 28 Jan 2022 17:00:14 +0800 Subject: [PATCH 02/38] fix without basePoint and paytype --- .../src/main/resources/prod/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index a135e225..629071ea 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -23,7 +23,7 @@ spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/smart-admin-file ######################### database ######################### -spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true +spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-pro?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true spring.datasource.username=azureuser@rc-hub-mysql spring.datasource.password=(G=q0D5ez2Fz spring.datasource.initial-size=2 From 99f4df3c1f2af52bf4d703c390af664457b6e013 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 28 Jan 2022 17:13:18 +0800 Subject: [PATCH 03/38] fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one --- .../src/main/resources/prod/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index 629071ea..76ad0985 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -23,7 +23,7 @@ spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/smart-admin-file ######################### database ######################### -spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-pro?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true +spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-pro?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&allowMultiQueries=true spring.datasource.username=azureuser@rc-hub-mysql spring.datasource.password=(G=q0D5ez2Fz spring.datasource.initial-size=2 From 0eb02c313b03cc24298d3428f95a64ee37525d43 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 28 Jan 2022 17:58:00 +0800 Subject: [PATCH 04/38] fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one --- .../module/system/royalcanin/good/service/GoodService.java | 2 +- .../src/main/resources/prod/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index cbc16377..468d9734 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -35,7 +35,7 @@ public class GoodService { } public List listGoodsByNameBankNameTagUsedAge(String title,String petType){ - String ip = "https://royalcanincn.escase.cn/jc/royalcanin/"; + String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/"; List goodsList = goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title,petType); for (GoodsEntity goodsEntity:goodsList) { goodsEntity.setShowImgFile(ip+goodsEntity.getPicture()); diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index 76ad0985..3e3e06fc 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -1,5 +1,5 @@ ######################### server ################### -server.servlet.context-path=/royalcanin +server.servlet.context-path=/royalcanin/royalcanin server.port=10086 spring.profiles.active=@profiles.active@ From 035d392e769a320354d172e7d5befaf14b1fafbd Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 28 Jan 2022 18:05:26 +0800 Subject: [PATCH 05/38] fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one --- .../src/main/resources/prod/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index 3e3e06fc..76ad0985 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -1,5 +1,5 @@ ######################### server ################### -server.servlet.context-path=/royalcanin/royalcanin +server.servlet.context-path=/royalcanin server.port=10086 spring.profiles.active=@profiles.active@ From 6725fb9961cdc1b0051ceb9ff4f7bf91454b1e01 Mon Sep 17 00:00:00 2001 From: Vion Date: Fri, 28 Jan 2022 18:19:40 +0800 Subject: [PATCH 06/38] Web code updated --- rc-busness/ajax/util.js | 49 +++- rc-busness/app.html | 17 ++ rc-busness/assets/css/global.less | 14 + rc-busness/components/fixed-right.vue | 59 +++- rc-busness/config/async/env.js | 2 +- rc-busness/pages/index.vue | 260 ++++++++++-------- rc-busness/pages/myorder/usertion.vue | 53 ++-- rc-busness/pages/personal/settlement.vue | 54 ++-- rc-busness/pages/personal/useraddress.vue | 197 ++++++------- rc-busness/pages/personal/userpay.vue | 17 +- rc-busness/pages/productdetails/producted.vue | 108 +++++--- 11 files changed, 514 insertions(+), 316 deletions(-) diff --git a/rc-busness/ajax/util.js b/rc-busness/ajax/util.js index 9be51c9c..1d383876 100644 --- a/rc-busness/ajax/util.js +++ b/rc-busness/ajax/util.js @@ -35,20 +35,45 @@ let util = { } }, checkPaytypeValidated($paytype) { - if(isWx && $paytype == 1) { - //return 3; - return true; - } else if(isWx && $paytype!=1) { - return false; + let isMobile = this.isMobile(); + let isWx = this.isWX(); + //Dictionary : 1:WX native pay, 2:Alipay, 3:WX H5 pay + if((isWx || !isMobile) && $paytype == 1) { + return {'result':true}; } - - if(!isMobile && $paytype == 1) { - //Desktop, use native pay - return true; - } else if(isMobile && $paytype == 2) { - return true; + if(isMobile && $paytype == 3) { + return {'result':true}; } - return false; + if($paytype == 2) { + return {'result':true}; + } + let message=''; + switch($paytype) { + case "1": + message = '请返回电脑端继续当前订单的支付'; + break; + case "2": + message = '请返回支付宝继续当前订单的支付'; + break; + case "3": + message = '请返回手机端继续当前订单的支付'; + break; + default: + message = '订单已过期，请重新下单'; + break; + } + return {'result':false,'message':message}; + }, + getTextByPaytype(paytype){ + //Dictionary : 1:WX native pay, 2:Alipay, 3:WX H5 pay + let mapping = { + "1":"微信扫码支付", + "2":"支付宝支付", + "3":"手机网页支付", + }; + if(mapping.hasOwnProperty(paytype)) + return mapping[paytype]; + return ''; } } export default util; \ No newline at end of file diff --git a/rc-busness/app.html b/rc-busness/app.html index afb50e74..9d062a45 100644 --- a/rc-busness/app.html +++ b/rc-busness/app.html @@ -13,6 +13,23 @@ var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); })(); + function bindTracking(ele,timeout) + { + var eventName=ele.getAttribute('evt-name'); + var eventCat=ele.getAttribute('evt-cat'); + var eventVal=ele.getAttribute('evt-val'); + var eventParams={}; + eventParams[eventCat]=eventVal; + _hmt.push(['_trackEvent', eventName, eventCat, eventVal]); //Baidu Analytics Event Push + if(timeout) + { + setTimeout(function(){ + window.location.href=ele.href; + },timeout); + return false; + } + return true; + } \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 4c11f919..731e59d4 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -10,6 +10,20 @@ body { border:unset; } +.ts-warning-popup { + .title{ + img { + width:5rem; + height:auto; + margin-left:auto; + margin-right:auto; + } + } + .content span { + line-height:2rem; + font-size:1.2 + } +} .rc-menu--xs .rc-screen-reader{ left:28%; diff --git a/rc-busness/components/fixed-right.vue b/rc-busness/components/fixed-right.vue index 6fbcad19..b10e7bc1 100644 --- a/rc-busness/components/fixed-right.vue +++ b/rc-busness/components/fixed-right.vue @@ -1,15 +1,28 @@ @@ -18,6 +31,7 @@ import { mapMutations } from "vuex"; export default { data(){ return{ + customerServerStop:false, gotop: false, loginornot:false, fixedlist: [ @@ -43,10 +57,21 @@ export default { ...mapMutations(["checkIsLogin"]), lianxi(item,index){ if(item.title=='在线客服'){ + this.customerServerStop = true; + /* Stop until 2022-2-10 var option = { customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'} } dis_livchat(option); + _hmt.push([ + "_trackCustomEvent", + "cs_consult", + { + "page_name_":this.$route.path, + "shop_right_btn": 1, + } + ]) + */ } if(item.title=='购物车'){ if(this.loginornot){ @@ -60,10 +85,22 @@ export default { } } if(item.title=='营养专家'){ + this.customerServerStop = true; + /* Stop until 2022-2-10 var option = { customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'} } dis_livchat(option); + console.log(this.$route.path); + _hmt.push([ + "_trackCustomEvent", + "sol_consult", + { + "page_name_":this.$route.path, + "shop_right_btn": 1, + } + ]) + */ } }, toTop() { diff --git a/rc-busness/config/async/env.js b/rc-busness/config/async/env.js index 9242ccff..8ff9739b 100644 --- a/rc-busness/config/async/env.js +++ b/rc-busness/config/async/env.js @@ -9,7 +9,7 @@ let baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/' if (process.env.NODE_ENV === 'development') { baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'; } else if (process.env.NODE_ENV === 'production') { - baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'; + baseUrl = 'https://shop.royalcanin.com.cn/royalcanin/royalcanin/royalcanin/'; } export { baseUrl, diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index 264b56d6..fb27a3b2 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1256,113 +1256,11 @@ export default { }, ], catlistvideo: [ - { - title: "主食级猫湿粮", - video: "/images/cat/one.mp4", - catimage: "/images/cat/one.jpg", - productimage: "/images/cat/star-1.png", - detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", - price: "¥372", - productList: [ - { - productCode: "80240008F24", - }, - ], - }, - { - title: "幼猫成长专属", - video: "/images/cat/two.mp4", - catimage: "/images/cat/two.jpg", - productimage: "/images/cat/star-2.png", - detail: "支持幼猫自身保护力 为快速生长提供足够能量", - price: "¥33", - productList: [ - { - productCode: "20030040", - }, - ], - }, - { - title: "室内成猫专属", - video: "/images/cat/three.mp4", - catimage: "/images/cat/three.jpg", - productimage: "/images/cat/star-3.png", - detail: "高易消化蛋白 减少粪便量和异味", - price: "¥157", - productList: [ - { - productCode: "21100200", - }, - ], - }, - { - title: "英短成猫专属", - video: "/images/cat/four.mp4", - catimage: "/images/cat/four.jpg", - productimage: "/images/cat/star-4.png", - detail: "增强肌肉质量 支持骨骼与关节健康", - price: "¥402", - productList: [ - { - productCode: "23040450", - }, - ], - }, + ], doglistvideo: [ - { - title: "主食级狗湿粮", - video: "/images/dog/one.mp4", - catimage: "/images/dog/one.jpg", - productimage: "/images/dog/star-1.png", - detail: "柔软细腻慕斯 适合离乳期幼犬舔食", - price: "¥359", - productList: [ - { - productCode: "81220020F12", - }, - ], - }, - { - title: "贵宾成犬专属", - video: "/images/dog/two.mp4", - catimage: "/images/dog/two.jpg", - productimage: "/images/dog/star-2.png", - detail: "护肤靓毛 理想体态", - price: "¥562", - productList: [ - { - productCode: "14200300", - }, - ], - }, - { - title: "小型犬成犬专属", - video: "/images/dog/three.mp4", - catimage: "/images/dog/three.jpg", - productimage: "/images/dog/star-3.png", - detail: "亮泽被毛 呵护牙齿", - price: "¥57", - productList: [ - { - productCode: "16020080", - }, - ], - }, - { - title: "离乳期全价奶糕", - video: "/images/dog/four.mp4", - catimage: "/images/dog/four.jpg", - productimage: "/images/dog/star-4.png", - detail: "高易再水合颗粒 帮助增强保护健康成长", - price: "¥263", - productList: [ - { - productCode: "17220400", - }, - ], - }, + ], rccontair: [ { @@ -1492,9 +1390,126 @@ export default { }, created() { vm = this; + let curEnv = process.env.NODE_ENV; + let envVariable = { + 'development':{ + catlistvideo:[ + { + title: "主食级猫湿粮", + video: "/images/cat/one.mp4", + catimage: "/images/cat/one.jpg", + productimage: "/images/cat/star-1.png", + detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", + price: "¥372", + productList: [ + { + productCode: "80240008F24", + }, + ], + }, + { + title: "幼猫成长专属", + video: "/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail: "支持幼猫自身保护力 为快速生长提供足够能量", + price: "¥33", + productList: [ + { + productCode: "20030040", + }, + ], + }, + { + title: "室内成猫专属", + video: "/images/cat/three.mp4", + catimage: "/images/cat/three.jpg", + productimage: "/images/cat/star-3.png", + detail: "高易消化蛋白 减少粪便量和异味", + price: "¥157", + productList: [ + { + productCode: "21100200", + }, + ], + }, + { + title: "英短成猫专属", + video: "/images/cat/four.mp4", + catimage: "/images/cat/four.jpg", + productimage: "/images/cat/star-4.png", + detail: "增强肌肉质量 支持骨骼与关节健康", + price: "¥402", + productList: [ + { + productCode: "23040450", + }, + ], + } + ], + doglistvideo: [ + { + title: "主食级狗湿粮", + video: "/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/dog/star-1.png", + detail: "柔软细腻慕斯 适合离乳期幼犬舔食", + price: "¥359", + productList: [ + { + productCode: "81220020F12", + }, + ], + }, + { + title: "贵宾成犬专属", + video: "/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/dog/star-2.png", + detail: "护肤靓毛 理想体态", + price: "¥562", + productList: [ + { + productCode: "14200300", + }, + ], + }, + { + title: "小型犬成犬专属", + video: "/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/dog/star-3.png", + detail: "亮泽被毛 呵护牙齿", + price: "¥57", + productList: [ + { + productCode: "16020080", + }, + ], + }, + { + title: "离乳期全价奶糕", + video: "/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/dog/star-4.png", + detail: "高易再水合颗粒 帮助增强保护健康成长", + price: "¥263", + productList: [ + { + productCode: "17220400", + }, + ], + }, + ] + }, + 'production':{} + } + this.catlistvideo = envVariable[curEnv].catlistvideo; + this.doglistvideo = envVariable[curEnv].doglistvideo; }, watch: {}, mounted() { + console.log(process.env.NODE_ENV,' mounted'); this.checkIsLogin(); this.userdata = this.$store.state.userInfo; console.log(this.userdata); @@ -1520,21 +1535,28 @@ export default { window.removeEventListener("scroll", this.scrollToTop); }, methods: { - diaoqi(){ - console.log('----'); - setTimeout(() => { - var option = { - customer: { - id: "", - name: "", - email: "", - mobile: "", - memberId: vm.userdata.data.id, - }, - }; - dis_livchat(option); - }, 500); - }, + diaoqi(){ + setTimeout(() => { + var option = { + customer: { + id: "", + name: "", + email: "", + mobile: "", + memberId: vm.userdata.data.id, + }, + }; + dis_livchat(option); + _hmt.push([ + "_trackCustomEvent", + "sol_consult", + { + "page":this.$route.path, + "shop_head_banner": 1, + } + ]) + }, 500); + }, ...mapMutations(["checkIsLogin"]), playMobileVideo(item) { let videoPath = item.video; diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 0e5a1ae2..2df60d1e 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -118,7 +118,7 @@
  • 付款方式: - {{ information.paytype }} + {{ information.paytypeText }}
  • 配送方式: @@ -158,7 +158,18 @@ {{ payorsucess }} - + + +
    +
    + +
    +
    +

    温馨提示

    + {{ paytypeWarning.message}} +
    +
    +     @@ -184,6 +195,8 @@ export default { data() { return { util, + paytypeWarning:{result:true,message:''}, + showPaytypeWarning:false, goldmedal: [], userproductId: "", logisticsDate: "", @@ -214,12 +227,9 @@ export default { useraddress: [], shopprice: {}, information: { - reference: "1111111111111111", - ordertime: "2012-12-01 11:20:00", - paytype: "微信支付", - distribution: "快递", - trackingnumber: "11111111111111", - catimage: require("../../assets/image/rc-left.png"), + paytypeText: "", + distribution: "快递", + catimage: require("../../assets/image/rc-left.png"), }, }; }, @@ -267,16 +277,20 @@ export default { }, //订单支付和再次购买 onceagain(item) { - if (this.payorsucess == "立即支付") { - this.getwei(item); - } else { - this.$router.push({ - path: "/productdetails/producted", - query: { - stype: 1, - productCode: this.userproductId, - }, - }); + this.paytypeWarning = this.util.checkPaytypeValidated(this.paytype); + this.showPaytypeWarning = !this.paytypeWarning.result; + if(this.paytypeWarning.result) { + if (this.payorsucess == "立即支付") { + this.getwei(item); + } else { + this.$router.push({ + path: "/productdetails/producted", + query: { + stype: 1, + productCode: this.userproductId, + }, + }); + } } }, async orderquantity(orderNumber) { @@ -304,7 +318,8 @@ export default { this.usersalesAmount = this.goldmedal[i].salesAmount; this.addressUserName = this.goldmedal[i].addressUserName; this.addressPhoneNumber = this.goldmedal[i].addressPhoneNumber; - this.paytype = (this.goldmedal[i].paytype=="1"?'微信支付':'支付宝'); + this.paytype = this.goldmedal[i].paytype; + this.information.paytypeText = this.util.getTextByPaytype(this.paytype); } } }, diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 52022db4..88da1551 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -513,28 +513,28 @@ export default { let postData = []; let tmpCounter=0; this.goldmedal.forEach((item) => { - let basePoint = (item.basePoint?item.basePoint:0); + let basePoint = (item.basePoint?item.basePoint:0); let oneProduct = { - basePoint:basePoint, - productName: item.productName, - buyCount: item.buyCount, - productCode: item.productCode, - payAmount: item.productPrice, - memberId: userInfo.data.id, - phoneNumber: userInfo.data.mobile, - // couponId: "NGQ2022P12", - // couponTypeId: "4", - // couponName: "内购券", - // couponAmount: "0.3175", - // couponCode: "0007792402", - orderAddress: { - addressPhoneNumber: orderAddress[0].recipientPhone, - addressUserName: orderAddress[0].recipient, - addressProvinceName: orderAddress[0].provinceName, - addressCityName: orderAddress[0].cityName, - addressCountyName: orderAddress[0].districtName, - addressDetailInfo: orderAddress[0].detailAddress, - }, + basePoint:basePoint, + productName: item.productName, + buyCount: item.buyCount, + productCode: item.productCode, + payAmount: item.productPrice, + memberId: userInfo.data.id, + phoneNumber: userInfo.data.mobile, + // couponId: "NGQ2022P12", + // couponTypeId: "4", + // couponName: "内购券", + // couponAmount: "0.3175", + // couponCode: "0007792402", + orderAddress: { + addressPhoneNumber: orderAddress[0].recipientPhone, + addressUserName: orderAddress[0].recipient, + addressProvinceName: orderAddress[0].provinceName, + addressCityName: orderAddress[0].cityName, + addressCountyName: orderAddress[0].districtName, + addressDetailInfo: orderAddress[0].detailAddress, + }, }; if(this.curCoupon.couponId && item.productCode == this.discountedProductCode) { oneProduct.couponId = this.curCoupon.couponId; @@ -626,6 +626,18 @@ export default { this.getAddressList(); this.checkIsLogin(); this.finalAmount = this.sumPrice; + this.goldmedal.forEach((item) => { + _hmt.push([ + "_trackCustomEvent", + "placing_order", + { + "product_id_":item.productCode, + "product_name_": item.productName, + "product_quantity_" : item.buyCount, + "product_amount_" : item.buyCount*item.productPrice, + } + ]) + }); // this.addressstype = this.$route.query.stype; // this.orderNumber = this.$route.query.orderNumber; // this.canceldanhao(this.orderNumber); diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 956a4e5a..d5aeac27 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -132,7 +132,18 @@ - + +
    +
    + +
    +
    +

    温馨提示

    + {{ paytypeWarning.message}} +
    +
    +     + @@ -146,6 +157,8 @@ export default { data() { return { util, + paytypeWarning:{result:true,message:''}, + showPaytypeWarning:false, crumbs:[ { path:'/personal/mypersonal/', @@ -279,7 +292,6 @@ export default { this.userdata = user.data.mobile; let stype = this.$route.query.stype; this.userstype=this.$route.query.stype; - console.log(stype); if (user == "" || user == null) { this.$message({ type: "warning", @@ -297,68 +309,61 @@ export default { }, methods: { async indet(mobile, stype) { - let data = await userindent(mobile,undefined,1,100); - this.activeIndex = stype; - this.goldmedal = data; - this.alllist=[]; - this.useralllist=[]; - this.obligation=[]; - this.receiving=[]; - this.pending=[]; - for (let i = 0; i < this.goldmedal.length; i++) { - this.useralllist.push(this.goldmedal[i].orderDetailList[0]); - this.alllist.push(this.goldmedal[i].orderDetailList[0]) - this.allmessage.push(this.goldmedal[i].orderDetailList[0]) - if(this.goldmedal[i].status==0){ - this.obligation.push(this.goldmedal[i].orderDetailList[0]); - }else if(this.goldmedal[i].status==1){ - this.receiving.push(this.goldmedal[i].orderDetailList[0]); - } - else if(this.useralllist[i].status==2){ - this.pending.push(this.goldmedal[i].orderDetailList[0]); - } - } - for (var i = 0; i < this.useralllist.length; i++) { - this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber; - this.useralllist[i].status = this.goldmedal[i].status; - this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName; - this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber; - this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; - // this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径 - // this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称 - // this.useralllist[i].ecPrice=this.goldmedal[i].ecPrice//第一个的单价 - // this.useralllist[i].pcs=this.goldmedal[i].pcs//数量 + let data = await userindent(mobile,undefined,1,100); + this.activeIndex = stype; + this.goldmedal = data; + this.alllist=[]; + this.useralllist=[]; + this.obligation=[]; + this.receiving=[]; + this.pending=[]; + for (let i = (this.goldmedal.length-1); i >= 0; i--) { + this.useralllist.unshift(this.goldmedal[i].orderDetailList[0]); + this.alllist.push(this.goldmedal[i].orderDetailList[0]) + this.allmessage.push(this.goldmedal[i].orderDetailList[0]) + if(this.goldmedal[i].status==0){ + this.obligation.push(this.goldmedal[i].orderDetailList[0]); + }else if(this.goldmedal[i].status==1){ + this.receiving.push(this.goldmedal[i].orderDetailList[0]); + } + else if(this.goldmedal[i].status==2){ + this.pending.push(this.goldmedal[i].orderDetailList[0]); + } + } + for (let i = (this.goldmedal.length-1); i >0; i--) { + this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber; + this.useralllist[i].status = this.goldmedal[i].status; + this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName; + this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber; + this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; + this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length; + this.useralllist[i].paytype=this.goldmedal[i].paytype; + } + if(this.userstype==1){ + this.useralllist=this.obligation + }else if(this.userstype==2){ + this.useralllist=this.pending + } + else if(this.userstype==0){ + this.useralllist=this.allmessage + } + else if(this.userstype==3){ + this.useralllist=this.receiving + } - - this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length - } - console.log(this.obligation) - if(this.userstype==1){ - this.useralllist=this.obligation - }else if(this.userstype==2){ - this.useralllist=this.pending - } - else if(this.userstype==0){ - this.useralllist=this.allmessage - } - else if(this.userstype==3){ - this.useralllist=this.receiving - } - }, - //订单立即支付 async getwei(item) { - let data = await this.repayOrde(item.orderNumber); + let payType = this.util.pickPaytype(); + let data = await this.repayOrde(item.orderNumber, payType); if(data.code==1) { let userPayData = { - userprice: item.usersalesAmount, + userprice: item.salesAmount, orderId: item.orderNumber, - userinformation: item.addressUserName + " " + item.addressPhoneNumber, + userinformation: item.addressUserName + " " + item.phoneNumber, wxPay:data.msg }; - this.$router.push({ path: "/personal/userpay", query: { @@ -443,51 +448,49 @@ export default { } }, selectGoods(item, index) { - let list=[] - this.activeIndex = index; - console.log(this.obligation) - if(item.title=='待付款'){ - list=this.obligation - } - else if(item.title=='待收货'){ - list=this.receiving - console.log(this.receiving); + let list=[] + this.activeIndex = index; + if(item.title=='待付款'){ + list=this.obligation + } + else if(item.title=='待收货'){ + list=this.receiving + }else if(item.title=='待发货'){ + this.useralllist=this.pending + list=this.pending + } - }else if(item.title=='待发货'){ - this.useralllist=this.pending - list=this.pending - } - - else if(item.title=='全部'){ - list=this.alllist - } - this.useralllist=[]; - console.log(this.useralllist,list); - for (var i = 0; i < this.useralllist.length; i++) { - this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber; - this.useralllist[i].status = this.goldmedal[i].status - this.useralllist[i].addressUserName =this.goldmedal[i].addressUserName; - this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber; - this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; - this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length - } - this.useralllist=list - - }, - userfind(item) { - if(item.status==0){ - this.getwei(item); - }else{ - this.$router.push({ - path: "/myorder/usertion", - query: { - stype: item.status, - orderNumber: item.orderNumber, - }, - }); - } - + else if(item.title=='全部'){ + list=this.alllist + } + this.useralllist=[]; + for (var i = 0; i < this.useralllist.length; i++) { + this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber; + this.useralllist[i].status = this.goldmedal[i].status + this.useralllist[i].addressUserName =this.goldmedal[i].addressUserName; + this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber; + this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; + this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length + } + this.useralllist=list }, + userfind(item) { + this.paytypeWarning = this.util.checkPaytypeValidated(item.paytype); + this.showPaytypeWarning = !this.paytypeWarning.result; + if(this.paytypeWarning.result) { + if(item.status==0){ + this.getwei(item); + }else{ + this.$router.push({ + path: "/myorder/usertion", + query: { + stype: item.status, + orderNumber: item.orderNumber, + }, + }); + } + } + }, usertwo() { this.$router.push({ path: "/myorder/userrecord", diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index 00a0e599..11c4c97c 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -175,6 +175,14 @@ export default { //TODO raise WX jsapi pay break; } + _hmt.push([ + "_trackCustomEvent", + "payment", + { + "payType" : payType, + "product_amount_" : this.userPayData.userprice, + } + ]) }, goPayH5() { let isMobile = this.util.isMobile(); @@ -228,7 +236,14 @@ export default { if (res.success) { this.qrtext = '成功加入群的二维码'; this.dialogSuccess = true; - + _hmt.push([ + "_trackCustomEvent", + "payment_finished", + { + "payType" : 'native', + "product_amount_" : this.userPayData.userprice, + } + ]) } else if (res.fail) { this.dialogFail = true; diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 7680ffb9..214c12c9 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -264,7 +264,7 @@ - +
    @@ -326,25 +326,21 @@ export default { if(!productCode || productCode.length<=0) throw new Error('Empty product code'); productCode = productCode.split(","); - // console.log(this.productCode); if(isRxGoods){ let data = await oncequery(mainProductCode); let outputObj = {}; if (data) { - chufang=data; + chufang=data; outputObj = data; outputObj.productName = data.name; - outputObj.picture = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.picture; - outputObj.showImgFile = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.showImgFile; + outputObj.picture = outputObj.picture; + outputObj.showImgFile = outputObj.showImgFile; newlist = [outputObj]; curItem = outputObj; } let insertTmpObj = {id:1, attachmentType:1, sort:1, attachmentPath:newlist[0].picture}; productAttachmentList = [insertTmpObj]; userbuy = false; - console.log('这是处方量数据') - - } else { let stopLeftAllotmentChecking = false; let stopIndex = 0; @@ -363,8 +359,7 @@ export default { } if(curItem.productAttachmentList != undefined) productAttachmentList = curItem.productAttachmentList; - let list=[]; - + let list=[]; if(curItem.productName == undefined) curItem = newlist[0]; userbuy = true; @@ -379,14 +374,13 @@ export default { title: curItem.productName, } ]; - console.log(curItem); return { crumbs, activeIndexa, curItem, newlist, - chufang, - videolist, + chufang, + videolist, productAttachmentList, userbuy } @@ -405,8 +399,8 @@ export default { drawlist: [], //用户可以领取的优惠券 alldraw: [], userlistmenu: [], - msg: ["11111111"], - parent_msg: ["111"], + msg: [""], + parent_msg: [""], usermessage: [], dialogInfo2: false, productCode: "", //商品code @@ -471,20 +465,20 @@ export default { this.checkIsLogin(); // console.log(this.curItem); if (this.usermessage !== "" || this.usermessage.data !== undefined) { - this.usermessage = this.$store.state.userInfo; - this.productCode = this.$route.query.productCode; - //video显示 - this.productAttachmentList.map(element=>{ - if(element.attachmentPath.substring(element.attachmentPath.lastIndexOf(".")+1)=='mp4'){ - this.videolist=element.attachmentPath; - } - }) - this.videoimg=this.productAttachmentList[0].attachmentPath; - if(this.videolist.length>0){ - this.videoshow=true - }else{ - this.videoshow=false; - } + this.usermessage = this.$store.state.userInfo; + this.productCode = this.$route.query.productCode; + //video显示 + this.productAttachmentList.map(element=>{ + if(element.attachmentPath.substring(element.attachmentPath.lastIndexOf(".")+1)=='mp4'){ + this.videolist=element.attachmentPath; + } + }) + this.videoimg=this.productAttachmentList[0].attachmentPath; + if(this.videolist.length>0){ + this.videoshow=true + }else{ + this.videoshow=false; + } /* let stype = this.$route.query.stype; @@ -498,6 +492,15 @@ export default { this.userbuy = true; } */ + _hmt.push([ + "_trackCustomEvent", + "product_visit", + { + "product_id_":this.curItem.productCode, + "product_category_":this.curItem.categoryName, + "product_name_": this.curItem.productName, + } + ]) } }, methods: { @@ -507,21 +510,34 @@ export default { }, //领取优惠券 usergetconf(item) { - console.log(item); - if (this.usermessage.data !== "" || this.usermessage.data !== undefined) { - this.getconf(this.usermessage.data.id, item.couponId); - } + _hmt.push([ + "_trackCustomEvent", + "get_coupon", + { + "product_id_":this.curItem.productCode, + "product_category_":this.curItem.categoryName, + "product_name_": this.curItem.productName, + "product_quantity_" : this.sales_num, + "product_amount_" : this.sales_num*this.curItem.ecPrice, + } + ]) + if (this.usermessage.data !== "" || this.usermessage.data !== undefined) { + this.getconf(this.usermessage.data.id, item.couponId); + } }, //获取用户领取的优惠券 async getconf(memberId, couponId) { let data = await getConfig(memberId, couponId); let msg = '领取成功'; + let msgType = 'success'; if (data) { - if(data.code!='0') + if(data.code!='0') { + msgType = 'warning'; msg = data.msg; + } this.$message({ - type: "warning", + type: msgType, message: msg, }); } @@ -684,6 +700,17 @@ export default { type: "warning", message: "加入购物车成功", }); + _hmt.push([ + "_trackCustomEvent", + "add_to_cart", + { + "product_id_":this.curItem.productCode, + "product_category_":this.curItem.categoryName, + "product_name_": this.curItem.productName, + "product_quantity_" : this.sales_num, + "product_amount_" : this.sales_num*this.curItem.ecPrice, + } + ]) } if (orderm == 1) { let list = [ @@ -702,6 +729,17 @@ export default { checked: true, }, ]; + _hmt.push([ + "_trackCustomEvent", + "add_to_cart", + { + "product_id_":this.curItem.productCode, + "product_category_":this.curItem.categoryName, + "product_name_": this.curItem.productName, + "product_quantity_" : this.sales_num, + "product_amount_" : this.sales_num*this.curItem.ecPrice, + } + ]) this.$router.push({ path: "/personal/settlement", From 8c8ee3f4f096a90de7b54b9ca30a04bc66f50b48 Mon Sep 17 00:00:00 2001 From: Vion Date: Fri, 28 Jan 2022 18:20:09 +0800 Subject: [PATCH 07/38] ENV setting file --- rc-busness/nuxt.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rc-busness/nuxt.config.js b/rc-busness/nuxt.config.js index 5b889a0c..9ee49b7f 100644 --- a/rc-busness/nuxt.config.js +++ b/rc-busness/nuxt.config.js @@ -1,7 +1,10 @@ const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [];dataLayer.push({"user":{"sitecoreId":"00000000-0000-0000-0000-000000000000","locale":"zh-HK"},"session":{"id":"vvfwez43vfoomct4y3yqneqy"},"site":{"country":"HK","id":"RCGlobalMC1","environment":"prd"},"page":{"type":"Start of Life Page","hitTimestamp":"2020-10-16T16:26:21.7350880+00:00","topic":"Collecting your kitten and their first week with you","theme":"Cat"},"pet":{"specieId":"2"}});'; const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;'; export default { - + env: { + //NODE_ENV: 'development' + NODE_ENV: 'production' + }, // Global page headers: https://go.nuxtjs.dev/config-head head: { title: '皇家宠物食品官方商城', From 2274267b6f16219761755c8507b0f78e945de94c Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 02:11:18 +0800 Subject: [PATCH 08/38] debugger --- .../module/system/royalcanin/good/GoodController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index ddf13acb..35ff252a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -72,6 +72,7 @@ public class GoodController { List tagNameList = new ArrayList<>(); int count = 0; for (String categoryKey : paramMap.keySet()) { + System.out.println("categoryKey:"+ categoryKey); if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") { switch (categoryKey) { case "categoryName": @@ -96,6 +97,7 @@ public class GoodController { } } if(count > 0) { + System.out.println("count:"+ count); List productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus()); List tagCodeList = new ArrayList<>(); for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) { From 49abd63ff9f72efa5aad189eab1ea56872982e31 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 02:14:05 +0800 Subject: [PATCH 09/38] debugger --- .../module/system/royalcanin/good/GoodController.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/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index 35ff252a..6b3ae2e7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -122,7 +122,7 @@ public class GoodController { } - + System.out.println("productQueryEntity:"+ productQueryEntity.getPetType()); long startTime = System.currentTimeMillis(); String result = goodService.brandQuery(productQueryEntity); long acceptTime = System.currentTimeMillis() ; From 47c5c1b785c53915b1cbc5dad8398dda96eef103 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 02:21:44 +0800 Subject: [PATCH 10/38] debugger --- .../royalcanin/good/GoodController.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index 6b3ae2e7..8a864e2e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -120,16 +120,22 @@ public class GoodController { } } + String result = ""; + try{ + System.out.println("productQueryEntity:"+ productQueryEntity.getPetType()); + long startTime = System.currentTimeMillis(); + result = goodService.brandQuery(productQueryEntity); + long acceptTime = System.currentTimeMillis() ; + long elapsedTime = acceptTime - startTime; + //记录服务响应时间 + addOperatreFullData("royalcanin/h5/product/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL"); + return result; + }catch (Exception e){ + System.out.println(e.getMessage()); + }finally { + return result; + } - - System.out.println("productQueryEntity:"+ productQueryEntity.getPetType()); - long startTime = System.currentTimeMillis(); - String result = goodService.brandQuery(productQueryEntity); - long acceptTime = System.currentTimeMillis() ; - long elapsedTime = acceptTime - startTime; - //记录服务响应时间 - addOperatreFullData("royalcanin/h5/product/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL"); - return result; } @ApiOperation(value = "查询商品信息", notes = "查询商品信息") From 177b49f4fdb62615f73267dbaf91976763fdc10b Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 02:28:57 +0800 Subject: [PATCH 11/38] debugger --- .../module/system/royalcanin/good/GoodController.java | 3 --- .../smart-admin-api/src/main/resources/sql/smart-admin.sql | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index 8a864e2e..566ff0f7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -72,7 +72,6 @@ public class GoodController { List tagNameList = new ArrayList<>(); int count = 0; for (String categoryKey : paramMap.keySet()) { - System.out.println("categoryKey:"+ categoryKey); if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") { switch (categoryKey) { case "categoryName": @@ -97,7 +96,6 @@ public class GoodController { } } if(count > 0) { - System.out.println("count:"+ count); List productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus()); List tagCodeList = new ArrayList<>(); for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) { @@ -122,7 +120,6 @@ public class GoodController { } String result = ""; try{ - System.out.println("productQueryEntity:"+ productQueryEntity.getPetType()); long startTime = System.currentTimeMillis(); result = goodService.brandQuery(productQueryEntity); long acceptTime = System.currentTimeMillis() ; diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 95b951f7..9360d376 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1602,7 +1602,7 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_operate_log` ( `code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, `msg` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) CREATE TABLE `t_good_orders` ( From 17e2df00197f090184a87ed9567fb2659764015f Mon Sep 17 00:00:00 2001 From: Vion Date: Sat, 29 Jan 2022 11:50:10 +0800 Subject: [PATCH 12/38] Env data updated --- rc-busness/config/env-data.js | 229 ++++++++++++++++++++++++++++++++++ rc-busness/pages/index.vue | 121 +----------------- 2 files changed, 233 insertions(+), 117 deletions(-) create mode 100644 rc-busness/config/env-data.js diff --git a/rc-busness/config/env-data.js b/rc-busness/config/env-data.js new file mode 100644 index 00000000..a63ff61f --- /dev/null +++ b/rc-busness/config/env-data.js @@ -0,0 +1,229 @@ +let devData={ + catlistvideo:[ + { + title: "主食级猫湿粮", + video: "/images/cat/one.mp4", + catimage: "/images/cat/one.jpg", + productimage: "/images/cat/star-1.png", + detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", + price: "¥372", + productList: [ + { + productCode: "80240008F24", + }, + ], + }, + { + title: "幼猫成长专属", + video: "/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail: "支持幼猫自身保护力 为快速生长提供足够能量", + price: "¥33", + productList: [ + { + productCode: "20030040", + }, + ], + }, + { + title: "室内成猫专属", + video: "/images/cat/three.mp4", + catimage: "/images/cat/three.jpg", + productimage: "/images/cat/star-3.png", + detail: "高易消化蛋白 减少粪便量和异味", + price: "¥157", + productList: [ + { + productCode: "21100200", + }, + ], + }, + { + title: "英短成猫专属", + video: "/images/cat/four.mp4", + catimage: "/images/cat/four.jpg", + productimage: "/images/cat/star-4.png", + detail: "增强肌肉质量 支持骨骼与关节健康", + price: "¥402", + productList: [ + { + productCode: "23040450", + }, + ], + } + ], + doglistvideo: [ + { + title: "主食级狗湿粮", + video: "/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/dog/star-1.png", + detail: "柔软细腻慕斯 适合离乳期幼犬舔食", + price: "¥359", + productList: [ + { + productCode: "81220020F12", + }, + ], + }, + { + title: "贵宾成犬专属", + video: "/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/dog/star-2.png", + detail: "护肤靓毛 理想体态", + price: "¥562", + productList: [ + { + productCode: "14200300", + }, + ], + }, + { + title: "小型犬成犬专属", + video: "/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/dog/star-3.png", + detail: "亮泽被毛 呵护牙齿", + price: "¥57", + productList: [ + { + productCode: "16020080", + }, + ], + }, + { + title: "离乳期全价奶糕", + video: "/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/dog/star-4.png", + detail: "高易再水合颗粒 帮助增强保护健康成长", + price: "¥263", + productList: [ + { + productCode: "17220400", + }, + ], + }, + ] + }; + +//Production data +let prdData={ + catlistvideo:[ + { + title: "主食级猫湿粮", + video: "/images/cat/one.mp4", + catimage: "/images/cat/one.jpg", + productimage: "/images/cat/star-1.png", + detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", + price: "¥77", + productList: [ + { + productCode: "80240008F24", + }, + ], + }, + { + title: "幼猫成长专属", + video: "/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail: "支持幼猫自身保护力 为快速生长提供足够能量", + price: "¥146", + productList: [ + { + productCode: "20030200,2003004003", + }, + ], + }, + { + title: "室内成猫专属", + video: "/images/cat/three.mp4", + catimage: "/images/cat/three.jpg", + productimage: "/images/cat/star-3.png", + detail: "高易消化蛋白 减少粪便量和异味", + price: "¥140", + productList: [ + { + productCode: "21100200,2110020002", + }, + ], + }, + { + title: "英短成猫专属", + video: "/images/cat/four.mp4", + catimage: "/images/cat/four.jpg", + productimage: "/images/cat/star-4.png", + detail: "增强肌肉质量 支持骨骼与关节健康", + price: "¥183", + productList: [ + { + productCode: "23040200,2304004003,2304020002,23040450,23041000", + }, + ], + } + ], + doglistvideo: [ + { + title: "主食级狗湿粮", + video: "/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/dog/star-1.png", + detail: "柔软细腻慕斯 适合离乳期幼犬舔食", + price: "¥78", + productList: [ + { + productCode: "81220020F03,81220020F06,81220020F12", + }, + ], + }, + { + title: "贵宾成犬专属", + video: "/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/dog/star-2.png", + detail: "护肤靓毛 理想体态", + price: "¥241", + productList: [ + { + productCode: "14560300,1456030002,14560750", + }, + ], + }, + { + title: "小型犬成犬专属", + video: "/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/dog/star-3.png", + detail: "亮泽被毛 呵护牙齿", + price: "¥121", + productList: [ + { + productCode: "10030200,10030800,1003020002", + }, + ], + }, + { + title: "离乳期全价奶糕", + video: "/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/dog/star-4.png", + detail: "高易再水合颗粒 帮助增强保护健康成长", + price: "¥88", + productList: [ + { + productCode: "16220100,16220300,16221000,1622010002,1622030002,16220100F03,16220300F03", + }, + ], + }, + ] + }; +//Production data end +let data = { + 'development':devData, + 'production':prdData +}; + +export default data; \ No newline at end of file diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index fb27a3b2..f4771044 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1048,6 +1048,7 @@ import FixRight from "~/components/fixed-right.vue"; import Myfooter from "~/components/rc-footer.vue"; import unlogin from "~/components/unlogin.vue"; import { mapMutations } from "vuex"; +import envData from "~/config/env-data.js"; import { userquery, postCourseId, @@ -1066,6 +1067,7 @@ export default { dataLoaded: true, usermargin: { marginTop: "0" }, useraindex: 0, + envData, indexacindex:0, mobileVideoPlaying: false, usertitle: "明星猫粮", @@ -1391,128 +1393,13 @@ export default { created() { vm = this; let curEnv = process.env.NODE_ENV; - let envVariable = { - 'development':{ - catlistvideo:[ - { - title: "主食级猫湿粮", - video: "/images/cat/one.mp4", - catimage: "/images/cat/one.jpg", - productimage: "/images/cat/star-1.png", - detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", - price: "¥372", - productList: [ - { - productCode: "80240008F24", - }, - ], - }, - { - title: "幼猫成长专属", - video: "/images/cat/two.mp4", - catimage: "/images/cat/two.jpg", - productimage: "/images/cat/star-2.png", - detail: "支持幼猫自身保护力 为快速生长提供足够能量", - price: "¥33", - productList: [ - { - productCode: "20030040", - }, - ], - }, - { - title: "室内成猫专属", - video: "/images/cat/three.mp4", - catimage: "/images/cat/three.jpg", - productimage: "/images/cat/star-3.png", - detail: "高易消化蛋白 减少粪便量和异味", - price: "¥157", - productList: [ - { - productCode: "21100200", - }, - ], - }, - { - title: "英短成猫专属", - video: "/images/cat/four.mp4", - catimage: "/images/cat/four.jpg", - productimage: "/images/cat/star-4.png", - detail: "增强肌肉质量 支持骨骼与关节健康", - price: "¥402", - productList: [ - { - productCode: "23040450", - }, - ], - } - ], - doglistvideo: [ - { - title: "主食级狗湿粮", - video: "/images/dog/one.mp4", - catimage: "/images/dog/one.jpg", - productimage: "/images/dog/star-1.png", - detail: "柔软细腻慕斯 适合离乳期幼犬舔食", - price: "¥359", - productList: [ - { - productCode: "81220020F12", - }, - ], - }, - { - title: "贵宾成犬专属", - video: "/images/dog/two.mp4", - catimage: "/images/dog/two.jpg", - productimage: "/images/dog/star-2.png", - detail: "护肤靓毛 理想体态", - price: "¥562", - productList: [ - { - productCode: "14200300", - }, - ], - }, - { - title: "小型犬成犬专属", - video: "/images/dog/three.mp4", - catimage: "/images/dog/three.jpg", - productimage: "/images/dog/star-3.png", - detail: "亮泽被毛 呵护牙齿", - price: "¥57", - productList: [ - { - productCode: "16020080", - }, - ], - }, - { - title: "离乳期全价奶糕", - video: "/images/dog/four.mp4", - catimage: "/images/dog/four.jpg", - productimage: "/images/dog/star-4.png", - detail: "高易再水合颗粒 帮助增强保护健康成长", - price: "¥263", - productList: [ - { - productCode: "17220400", - }, - ], - }, - ] - }, - 'production':{} - } - this.catlistvideo = envVariable[curEnv].catlistvideo; - this.doglistvideo = envVariable[curEnv].doglistvideo; + this.catlistvideo = envData[curEnv].catlistvideo; + this.doglistvideo = envData[curEnv].doglistvideo; }, watch: {}, mounted() { - console.log(process.env.NODE_ENV,' mounted'); this.checkIsLogin(); this.userdata = this.$store.state.userInfo; - console.log(this.userdata); const that = this; this.ifAdoid(); From b3c21bb35fe6a5347f0e087892223e43bba7ba83 Mon Sep 17 00:00:00 2001 From: Vion Date: Sat, 29 Jan 2022 15:24:05 +0800 Subject: [PATCH 13/38] Removing domain at prd env --- rc-busness/config/async/env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-busness/config/async/env.js b/rc-busness/config/async/env.js index 8ff9739b..8479749d 100644 --- a/rc-busness/config/async/env.js +++ b/rc-busness/config/async/env.js @@ -9,7 +9,7 @@ let baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/' if (process.env.NODE_ENV === 'development') { baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'; } else if (process.env.NODE_ENV === 'production') { - baseUrl = 'https://shop.royalcanin.com.cn/royalcanin/royalcanin/royalcanin/'; + baseUrl = '/royalcanin/royalcanin/royalcanin/'; } export { baseUrl, From 80ac6d1cefaa9e746b2861c1244d526b6800b612 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 19:08:12 +0800 Subject: [PATCH 14/38] debugger --- .../royalcanin/good/OrderController.java | 114 +++++++++--------- 1 file changed, 59 insertions(+), 55 deletions(-) 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 22005238..ac5340c4 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 @@ -77,65 +77,69 @@ public class OrderController { JSONArray orderDatilListJson = new JSONArray(); OrdersEntity ordersEntity = new OrdersEntity(); OrderAddress orderAddress = new OrderAddress(); - for (OrdersEntity ordersEntitys:ordersEntityList) { - cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductCode()); - //存储orderDetailList - OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity(); - orderDatilListEntity.setProductName(ordersEntitys.getProductName()); - orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); - orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); - orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); - orderDatilListJson.add(orderDatilListEntity); - if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { - CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity (); - couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); - couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); - String couponInfo = couponService.couponGetAll(couponGetAllEntity); - JSONObject jsonObject = JSONObject.parseObject(couponInfo); - com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data")); - JSONObject jsonObjectData = (JSONObject)jsonArray.get(0); + try { + for (OrdersEntity ordersEntitys : ordersEntityList) { + cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode()); + //存储orderDetailList + OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity(); + orderDatilListEntity.setProductName(ordersEntitys.getProductName()); + orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); + orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); + orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); + orderDatilListJson.add(orderDatilListEntity); + if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { + CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity(); + couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); + couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); + String couponInfo = couponService.couponGetAll(couponGetAllEntity); + JSONObject jsonObject = JSONObject.parseObject(couponInfo); + com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data")); + JSONObject jsonObjectData = (JSONObject) jsonArray.get(0); - ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ?jsonObjectData.getString("discount"):jsonObjectData.getString("couponAmount")); - ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); - ordersEntity.setCouponName(jsonObjectData.getString("couponName")); - ordersEntity.setCouponId(jsonObjectData.getString("couponId")); - total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount()); - }else{ - total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ; + ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ? jsonObjectData.getString("discount") : jsonObjectData.getString("couponAmount")); + ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); + ordersEntity.setCouponName(jsonObjectData.getString("couponName")); + ordersEntity.setCouponId(jsonObjectData.getString("couponId")); + total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(), Double.parseDouble(ordersEntitys.getCouponAmount()), Double.parseDouble(ordersEntitys.getPayAmount()), ordersEntitys.getBuyCount()); + } else { + total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount(); + } + basePoint = basePoint + ordersEntitys.getBasePoint(); + orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); + orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName()); + orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo()); + orderAddress.setAddressPhoneNumber(ordersEntitys.getOrderAddress().getAddressPhoneNumber()); + orderAddress.setAddressUserName(ordersEntitys.getOrderAddress().getAddressUserName()); + orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName()); + productId.append(ordersEntitys.getProductCode() + ","); + productName.append(ordersEntitys.getProductName() + ","); + memberId = ordersEntitys.getMemberId(); + mobile = ordersEntitys.getPhoneNumber(); + buyCount = buyCount + ordersEntitys.getBuyCount(); } - basePoint = basePoint + ordersEntitys.getBasePoint(); - orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); - orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName()); - orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo()); - orderAddress.setAddressPhoneNumber(ordersEntitys.getOrderAddress().getAddressPhoneNumber()); - orderAddress.setAddressUserName(ordersEntitys.getOrderAddress().getAddressUserName()); - orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName()); - productId.append(ordersEntitys.getProductCode()+","); - productName.append(ordersEntitys.getProductName()+","); - memberId = ordersEntitys.getMemberId(); - mobile = ordersEntitys.getPhoneNumber(); - buyCount = buyCount + ordersEntitys.getBuyCount(); - } - ordersEntity.setOrderAddress(orderAddress); - ordersEntity.setProductCode(productId.substring(0,productId.length()-1)); - ordersEntity.setProductName(productName.substring(0,productName.length()-1)); - ordersEntity.setOrderAmount(StringUtil.toString(total_fee)); - ordersEntity.setMemberId(memberId); - ordersEntity.setPhoneNumber(mobile); - ordersEntity.setBuyCount(buyCount); - ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); - ordersEntity.setOrderStatus("0"); - ordersEntity.setBasePoint(basePoint); + ordersEntity.setOrderAddress(orderAddress); + ordersEntity.setProductCode(productId.substring(0, productId.length() - 1)); + ordersEntity.setProductName(productName.substring(0, productName.length() - 1)); + ordersEntity.setOrderAmount(StringUtil.toString(total_fee)); + ordersEntity.setMemberId(memberId); + ordersEntity.setPhoneNumber(mobile); + ordersEntity.setBuyCount(buyCount); + ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); + ordersEntity.setOrderStatus("0"); + ordersEntity.setBasePoint(basePoint); - if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ - wxPayEntity.setProduct_id(ordersEntity.getProductCode()); - wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); - wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); - Map returnMap = new HashMap<>(); - returnMap.put("orderNumber",ordersEntity.getOrderNo()); - returnMap.put("orderAmount",ordersEntity.getOrderAmount()); + if (orderService.generateOrder(ordersEntity, orderDatilListJson) == 1) { + wxPayEntity.setProduct_id(ordersEntity.getProductCode()); + wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); + wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); + Map returnMap = new HashMap<>(); + returnMap.put("orderNumber", ordersEntity.getOrderNo()); + returnMap.put("orderAmount", ordersEntity.getOrderAmount()); // return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity)); - return ResponseDTO.succData(returnMap,wxpayService.testGenerateQRCode(wxPayEntity)); + return ResponseDTO.succData(returnMap, wxpayService.testGenerateQRCode(wxPayEntity)); + } + }catch (Exception e){ + System.out.println(e.getMessage()); } return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); } From 0c5e6bc33a97f123bb3a48d89d2dd57c035ce06d Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 19:14:35 +0800 Subject: [PATCH 15/38] debugger --- .../module/system/royalcanin/good/OrderController.java | 3 +++ 1 file changed, 3 insertions(+) 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 ac5340c4..3cafff56 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 @@ -79,6 +79,7 @@ public class OrderController { OrderAddress orderAddress = new OrderAddress(); try { for (OrdersEntity ordersEntitys : ordersEntityList) { + System.out.println("ordersEntityList.size()"+ordersEntityList.size()); cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode()); //存储orderDetailList OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity(); @@ -105,6 +106,7 @@ public class OrderController { total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount(); } basePoint = basePoint + ordersEntitys.getBasePoint(); + System.out.println("basePoint"+basePoint); orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName()); orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo()); @@ -129,6 +131,7 @@ public class OrderController { ordersEntity.setBasePoint(basePoint); if (orderService.generateOrder(ordersEntity, orderDatilListJson) == 1) { + System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson) == 1"); wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); From bb2c4903ce6cadeb402c292ca07cd32afefdb337 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 19:25:33 +0800 Subject: [PATCH 16/38] debugger --- .../module/system/royalcanin/CouponConfigService.java | 3 ++- .../smartadmin/module/system/royalcanin/CouponService.java | 4 +++- .../module/system/royalcanin/MemberAccountService.java | 2 +- .../module/system/royalcanin/MemberAddressService.java | 2 +- .../smartadmin/module/system/royalcanin/MemberService.java | 2 +- .../module/system/royalcanin/good/OrderController.java | 6 ------ .../module/system/royalcanin/good/service/GoodService.java | 4 ++-- .../module/system/royalcanin/good/service/OrderService.java | 4 ++-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java index 85080b4e..fdd9b83a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java @@ -13,7 +13,8 @@ import java.util.Map; @Service public class CouponConfigService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; +// private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/couponConfig/"; public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java index dd1a7a14..8ddbd7bd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -12,7 +12,9 @@ import java.util.Map; @Service public class CouponService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; +// private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; + + private String url = "http://crm.royalcanin.com.cn:8080/crm/coupon/"; public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java index 0b388849..95699e18 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java @@ -16,7 +16,7 @@ import java.util.Map; @Service public class MemberAccountService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/memberAccount/"; public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity){ memberAccountChangeEntity.setChannelId(15); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java index e8bf3682..d1eee1e4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java @@ -15,7 +15,7 @@ import java.util.Map; @Service public class MemberAddressService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAddress/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/memberAddress/"; public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index 60772a28..6facd3a8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -13,7 +13,7 @@ import java.util.Map; @Service public class MemberService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/member/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/member/"; 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 3cafff56..87a90d6e 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 @@ -19,7 +19,6 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderRespon import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; -import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; @@ -28,18 +27,13 @@ import net.lab1024.smartadmin.module.system.wxpay.MyConfig; import net.lab1024.smartadmin.module.system.wxpay.WxpayService; import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity; import net.lab1024.smartadmin.util.GenerateSequenceUtil; -import net.lab1024.smartadmin.util.MapRemoveNullUtil; -import net.lab1024.smartadmin.util.SmartHttpUtil; import net.sf.json.JSONArray; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.utils.URLEncodedUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.net.URLEncoder; import java.util.*; @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API}) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 468d9734..239126b0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; @Service public class GoodService { - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; -// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; +// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/"; @Autowired private GoodsDao goodsDao; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 46b34ef9..6280d4f3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -46,8 +46,8 @@ public class OrderService { @Autowired private NotifyService notifyService; - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; -// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; +// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { From 990743412a2c5e3ebc3715e7d1d6e92a24b5fdc4 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 19:29:22 +0800 Subject: [PATCH 17/38] debugger --- .../module/system/royalcanin/good/service/OrderService.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/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 6280d4f3..b9508889 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -47,7 +47,7 @@ public class OrderService { private NotifyService notifyService; // String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/"; @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { From 801ac2979c8e81b0ddaac15a2d8a507a9cf7d005 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 19:40:10 +0800 Subject: [PATCH 18/38] debugger --- .../royalcanin/good/service/OrderService.java | 101 ++++++++++-------- 1 file changed, 54 insertions(+), 47 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index b9508889..145ea76d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -52,56 +52,63 @@ public class OrderService { @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity(); - if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) { - CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); - couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode()); - couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo()); - couponCosumeEntity.setProductCode(ordersEntity.getProductCode()); - BigDecimal realCouponAmount =new BigDecimal(ordersEntity.getOrderAmount()); - couponCosumeEntity.setRealCouponAmount(realCouponAmount); - JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity)); - if(!jsonObject.getString("code").equals("0")) { + try { + if (ordersEntity.getCouponCode() != "" && null != ordersEntity.getCouponCode()) { + CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); + couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode()); + couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo()); + couponCosumeEntity.setProductCode(ordersEntity.getProductCode()); + BigDecimal realCouponAmount = new BigDecimal(ordersEntity.getOrderAmount()); + couponCosumeEntity.setRealCouponAmount(realCouponAmount); + JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity)); + if (!jsonObject.getString("code").equals("0")) { + return 0; + } + //coupon json化 + OrderCouponEntity orderCouponEntity = new OrderCouponEntity(); + orderCouponEntity.setCouponCode(ordersEntity.getCouponCode()); + orderCouponEntity.setCouponName(ordersEntity.getCouponName()); + orderCouponEntity.setCouponId(ordersEntity.getCouponId()); + Map orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity); + MapRemoveNullUtil.removeNullEntry(orderCouponParamMap); + net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap); + addOrSaveEntity.setOrderCoupon(orderCouponJson.toString()); + } + + Map paramMap = MapRemoveNullUtil.setConditionMap(ordersEntity); + paramMap.remove("orderAddress"); + paramMap.remove("couponTypeId"); + ObjectMapper objectMapper = new ObjectMapper(); + OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class); + if (ordersDao.insert(orderEntity) == 1) { + ordersEntity.setOrderStatus("0"); + addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); + addOrSaveEntity.setStatus("0"); + addOrSaveEntity.setOrderNumber(ordersEntity.getOrderNo()); + addOrSaveEntity.setSalesAmount(ordersEntity.getOrderAmount()); + addOrSaveEntity.setOrderDetailList(listJson.toString()); + OrderAddress orderAddress = ordersEntity.getOrderAddress(); + + addOrSaveEntity.setAddressCityName(orderAddress.getAddressCityName()); + addOrSaveEntity.setAddressCountyName(orderAddress.getAddressCountyName()); + addOrSaveEntity.setAddressDetailInfo(orderAddress.getAddressDetailInfo()); + addOrSaveEntity.setAddressPhoneNumber(orderAddress.getAddressPhoneNumber()); + addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName()); + addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName()); + JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity)); + + if (jsonObject.getString("code").equals("1")) + return 1; + else + return 0; + } else { return 0; } - //coupon json化 - OrderCouponEntity orderCouponEntity = new OrderCouponEntity(); - orderCouponEntity.setCouponCode(ordersEntity.getCouponCode()); - orderCouponEntity.setCouponName(ordersEntity.getCouponName()); - orderCouponEntity.setCouponId(ordersEntity.getCouponId()); - Map orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity); - MapRemoveNullUtil.removeNullEntry(orderCouponParamMap); - net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap); - addOrSaveEntity.setOrderCoupon(orderCouponJson.toString()); - } - - Map paramMap = MapRemoveNullUtil.setConditionMap(ordersEntity); - paramMap.remove("orderAddress"); - paramMap.remove("couponTypeId"); - ObjectMapper objectMapper = new ObjectMapper(); - OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class); - if(ordersDao.insert(orderEntity) == 1) { - ordersEntity.setOrderStatus("0"); - addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); - addOrSaveEntity.setStatus("0"); - addOrSaveEntity.setOrderNumber(ordersEntity.getOrderNo()); - addOrSaveEntity.setSalesAmount(ordersEntity.getOrderAmount()); - addOrSaveEntity.setOrderDetailList(listJson.toString()); - OrderAddress orderAddress = ordersEntity.getOrderAddress(); - - addOrSaveEntity.setAddressCityName(orderAddress.getAddressCityName()); - addOrSaveEntity.setAddressCountyName(orderAddress.getAddressCountyName()); - addOrSaveEntity.setAddressDetailInfo(orderAddress.getAddressDetailInfo()); - addOrSaveEntity.setAddressPhoneNumber(orderAddress.getAddressPhoneNumber()); - addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName()); - addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName()); - JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity)); - if(jsonObject.getString("code").equals("1")) - return 1; - else - return 0; - }else { - return 0; + }catch (Exception e){ + System.out.println(e.getMessage() + ); } + return 0; } public int checkNotify(String orderNumber){ From 1831007a0b9aafa8c907e98b5bbc48bfb0e95b07 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sun, 30 Jan 2022 02:44:51 +0800 Subject: [PATCH 19/38] debugger --- .../module/system/royalcanin/good/OrderController.java | 1 - .../system/royalcanin/good/service/GoodService.java | 2 +- .../system/royalcanin/good/service/OrderService.java | 8 +++++--- .../main/java/net/lab1024/smartadmin/util/AESUtil.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) 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 87a90d6e..683f9e1d 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 @@ -3,7 +3,6 @@ package net.lab1024.smartadmin.module.system.royalcanin.good; import com.alibaba.fastjson.JSONObject; import com.alipay.api.internal.util.AlipaySignature; -import com.beust.jcommander.Parameter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.common.anno.OperateLog; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 239126b0..041719de 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; public class GoodService { // String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/"; @Autowired private GoodsDao goodsDao; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 145ea76d..b70a66df 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -47,7 +47,7 @@ public class OrderService { private NotifyService notifyService; // String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; - String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/"; @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { @@ -216,12 +216,14 @@ public class OrderService { String orderCoupon = addOrSaveEntity.getOrderCoupon(); jsonObject.put("orderCoupon",orderCoupon); jsonObject.put("orderDetailList",detailList); + jsonObject.put("channelId","15"); + jsonObject.put("secret","H5@2021"); long startTime = System.currentTimeMillis(); - String result = SmartHttpUtil.httpPostRaw(url+"addOrSave?channelId=15&secret=H5@2021",jsonObject.toString(),null,"utf-8"); + String result = SmartHttpUtil.httpPostRaw(url+"addOrSave",jsonObject.toString(),null,"utf-8"); long acceptTime = System.currentTimeMillis() ; long elapsedTime = acceptTime - startTime; //记录服务响应时间 - addOperatreFullData(url+"addOrSave",addOrSaveEntity.toString(),result, startTime,elapsedTime,acceptTime); + addOperatreFullData(url+"orderMaster/addOrSave",addOrSaveEntity.toString(),result, startTime,elapsedTime,acceptTime); return result; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java index cf0d164e..97b36485 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java @@ -166,7 +166,7 @@ public class AESUtil { // String content = "{'repairPhone':'18547854787','customPhone':'12365478965','captchav':'58m7'}"; // System.out.println("加密前：" + content); System.out.println("加密密钥和解密密钥：" + KEY); - String encrypt = "C98174A5A099183A55630002D064B9CFBC3CCA4C01CA5DED75207A175FAE8E85F2D5F6F04907ADEAF008B6E80915814F900B378A3DBC1054BB6EE1DF9E356126C34F7EB19277D095637C3DFF6034B7797362C9FCEAE8A2E53E0C4824C2716C97FAAA722986D4AA95D4A381DB2515C4A7D3BFA7D7AEE174E9E6335B508957233947894D400BD03481B820A20F4599978147853262576A48112CA53368466E365068206CBF3408519D4AE6B423C70F7F361643D3E43A2B7509601D767CD7C8E2358044F38EFBC367A1484141AAD09D095DB2BED3484D4607A250D5BA2157077F00E60C467A7E07D2885519A33CDBB87F7FA0AD85E7C0A3615CE7300DB38C409168D9689BC42C1C7EBFE5F71641A9B96BFBC20A61AD6BB0C1127B3D30CBD4017D5B8C3EB659FFB0321DCF18A6530E47020D8279D52D637CBA9AFF8E20ECEBF475192D267F79DB2177D262F3059F706CD071B1F4A671813D1BCC9554A0A7940D17C80E4D91AA0EACB8E285003028CCFAF6087AB9146D588C5176BFA8848872E48FD517E7A8071F0AEED2759568DC437EC2CCB8682F62F7DC028096F70C1835052B232136516786C5A20C92BFE0A6BDD7D6B241E820E8F7C1140605E97A950BCEF46A0E194868BEE9A81703843872521B0F1C4B9EBE85742E50859BCD5F8593B0D9D41BD71DE6C65D0BBA825867926D3AB99EC946A64EA9C350FCD7748A5E6A8125A81FEAE1F470A316621DCFFB62C513AFB2E8EEB09131E3E3A48A10747597EECD100233DEE264A51AEEF82047C41D60BC584BA79948C7A32DA4ACE66C245E1D65E9C4A2020092B98243C67B973DBA5A813F291B87EA0F9786B761DAEF52CFABFA7BC0762986E3B083B9AB7D83A1D2488DE2099BED8D242A5074D95BEC7DBDD58E122C2449DDA8D4D368172E19DF5F0F94ACB85BD8117DC68440F2DE0598BC29B11DA68B492C78B7D5A3BE421268730B9DEB4503E779891BBDAFF659486DB0AC172F95C6D4D375C749A70074B99546CB3A90494D1834910FB76AED0734E6806F9D2AABD525A960E65251C3F85EB5D5E197808BED7E084C0254F7A23F79F2E6071674110BF7F5C69BD9C4D63B04D19CEA5914C9269142FD35A1A96DE5F7C7DE0B038D79FFB0FC2707B6141466199FD4947F11957C5F740883F3614688D83D3804AEF22D181689898124495BF4271637A034333E1F7074AE304FD3B1BF792985B7B940BB379049350A28D7690C6EA8ACEC01B7588BAAEAB654475229E750BEDB3DD67AA180128C7EFE941ABDD182277ACD64DD9B30B3FE84EBA4CF445DD1074713B4C9154BF15F63EEA5819A00BB20ED68ED602ED7A78FDA2FD63E3815DA6B11087C7F4D3FE7831A9E16AD9F43AE3AD5FAB6326F775C071A9B2283000AB02BE3783AC6EE03956C29061F4D5129C9A74B257F50ACA0D1F08732D9D9826239299D5651187B5D416F67D1AB8787E3EF591F8448AC8044F38EFBC367A1484141AAD09D095DB2BED3484D4607A250D5BA2157077F00E60C467A7E07D2885519A33CDBB87F7F5EF65034F632732B9AAA7216F550D7EBC15FE21E9CE0BBA8A66BA362AF7BE082F3CDAA4F24C72003C15D8BCEF1B69DA21B3F89E8EA1FBC7E56E6C3014D71C3DCF2CCCB96A0F1B0ABDE43B16FE51A59B746F3885FA065408B0A3B90A15541835867003D82E97DDFBBEC8FAE2443B7CFB5925B511AA7700FA2AAEC99100631F99E070758A755AD5A1F6A6BC3B7D611C3403FDAB74DC3B4FF110BB1A07BE4FAFE64FDB2BC3ECF48A8B085D667CAB68FF8C74176B99BD70E06313167A41CF46FDB6AB2D8338E81EE13329709FE0E0FD39D038330F0D97050E7180AF462152B93FAC0D4177B6FF517D5F3B41686EF32D0CCB6E8DBD77A96E045F69DE10A26BAF7D9DAACB32140B43B84D9A2656E1A5FC93F6E1B3DC10996EB87E500C3DB33E806160271E7E3FDCDB869F4EFC2A0CBE0995EEA46EBCBC9EB6CD518DFFED4C4F6798E86573BE523677D2FF38EE6695FC202C82C816C87DCA3CCEB581A820280FA60B6BE25B13EB68F20C3CD2B05660DC964CEAE51AA25D14BDD78EC94FB0AAFA7101600915CDB367A96D167FAF3E6CF63A468455E6CB8C2B799046EA9314C8883E84B11B85BD8117DC68440F2DE0598BC29B11D10B9DE3DB372BB64186D0A1B75CACC110DCBE0A55FEE2FE3F062337DCD0A30255DD8AE42EE89C31929CF4BA4A940CEC24E3AA095FB9F06D43162DA6748FEF3634ACE74BF6A4C29C1C6C6DF8E060154C2B7EACB40A0C4F25E2867F513603803B92F11690103F26AF2759AA796EA71F7BEA34EA5CE158E9FB72B2D276E2172556542B6FAF5D8CB1BD68D0B6046CF14A6B1387BDEA6A8EDAB613C9B26C2040FD23E89FEB58C4058E64DEF62D6C5AD6DD12EC5ACDCF002CE0C7100C46BEC17386ED1792B43CBEC444A4A36126DE817C0B9AC82BFC561AD0D8D76DBC29CC4BD7DA40E703877B6E15D4E6AEEF3B522DA0D24808EBCD65FDAB5AA75ED1A27ABA1221F929BAFC8DFB40264A208A7E4D77EBB38E7B9555A6F3113D9FFF4B82D8AE4D271995F438AFF9AAF8F904C1EA0006A1BD44605839A28A3E471ABBDC5A8859BD954CCB036D5F7A891A07565300038EB7AA95B080C97300C5387E1B147F98AC92A13A78BED7E084C0254F7A23F79F2E6071674110BF7F5C69BD9C4D63B04D19CEA5914C9269142FD35A1A96DE5F7C7DE0B038D05B71E6F7BF06722BADBE59869D89156F0AA223D6CADA607854FB9B3C598CF9060A1A50FC67882224D4A28663504705581BC765325CA7303B61CA3D1D42F0D304A822BF6B9315331243FE915AFD04E542DEAFC7F454D2454BE7A667E006FB11C23C84A1F3207FBEBB0F73AB0B124B5B22E19C61E11B9518EB931F0F4DCEFA84B27A06F6A9A39B1B3690ABD60DDF35EFC411A5512A853FDCC7F8FE8AD6763BFE5C8793A6B4EEAE04ADF84157BC5F6D0E5B2D8338E81EE13329709FE0E0FD39D034BC60D82CE4E31A1ECF4A9F170BBA5F41AD233924F060A4F491A28B94F414E9ABB817C9E3945A3217406D0006C3CA764E47ECD33299122002E1A1E4C8B393884D79E6C735163FE8ED73AD7260A5610E62E623506BF04A222AD57C0447E1A0E755301D3C9807EB16D99A849D5D5201B162BC90B613FD4B64A8E9A7ECF060743BB9102EA47003538B1FA76841EA4001A0E3EDADECC58FEDD38787C647CB389E178C686B322CFBD19AFE300D85ACEACA04B470CCAA607C6845454B44D10A2FEEFA89E675758D1003BEC5BAEF40212C37FB44349B91D9EFD65355F2FC533097BF052A6FCF0FB77928B802E83304CEAD65C88B6D5CFEEEFE049AD386FBF1742C8AE28FD01C80742A9B79B6426AA6348AF6AA84101E7280F34CF68C666E79613147775584A7F08D595C7049EB89063C5968AD32A98D279600B7D7350598C455ECEEED1857510FD264C59011FA84029E10E69C965C59842BFFE85C18C99FC25249D7A4D5034BEB4B80C2508805FFE577A8630E9BC3E8B039216013F5FC955F8261E9C064B1CBC045A020B40327F68DAF028262629E71517BB326F193D362B82FBB1304A00A69503803B4D594A18F8F167534013FD29732079DC7509FB832090980F402F09D4ACE5B2B4954428084D87B9B339A2DF49D2B4DB06F58C510CD6ABBC9CD7ABDE57C3E7D5733318424A1E5AD31D6CD556FC78903D078902680377423CCC7B69372262BF4BF585085E03EFEF6B39594A1EC88C4B2A96C096A9502FEE38DA52232E623506BF04A222AD57C0447E1A0E756E5D1DC07ADB789182ACE4D04CA955A60F11B0E316231C2917E663AA33C24E18949B39A225B540AC6A5B06BCB3BE99F86557D8AD54FC30E33F26FED241FE8DB32B95DA30F8D08B5EEDE8472067BD1EE88DFA76D9A7BEF836F55C887F07799B83FF1CB11046008B09ED7F19AD1F65892B910A63CB953E139EBB41A089CF9F598F2856AC53D99AB9EE15D58649C118F508E02246CEAD6AF5FFA37FDC6CD1EF44AC4E361139EF13296D08CEB33A4ECD456D9E82EE78E860DED779AAF0E5E6428D72771C322044186E4AD54523409E8F42F16A6C57DD9278FFA504C4F60BBB888A731E8991DCDA68F03557C4A20434A5B6ED2A44E4319FCB443650C45A5035A0C172F4F4477AD8FF60579665F17F6C71E7EC20D1B696F1B41F465A488B70D50AEACD0934CE23067D26088BEC0D6CC2F446555673CAAE3A9FE369746C7AF47376C382281B5C5BEA962EDB1382116AC3D58791E18407126A38867EB61D528AC4CE78CB1EA7886CC93976C4482C59010CC08341752FD9972A1419E97440ADE8DDAA9B2F8044F38EFBC367A1484141AAD09D095D1DA099B13EE1F2ABE1F9ACE15D4B4F76DE39C77C5377E6A478AE076B0347931DBD9A0F5D6C7C1A9791BB689DEA9EA34D4B014BE8F8A5D922A57B075593D02801F7397A66C6F30A4BC0F050CD809035D542FB57CCF9581FB5859EF65F4D7A64B0DEF76A1856F30F06A6807808A55CD02F1E8D0611FD4AE993CD5682940AAD2F2E86EA7EF55FA5F4C017AD655ED2B613D92C70C95F6C180414FAA7DB35F704DC64DF82D4F95F5F9A98CCEAD39BA29200415D0E9D6B4880F9E7BAD391B312EA87B491E704AD70C1DBA19BA902953BBA772FB4AC7BD0EE66AEB696953A1417DD8BF733662A8B953BCCF40774A7C9EB9671D45507D9DF9F529DC4117D767B043F60DF82AE5D4C9C2CD67D34628478B19EACB8A673490375D113A4A2845D83CF73CBC3F9EFB7DDF23CA937693A19F40BD1E6B7";//encrypt(content, KEY); + String encrypt = "C98174A5A099183A55630002D064B9CFC3D00F2737DE942A45972B7D24E82EE8AE572CA7909FA24B00FE5BA71C8444648B2C8858803C07EA20DFDA51A65FB3291319F2A5EF330A2639E52F17BFD3F2106AE2B43D1409A56BE8FE5AC41DBDA003E25CE840E0374D3010E9BC9E943608FE5E10448B6F9BD4850DF138BDC643891861075E0048B92A7701A4C1C7294D99D2FA8DB4566068EF3B71EEFDC00F7E58EC64940FCD98D55D8381CF884FA88FB05545D45C2015621903DE5C491D59DE4589C0528AF25951D5F08C7DF68EE657CE0E62DD4FE5D58CE33B45BD68E728811DDDD57C8A628A90F39FACE4041355D5887DADFCB3F9E6166002F15C84BCDC0042C0F449B5CC841FAD99AD35979437A261246E6B5352D2696E370F2D2ACAA975061D16C97C3C83659ED5977DAD34241432E04FFAC8C292129B52B9A0B124963FBBC538D564D914CC842841092327B8324DF2C29FAD52BACF08A4A6E260F97F69943FB036D5F7A891A07565300038EB7AA95B0D3909C800A4268E78B9CECA1B38FD7A97220DBD6962398CCB365EDD881816A5312EEEE2B1F612AE170122FB50B1E702F544D0DF8FFC5C582F177FF2FC0227C3B129F913120BEBD830EEF1E3129825765119419C2CFE6120D33E3856C71431D20BF526425972E95E3FFA1440ED9D95EFA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F58C4FF69EEF7CF4040BEF32F7AE544D9215E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982F7FBEFD58D0150AE703C7B283C6C627B099F8434FAC672EF11B74EB1AC8CFBE4CD17E46FBB42D38FBB07539DB14236B14D368B218EB2356A1D4B221A97B1409726762B8FBC4CA18856602603C07E84A04B6589E52CC3F1A84153A16DD11B1F886BB93CF973EFC804BF702252990532B5110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F7444EF9324579A1265130391D1825B1B1AFA2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24CCB2AE97DE4AAC53E366C75AD7759D5E7AF9CE81F9EF614E6B89F798E037DB301B5E91B3D604F18127279CC5CA140CCEAAA6AA627E47DF7698D6EB0691843E87B5CB8DE5801D90305BFDBDE460D29D9D111BBB6023C915BFAC90F340374F880D50BF526425972E95E3FFA1440ED9D95EFA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F50665A9D723155118BC43D7B26AA279EA15E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982F7FBEFD58D0150AE703C7B283C6C627B4C11DC7E0F3264ED3EEB4D9ACA64921ACD17E46FBB42D38FBB07539DB14236B14865B63CCE76DB8434CD1312FCD79D9BD64B7A12D3A7D8AB1CD7800DE7BD8F8F4B6589E52CC3F1A84153A16DD11B1F886BB93CF973EFC804BF702252990532B5110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F74442C06155F433420F74327F6FC2FBE4FEF2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24CCB2AE97DE4AAC53E366C75AD7759D5E7AF9CE81F9EF614E6B89F798E037DB30127D82F1FFCE92EF7EAF020BAD693EFC6EAD7C773CA85B677A2DFE9C64176ABDA56558EB2E9DC3A46AF54689953095741007693F62578CD5D18F37F1682924079D946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E89BB2F5170981A8726B323D1FDFD5D518DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1423334666197E9CA6F2BB29C146369B2B9A9319F1CBE8E2AF074E02B27D26A7233D2522DF7C515117760E89872FFF2BB85DCCAA376F6F60E5ECC6DFCAEFC2D678DD946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E8F550F91A98A564A2249391179887E48ADD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1427BB1C8BE634AE3617DE5F5963610CDC6D365D388676C41654C0B391F1C7B41916B5AD4DD4458BDE6F3D7BBE4F81264574C25CF4CC227DD9B135D029CFB7FE921D946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E855219ACD15B747F24C61C8193B0F0584DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1423BA7139FCE9F5FE61285D0229C694334B1B03D94D5A14B446B6D76EE543B1762240BF9034FDC82527AF111B2BCF05F3B5491850E02BF17BDA3B2BE7DF5134D4FD946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E8423340B61A8B58E6BEE3717D72A5AFB5DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1420EBCBEE7737D768557EC4A4D620AE6664DEF5377502CAE8A2646FECA7C3BEE699285F99E7A469CA8F32B352BC37FE0AACE411FD0548D6A86725A258715240B9880B08D081A14D7BD27D88323858A847B5F1DEC6D0EE1FAEA2F7AA1A0D676E859C2412392C1B696B17F01B2321156A53E2E19C61E11B9518EB931F0F4DCEFA84B0BF5126D89C6B35B5FEA289291F401AF7D3135B11CAF6719A68CA5F315914F52121B3EE8A978B83D18D80CA70ADA457F9DADEB0B12CC20715BE229AFE5D24E403CE81E02CB6F2459A71BC8D28D8ACE10AB6D408E0FC4F83B744ED436394521A1BF68210418490ABAB83CD2C83A615671B14A38800727FD1DD1CD5A942CC95D851E5561A5A1F80EFD3E77A3D27F79FA5C062347A40A3BD78FFD96B28A05DABF9A350BCB5E62A9C8D3B21305A19416124AC2DB0BFC82B193D94C0D37BAF99BF317C3D00F2737DE942A45972B7D24E82EE8AE572CA7909FA24B00FE5BA71C8444648B2C8858803C07EA20DFDA51A65FB3291319F2A5EF330A2639E52F17BFD3F210827A3141238FBA110C791AFBF02F70FCE25CE840E0374D3010E9BC9E943608FE5E10448B6F9BD4850DF138BDC643891861075E0048B92A7701A4C1C7294D99D2FA8DB4566068EF3B71EEFDC00F7E58EC1CAEC138588ADBD60E867CBC3E808E83CAAD6D9027F61535E8B3E1C46CA677935ABE91DFFD1D89D91690A55C688856377478B2652AA56E02241DEA44FA6100C767E7297B54CA3EA26F2857863D6CCD42BC866DCA8EB517DEC99C1CFA32256CB128AA994F09614E9E156AE54E51425C027F588EEED45D20576A0B2CCAF542F72AAE3612A74BF017EAA7B38B39C59228BEF90DB6A5A3DE21D0AEFDAB8611910E87EC4AA84D719728B8DBBA0EDD6D626282B84DCDD4E64BB977E1901586EAD6FBE47A2AB400D67A379D7B698D487E26F5FFBA20A00397E9BDF462C1D72DA0B4BFA08FCD63EA9D6711A3A4DDAB00541B89B95C1CC596C799179FA6637FCBF0B032A3EBDE66CBB84334E18AE9B1ADBCE819E050F8D15F244372DD72310EC040B0CE575484B87FD7B3C6F3148BF878DC352E5A6A266E333125591DDF521BFF710439106FE265D457515CA3D8A73DCD076D1B24667941601E0FB3D7EF71C4B1B5887FA7811BE5E522DECCE3D0B0C5DA1AF5111CAB6F0A0617CBA3A2C8FECE8A588A7F389A6EDE817376C3413C598BA96C85C0977288B37E73041ABCF4A78C5CC98E865787D7B76FB3E41111E5A6B5785AB7C2CD1E98A0E0A28C735B0DFF3423ACA06B8429D4BE30D39CF510E464F95D905BF7890F98D2DEB364CEECF2568DBCDBA3D31D0270CE4E36B928C8D519187D99C8B7C9E5E2258A260AA245333BAA17460D7149510A29CC114A5E8154B7D38F332932742A6D00719337269E42F2879069ED334589F6BB2512BA97C96547B555CAA63FE951E7DA0411D1346A86870EB7CD78D2557D5C1C7314B46C163DCCF68CC116DF070BF526425972E95E3FFA1440ED9D95EFA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F57C33B4584F622449F302B4B70B8CF68015E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982F7FBEFD58D0150AE703C7B283C6C627BDBFA73896A4F118E30B9DA9E25802B25683EDDC5FFA75986AE0C392DDB6C2D7341E8971EA97991DA8388CC3D23A7D671683CF4EAED2F86C7CCF4E0FEB8E9660D2288E02E11DD3F2FA84E5A776648C555B500F719AD346E950199150A4BA4034B2A26D4C28A225E97435F4BC162A599D2EADC8E66FCB90F0A35C25279098FBE8A796937FBFBE6443172022280C46B5AC58AB3834B27E320B4A1B44CB34F6BB0534FC1F34B58943411D2110FE020569B5561C4281EC63946F687B7E4AACDCD06466E6B5352D2696E370F2D2ACAA975061DB56B09A950EEA4646B9E6DED8598AD85E4692A2780E23E0CB8286EA2D1CA27A973652315E6E0D2CD79E31A9D56A95121787EC4FA388FA3A9C0239D517014F2F689EDF0D658B9FB853707F72500AF9EB1B74D9B185F99B3C58878626C0C7B614D3C31773EF413A63EB9357D4707D20EB5C520CE9E46B4217ABA9A6CA5BCEA0E50D26C5022024A10562B3362D5281B2585E8288651B10F948E30FE040D944D2963C7B068F04479A977E589ABBF8B013998AE572CA7909FA24B00FE5BA71C8444648B2C8858803C07EA20DFDA51A65FB3291319F2A5EF330A2639E52F17BFD3F2101200657ACB3C002B8AF8F32D6FDF521CE25CE840E0374D3010E9BC9E943608FE5E10448B6F9BD4850DF138BDC643891861075E0048B92A7701A4C1C7294D99D269C1D3075F059425FEEB1353502EBAA464940FCD98D55D8381CF884FA88FB055462AE64044FCE777E2BED4BD1C65949A4F0D0F78C9E54021F7CD9A43A7FE31981BF4D1F81C4EE19ADEA0423065D226AEB222D1CD82B0FB5FA1820D266FEF1F40ADFCB3F9E6166002F15C84BCDC0042C0400392221DCEC2B1104DBD748AC3713A110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F74446065D967EF87BE7782EC381B88402FBF2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24C4B007A44D65C3B6484EF4276193797F2E0FA501C8B9F59F4FE65397A2CE198A2A1AC0EAB48022A92CA9DB6FC3F8526D68A8F7B1873FEAB388D0517B209DF09FB7F3891CF3CF994FCC106249FEDAEB31BE999DE93FC2AE05A64939954F84D69A45B68BAABBDE231509418FBA2D741AF4DB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E8CCA26C4FAD35A5D2B8D6D74F4B96CD51DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AED5169F5665D363C3F91B3542FB56DDD0C821EFE003FA9C55A8929B7BBBAD1428D8BAF9CF38EEB46E4711452A76ADD0F12788DFB7C3CC7F76FB35C1587447AA36258B84081BB02BB8283AB569BB0F9911A0F6BB8E7429F5D2380D14A7E5352C2F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A4C36E027128144C0F4924360E0060C146494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C63F3F48F443729C6C7A68C159963E7CE84F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD172E83AE23B968FE0642CD950A95097364DCAF90FEB56AFB82637CD8AE43BB317F93FC3A80A0082ADB565AF7F7C2983343779E740D504A4F146AA6733A9EE7BCF1BB05BB53C4FE577CD1D64BC1683562F02973467D34A6FF64CE0312F7247C3580FAD51C161F462D9185671E4EC64E9F3CCFD0197F6EE514EB4414A296EBA7C8F6B83A5EB76D5E12E44DD8B82B5C17F5E6BFF6DC822D78306D5917FED395A2B697149799031D903D0003CAA78345E5722B7D4D3CEDBB5B27BD309FDFF92C84BD656AB64C619B18D36C6898D63304D2C4D27B3D03B3565E73D31B28A6FA363387193EDC99AA34677F16534C7CF9315A9416228B843F15C434BF8645738E31ED1834DB83A15060BD948EE3F1339741DFC5431BAA6BD14F740764278695AE624F4CFAF731EC1FD6CB4A2479026FF6198BA11091A0F6BB8E7429F5D2380D14A7E5352C2F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A47BD4E133739543A97771F2D6CA8E7F38494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C63F3F48F443729C6C7A68C159963E7CE84F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD17288750C997C5703B1EFB0E75D25950E175AC2162D52810ADE59113415F8E58378355C71C21AE3AA9FDC7823185CF1CC175E793A3C0ECB6370447EC2ABA657937228AA994F09614E9E156AE54E51425C027F588EEED45D20576A0B2CCAF542F72AAE3612A74BF017EAA7B38B39C59228BEF90DB6A5A3DE21D0AEFDAB8611910E87A4AB4B181AD8A38511C8EEF05F29FECBB84DCDD4E64BB977E1901586EAD6FBE47A2AB400D67A379D7B698D487E26F5FFBA20A00397E9BDF462C1D72DA0B4BFA08FCD63EA9D6711A3A4DDAB00541B89B94503D978FD80ABCF26F6B504374BAD25B005DF960684565E6A5427E573578391885D3280B05B9599090149E6317F9432D13DDE3ED9902102F2FFE3C94D567C4EAD2A0F2E430CE27E235A369CC387A9C831469CD3C9FEC012D9A833666D1F63C3F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A42DD39396E76217B428752D800F984FE1494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C6337778CAEB131C389598AF7D7B5DE16969EDA6637B32450D80B1E9F6855250BC7D809CCB6563E9C35763AE4E61387B1460988B69A6A790623825FE192793F664F1E3EE05629763F07AAF5B6F5055B83828849CF2537F073F6DE3622BB58575EE0F966242AAFB02902D5178CAC8CBAF4BAB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E86FC70A124CE133350E71F82D05FC5755DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9A05997FE30D4E78FC3BB1BB8EB9C757F60C821EFE003FA9C55A8929B7BBBAD142B83A15060BD948EE3F1339741DFC543179D61397018564C276729E49A073A6B68E66D527A711A7D23BFBBDEBCF8B359265DE27C996056A3B0CBCCDAE814A09D56C21A7D1C5AF2FB411775BEE5999C8C76BB93CF973EFC804BF702252990532B5110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F7444B4FE4CF8CC0827CCA94F4FBD6D7DAE3D2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24C676CCAD34BA07F2A8CC7269091B0880A1C4DD1D72859973EA355FCF0C69CFC35B5E91B3D604F18127279CC5CA140CCEA2CED6D9E361A6D1BAFD004CCD73AB4CC4AC87C6AA3B95A4F9094ECA13FD62B9532DEC6CCDAA4B4A1B4145A7F1F7D5026E25AC10D80FF9DF13E92200A5820E81AA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F5F12BC511A61BDC2EF359DB1C40DBCD4115E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982B5FDCB0A1478E93F45D2894380FAE74E4C11DC7E0F3264ED3EEB4D9ACA64921AF488EF32D2AEA5C2A2C5F932177283364865B63CCE76DB8434CD1312FCD79D9B38C2F2F2A56E3DA94863EBBF0DB8F1E14B32FD1769F5BB6AEC7E6CFB6F79EBDAADFCB3F9E6166002F15C84BCDC0042C0F449B5CC841FAD99AD35979437A261246E6B5352D2696E370F2D2ACAA975061D16C97C3C83659ED5977DAD34241432E071EDC82B541E50E03CEB58E408F2780138D564D914CC842841092327B8324DF2C29FAD52BACF08A4A6E260F97F69943FB036D5F7A891A07565300038EB7AA95B0D3909C800A4268E78B9CECA1B38FD7A65DEAA78D5322124258F3FE4E53A838AC394E3AD688058CB0AC9878CEA2D22C780894D0ED271ADD459A2DFA61FC58119885D3280B05B9599090149E6317F9432738525708738AA5D73549006E13D274DD5A024B80C9A8C88BE34B5D3C904CD2531469CD3C9FEC012D9A833666D1F63C3F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A414F77E0BFEB90932D14A66FDBA5CA529494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C6337778CAEB131C389598AF7D7B5DE1696F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD172E83AE23B968FE0642CD950A95097364D2449FA15001C0CE7DCE7A0FA9E7772A88AC1981C20136F31DE56253F8A75A71A4DB579BDA3800300906146C1DEEF4309BA72CF7F892B19F4ABA6C3AE80B94CDED6644CD65AA50DB2C09254FECC638DAA900B378A3DBC1054BB6EE1DF9E3561261BF2A9E06CCDC32FBDB2088AD434DA17686D4DF13FD0E702D43364996BCAD3E734D3FB9AF200F8CE1965471482C68C9189257E55203829C072A208EA1C1BCCF3013F5FA4342B430ACEE1CC709884FCDD6CF93E2356C46A2EC523A8DC9326C864D745316B9F833B8FC8BEEDA1F1A82E03224E56174417171CA49CA7D562D2693E87169878DEB113FE81291DCA88ADDE0A068D36FFFC97C64727BF7C20AC3BFE1015A0E83DFDC2DC687995B858D502FBE69E4CCF772CA448F95DDAC51ECA4AF04A56A144BED037D48952102C9CD52626F21E9B87FF5704B7D58C0425B05C3AD5F86D55CDBA940ECAD5DB3725BE23AF87F4CE4EB9D177E52DE5B1F8074BA6D2BFD414A2EC9685A9DAC45BB05DA9EC56AC5D99284AA3EE0FA1CDD95E1C170908BBDFC895BE2D1EAF4FF1AF363A39D50D65DDC138E026DFA39C6A4128F82CBACA1FD4AE3612A74BF017EAA7B38B39C59228BE03AB3BB28D18A3D8363D454AE48A570FEB33E64D88C31EF93D38DD246939C5B4D5C20ED7198EFD84C36566EE1819D8719947DFD5354481DDD22093CB19AF64DD4F6A21B0B0B96195B54B02AC286EB3E9F488EF32D2AEA5C2A2C5F93217728336F1C735583671D6DC6B9F6A14E740275A581048A7189E1C116901F287D1428DD1E25AC10D80FF9DF13E92200A5820E81AA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F530BF62776462CE32E434A76C777F8EE715E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982B5FDCB0A1478E93F45D2894380FAE74EDBFA73896A4F118E30B9DA9E25802B25683EDDC5FFA75986AE0C392DDB6C2D73A04C06E1032EF54FD5A869E4741950D7E3237B702AFDA97E3E7CB7465E02BF73F31F54CB87C33DC7BED9E8B5E4371E29E9BC95559C252E97E14249C4ED958A3BA37BA24031537AADC735AD2A0D0B37AB6223E455E70EC04185A72ADBCB3175AF0308EF6622120C162C376A8D195A0F4D2E4A1C95235BD12FB3DA9F1167B79358810C137CAFF25D337CFB3D8E87D782D88F4C38C501E0586A25052ED353B7413EEEA6EF66490C2C5D0C7D95918077987102440FC10CC38387D1F00D612431D424BCD1B5453C6A11DA06F5199D1B39EE31E92EE44039FFBE7E33666A64949BDC91B6B591E8C7ADB4B68ECB88ED3D434B4B16192105549AC0D932F7D59DA2C08CCFA55184C9D3922D58AFBF022108FD79C9DE67476D0B39A003C5BBF6FF7CECC2655B5C19BBCEF7AA4808F92AD9CC853AE82DD6819D55C48E47533AAE992A74D57ECA421244325ADCD92C9A5EA90ECAF8385A16CEE119CE7C133E751B843370E6F94934A21F3406FFC44B308D7EBA381757189D8CF34479B76A603A2FBFEBEADC51D63683E7C44D920948735A989B63370F372C1F325A36DF642297D893B4D6A82C4A8AF811E3BC768EFB3D2AC1AF09B14F610C1EF8F96360D813F3FFA1E38503974BE52CB2253AF0ABDD6D10BD525C3C068BED7E084C0254F7A23F79F2E6071674F329C125829B16D21DC7340CB3705358584A7F08D595C7049EB89063C5968AD3E779D6C6FE952C08478ECF4460D620F3A96DE5433558C040D7CDF40F37FF550FA4EBB76771D425F24139856C357244198EBE8335FF4C2EBA49E47D38005DA5EE9C650001B438ACB51AF4011AF3C5012BE642BE1BD1ABA81670ED5DE058098FF632242EFCCBDB39744F50B42203EB5832EE2C80F29DE9F0F0B3BB39AA1249D9F532B1B1401650908CAE115EE75073704C43BA99C630096CE13BCD3A02E63CF1F55611E37D81C8CFE424020DD1C0E9EA2B15E0E4021A434AF9246E11F5668BBA136D320CD5615D1EF162E619DA27E78AC6ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982D597CD71B777D8A05AEF7CF8AAE6FF75CD2337128F490EE7DCD8EB190B3F09CD372262BF4BF585085E03EFEF6B39594A1EC88C4B2A96C096A9502FEE38DA52232E623506BF04A222AD57C0447E1A0E75BD68920E28F1C6CE5C44731440669EBACC891CF82E684077617F90B2DE861B2C8D8BAF9CF38EEB46E4711452A76ADD0F7D126CF8BA525886F924BDC3493A93B0114157468941387862AF5708D0E7D336E3ADB297AD2C3215E99DDB6950A165D458B97CEC5FDA34365A345AEF9A268C0470C4A9A3A30F0261F815A55E7EA8DF548D0A98EFC7670D06DCFAE04A3A28BED078796C0600594177EFC885B462AAE4E859F74CCEBF44755EA443E8A031276D7ADD3BB8068CC5EEE2BFAC155D51604F49A1F04632CA3AE792BBB47D777C538A551AD233924F060A4F491A28B94F414E9A224A9CE41B2B5CA8FBE7EFE995264CA00C821EFE003FA9C55A8929B7BBBAD14294709ED3177E1E2CCBBEB70ACA6EE21295C892D20BEF8C73CBE636F3DC859815E1608C12D69BBA86C6E98C8C28FCB549289374D82EC77B5212DC2C1975793807C137C160C9BCC3D3E43E52B6E7EF2222647616E9A14642870C7368F84E4BFA829EF3682F1567034F36F017042E7EBDDAEB2AC10D4BF2E28F9C173FB3F8AB89673697EC99BEDB699D85004B16C3CC3DB43A54116FA11F3AC5E66098D4B9DBD91593A411A90E42F9EF915C32F949E7C8632EC9982EEC90775E8C4E2CA608F9C233F90DB6A5A3DE21D0AEFDAB8611910E87493A5C25845CE23C019FE90DBFF9651FB84DCDD4E64BB977E1901586EAD6FBE49E61EC1F72DDDE7BBCEA0F791BF0698D99C6C77DF315827F840A5E4ECE76BBC78FCD63EA9D6711A3A4DDAB00541B89B9983F7A991E6B9FE7D0E13FBC21CE061881B863A6DF28C6E5748C0D714D6A4C68B7EACB40A0C4F25E2867F513603803B92F11690103F26AF2759AA796EA71F7BEA46FD87ED3B4F6255F03FA45F8ABCD3313907D72D40E537B24F5929631F8869E3DF58280C6EEA21FF1FDA4BD2BFCC1162CA7F7F9FB2AF54B845A762532F85C18513A6A1C2AC2F007771AF2FA6801BD10164E3E73978DA4A888B3393A9E8872F40B63409A5CA4C1B00F65C36BBC8670D53D17656858282B3FE1F53B7E1DEADED82F4F7CBBE9278C0B2FB1D0951CF757D5C2E9E51409215D51BD887EC7E9439480686D4DF13FD0E702D43364996BCAD3E70EC310FF704DA063B91FA3E8BA2D61D989257E55203829C072A208EA1C1BCCF332B1B1401650908CAE115EE75073704C6CF93E2356C46A2EC523A8DC9326C864157ADFE8C4AD14A25BEE6B9B0DAB2D41A8A85A9BECD23D3807C0747E0FEDF62A0337666023E1374685791D468C235A3FDB7C78600513BEBBB1C9AA6AB78D75411016CF70433B9AACDB1F0B6E994C7D6FC0A330300B54D04A42085715DED920EC82C9B141DA3480A432991DB4FD8AE683D1A465ACF31AABEF72F034C566EA1ECEF16A064ABB8AF8388A2E7ADA6703AB56E09A9FED5B61A8E3882110F0305EC3328D1A48ABA0910462209C9F5F045D3EF13E1AC30E64E6DE9851C19C8495B889236E31C5434731527B03682C3CB9C9B5C5D749CD57540E8D81174EBBE5108A2B25B85BD8117DC68440F2DE0598BC29B11DC6451374A59407BAAADB25CB7A633BCE69178178FD6D19D2CB1252C765FB98AACD8E41A7BE42BC8D5C2C9CAED4A5FCC96B104A8B95CDC0AB9F1C5E78C33E6B1A53318B5956D35C7A198264BDF8366F37ED02CC0B7F149A710AF1453D95BDA18DD3286E359126744155EF7284488D1E15E2EEB89B7AB737FEF55A7AA8C7617BAF7AAE21007A8B56D804CD0C55FF9438677F3646767D26B88057F0ECAB3A4888DD235B261D8BCF06D58710820BC15C1F377BF5A89E0662FD8CCEA34EB517324FC5D8163608E8594AB422A4A771C7B19E2F6F3AAA4AD3EFC1EAB1FEE8D2FAE1C2AE71245A5FD6DECA2834F3EC25930DDEE61AE312430101AA066CF4D1FD7B5EB54F8802216B622F03C8D9BD2BA4C10ADC0C62873096BAD7FC836C69D3C473024D47A1F04632CA3AE792BBB47D777C538A5599284AA3EE0FA1CDD95E1C170908BBDFB1C5FCD0BC0A2AA1DCE1F679361857F1C138E026DFA39C6A4128F82CBACA1FD42EC9982EEC90775E8C4E2CA608F9C23303AB3BB28D18A3D8363D454AE48A570F5DCAF85ADC979890DEDAF6EA4D68521BF0A90B47D1FDF0720DB23102407281BA9947DFD5354481DDD22093CB19AF64DD8044F38EFBC367A1484141AAD09D095D1DA099B13EE1F2ABE1F9ACE15D4B4F76DE39C77C5377E6A478AE076B0347931DC8697D8C7E1731BB476901F22C65F8A9519F9BB3BD46EAB29A0D8B486F7D7A69A1363B9F7CBD3BE062E50FA2585D05D126676F9BD2905625188F096C6C8B3B589A2A2913D939EC19969667C9BBC7262CEAB7F7301938CC48D88B3D26BDE4C049D68CD4BC063DA0E906059C15930EC921E1692B0782DC7A28D9ED5E1EA16E24DE937A15C6FF12A29D77EB358EB45DACD183A5EB76D5E12E44DD8B82B5C17F5E6BA51B25C17FBF2CD7DF0052FA46205CA749799031D903D0003CAA78345E5722B7529CE463E48C697DA8B7A213DEE3ECCFAB64C619B18D36C6898D63304D2C4D27656144A39644D9B5D9E733FC9E69D4AFEDC99AA34677F16534C7CF9315A9416228B843F15C434BF8645738E31ED1834D7E2FF275FBC649B7B76AD60147737BFD861CD43D1ADDF0EFE464CA368D0A06EABF39DA4A464A5AD7B27D73BC16511CE7484671EA1FF0DEFB5DFE7DB5810C79EB54EEDEC443910BF4FB6E1F62E20EF5A62EC9982EEC90775E8C4E2CA608F9C233F90DB6A5A3DE21D0AEFDAB8611910E87E72DCB1636B0D1CFC763C30C83597AA0B84DCDD4E64BB977E1901586EAD6FBE49E61EC1F72DDDE7BBCEA0F791BF0698D99C6C77DF315827F840A5E4ECE76BBC78FCD63EA9D6711A3A4DDAB00541B89B95C1CC596C799179FA6637FCBF0B032A3EBDE66CBB84334E18AE9B1ADBCE819E050F8D15F244372DD72310EC040B0CE5759C44CA33B60C226BEF767F19A489E957130400E6E133E80808B95C1CAF3D617DC254063F1E9E7FC383B51912B43DD777DA55B331DDAF6A1CDEA726C06F94CA7E1692B0782DC7A28D9ED5E1EA16E24DE937A15C6FF12A29D77EB358EB45DACD183A5EB76D5E12E44DD8B82B5C17F5E6B1B5B5AC2C2CC484F30508414C0A59BD249799031D903D0003CAA78345E5722B7529CE463E48C697DA8B7A213DEE3ECCFAB64C619B18D36C6898D63304D2C4D27E7DE5F12384C93A88305FA7AA843182BEDC99AA34677F16534C7CF9315A9416228B843F15C434BF8645738E31ED1834D3334666197E9CA6F2BB29C146369B2B95F8CE9279CBA1B00FC7C60910D3F705D8BC68DE5E0742D7237DF5B28E973AE83DB459BBE466508A12340C07EECB9F2703C79FB7A6BCFD9DD22BC3D7B8A1D7C8D213BA093F6F7FF51B1139897CB64B4675D01548CF14B99C739D285C220455EC2FCEB8FE3EC1EE88C8DB03F85120682A4A65D181E9CA1ED886DB3B7D0BE3DC37E494D1834910FB76AED0734E6806F9D2A52E227AB19C4A4D5F3556E29FEF75934FAFA969E462BE30CFEBFEAB5AF716C63FC302638CA658A95F76C85E77112E469F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD1728D5488F4B435D8A01965EFF3745AA9BDCC7CD78057B78338A619A529DA65A3B604D14A196F2BEF3706704BDAA2C931974B46AE8D83AFD65970027A855F5209E7EACD968BBD0D82FACE0880CF3893E59DC0FAA45A7A26D3AD9A5276345B213C0D7288B37E73041ABCF4A78C5CC98E86576861ECC4415FA321D1AE62F6F28B8ED61E98A0E0A28C735B0DFF3423ACA06B84ADFE4E4548C6E2F4D0BD07D6FE3EACC00F98D2DEB364CEECF2568DBCDBA3D31D0270CE4E36B928C8D519187D99C8B7C97E6E8E4B8260EAB8C1B0CD97C10F0BD9510A29CC114A5E8154B7D38F33293274325464C9DDFD30337852DB11DB2E3227C280C584A9B3015E41B5A9CD1DB0ED938C63479A6C98CF158F2FACD0DEE33C61A55E7FAB69F6B3AA5854CA44DA16950F7544B330DE2B2CC7EEFED304F21F65AD569EC01F813C3776367D8F29E6DB0ED61DBD5787371B3677A6E9143BFDBA88472ECED20797CD0A4C54007EBDB9680CE010472D2B678DBEEDBE75E45F2B42CEF5D68CD4BC063DA0E906059C15930EC92184BF45FE44A4089C7DCFAE713BF14026EC46F413A19023B7FCDBE298EF63778F83A5EB76D5E12E44DD8B82B5C17F5E6BD236BC8EF9E6B33AB4B08BB9CEFE1EC349799031D903D0003CAA78345E5722B740A7842DBA0F6ABA932E24A07EDC1327AB64C619B18D36C6898D63304D2C4D27E7DE5F12384C93A88305FA7AA843182B5D98FE06CD87CB4065A8CE8FCB1CCE890DA54F70DC14B3E0C62E269DAEEE23618E5483ABFA715D58B466061B4898ED051A0B2B460E667D292C555FADC4C34C9CEAD71BD1C420575641CAD746E7058614BC866DCA8EB517DEC99C1CFA32256CB11B1F60E1F3595328C4A0968BE6520ED467A4B0453490344A9AAA9725E8CC0F9D686D4DF13FD0E702D43364996BCAD3E7FC8A90FD5EB3BB2B7FE2C59139ACB49289257E55203829C072A208EA1C1BCCF31873C5F3D45414CE64C23E1F1200E0716CF93E2356C46A2EC523A8DC9326C864157ADFE8C4AD14A25BEE6B9B0DAB2D41D553B4C23F4930C84762E8AE89CADBC40337666023E1374685791D468C235A3FDB7C78600513BEBBB1C9AA6AB78D75411016CF70433B9AACDB1F0B6E994C7D6FC0A330300B54D04A42085715DED920EC26B08BC47F5066DAEABF12CC0C3B7DDB29CBE7E12ACC732AB20B8802D69544FE7F5E8D4F2800301346EB3EB7FE66F66CF4623D7138A27F54E39F5FECD520F0894E151AD2DB8ADF86C3D6203FCF7DB98A92833F9DCF7CF521AD5CE1F6BF7443DC6D8C62387AA03461DD678E146A046ABE";//encrypt(content, KEY); System.out.println("加密后：" + encrypt); // String decrypt = decrypt(encrypt, KEY); String decrypt = decryptLinux(encrypt, KEY); From a48ebf09cd40fd30a467701fa657674ced6bd3e0 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sun, 30 Jan 2022 12:48:45 +0800 Subject: [PATCH 20/38] debugger --- .../system/royalcanin/good/service/OrderService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index b70a66df..af440a93 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.HashMap; import java.util.Map; @Service @@ -216,10 +217,10 @@ public class OrderService { String orderCoupon = addOrSaveEntity.getOrderCoupon(); jsonObject.put("orderCoupon",orderCoupon); jsonObject.put("orderDetailList",detailList); - jsonObject.put("channelId","15"); - jsonObject.put("secret","H5@2021"); long startTime = System.currentTimeMillis(); - String result = SmartHttpUtil.httpPostRaw(url+"addOrSave",jsonObject.toString(),null,"utf-8"); + Map headers = new HashMap<>(); + headers.put("Content-Type","application/json"); + String result = SmartHttpUtil.httpPostRaw(url+"addOrSave?channelId=15&secret=H5@2021",jsonObject.toString(),headers,"utf-8"); long acceptTime = System.currentTimeMillis() ; long elapsedTime = acceptTime - startTime; //记录服务响应时间 From 3deeab7bc220f6b74afb1f91279ada0ebfc2dc34 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sun, 30 Jan 2022 13:26:41 +0800 Subject: [PATCH 21/38] debugger --- .../royalcanin/good/OrderController.java | 2 +- .../module/system/wxpay/WxpayService.java | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) 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 683f9e1d..e781648e 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 @@ -132,7 +132,7 @@ public class OrderController { returnMap.put("orderNumber", ordersEntity.getOrderNo()); returnMap.put("orderAmount", ordersEntity.getOrderAmount()); // return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity)); - return ResponseDTO.succData(returnMap, wxpayService.testGenerateQRCode(wxPayEntity)); + return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity)); } }catch (Exception e){ System.out.println(e.getMessage()); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index 50fad8d9..90e6b352 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -48,29 +48,6 @@ public class WxpayService { String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; // String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; - private String urlNative = "https://api.mch.weixin.qq.com/v3/pay/transactions/native"; - - public String testGenerateQRCode(WxPayEntity wxPayEntity)throws Exception{ - String Authorization = "WECHATPAY2-SHA256-RSA2048"; - long timestamp = System.currentTimeMillis(); - SortedMap data = new TreeMap<>(); - SortedMap amount = new TreeMap<>(); - amount.put("total",Integer.parseInt(getMoney(wxPayEntity.getTotal_fee()))); - data.put("out_trade_no",wxPayEntity.getOut_trade_no()); - data.put("notify_url",config.notify_url); - data.put("description","皇家宠物食品官方商城"); - data.put("appid",config.getAppID()); - data.put("mchid",config.getMchID()); - net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(data); - jsonObject.put("amount",amount); - SortedMaphearder = new TreeMap<>(); - hearder.put("Accept","application/json"); - hearder.put("Authorization",Authorization +" mchid="+config.getMchID() +",nonce_str=" + WXPayUtil.generateNonceStr() + ",timestamp=" + timestamp + ",signature=" + WXPayUtil.generateSignature(data, config.getKey()) + ",serial_no=" + config.getKey()); - String sb = SmartHttpUtil.httpPostRaw(urlNative,jsonObject.toString(),hearder,"utf-8"); - return sb; - } - - public String generateQRCode(WxPayEntity wxPayEntity) throws Exception { WXPay wxpay = new WXPay(config); From 2fdfb0e9c143b7a0f6e05b04a376d758f8e6d05b Mon Sep 17 00:00:00 2001 From: Vion Date: Sun, 30 Jan 2022 15:07:06 +0800 Subject: [PATCH 22/38] Frontend layout fixed --- rc-busness/assets/css/producted.less | 10 +++ rc-busness/config/async/env.js | 2 +- rc-busness/config/async/fetch.js | 2 +- rc-busness/config/env-data.js | 4 +- rc-busness/pages/productdetails/producted.vue | 76 +++++-------------- 5 files changed, 31 insertions(+), 63 deletions(-) diff --git a/rc-busness/assets/css/producted.less b/rc-busness/assets/css/producted.less index 87e388dd..07a91ebd 100644 --- a/rc-busness/assets/css/producted.less +++ b/rc-busness/assets/css/producted.less @@ -122,6 +122,16 @@ max-width:100%; } } +.tns-item { + video { + max-width:31.25rem; + min-width:28.25rem; + max-height:31.25rem; + min-height:28.25rem; + width:36vw; + height:36vw; + } +} // 手机端 @media screen and (max-width:768px) { .uservideo{ diff --git a/rc-busness/config/async/env.js b/rc-busness/config/async/env.js index 8479749d..8ff9739b 100644 --- a/rc-busness/config/async/env.js +++ b/rc-busness/config/async/env.js @@ -9,7 +9,7 @@ let baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/' if (process.env.NODE_ENV === 'development') { baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'; } else if (process.env.NODE_ENV === 'production') { - baseUrl = '/royalcanin/royalcanin/royalcanin/'; + baseUrl = 'https://shop.royalcanin.com.cn/royalcanin/royalcanin/royalcanin/'; } export { baseUrl, diff --git a/rc-busness/config/async/fetch.js b/rc-busness/config/async/fetch.js index 3a3bf8ef..71538891 100644 --- a/rc-busness/config/async/fetch.js +++ b/rc-busness/config/async/fetch.js @@ -36,7 +36,7 @@ export default async(url = '', data = {}, type = 'GET', method = 'fetch') => { 'Content-Type': 'application/json', 'x-access-token': token }, - mode: 'cors', + // mode: 'cors', // channelId:'H5@2021', cache: 'force-cache' } diff --git a/rc-busness/config/env-data.js b/rc-busness/config/env-data.js index e2a89aa1..8aa06cf6 100644 --- a/rc-busness/config/env-data.js +++ b/rc-busness/config/env-data.js @@ -254,7 +254,7 @@ let prdData={ productCode:'17220400', productList: [ { - productCode: "17220400,17221000,1722040002,17220400F03", + productCode: "17220400,17220100,17221000,1722040002", }, ], }, @@ -266,7 +266,7 @@ let prdData={ productCode:'20010200', productList: [ { - productCode: "20010200,20011000,20010040", + productCode: "20010200,2001020002,20010200F03,2001004003", }, ], }, diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index fd956bf6..a71708a2 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -15,12 +15,7 @@ rc-border-colour--brand4 " > -
    - -
    -
    +
    - - + +
    @@ -57,7 +51,8 @@ :key="index" >
    - + +
    @@ -461,9 +461,9 @@ export default { "_trackCustomEvent", "product_visit", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, } ]) } @@ -479,11 +479,11 @@ export default { "_trackCustomEvent", "get_coupon", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, - "product_quantity_" : this.sales_num, - "product_amount_" : this.sales_num*this.curItem.ecPrice, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, + "product_quantity" : this.sales_num, + "product_amount" : this.sales_num*this.curItem.ecPrice, } ]) if (this.usermessage.data !== "" || this.usermessage.data !== undefined) { @@ -656,11 +656,11 @@ export default { "_trackCustomEvent", "add_to_cart", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, - "product_quantity_" : this.sales_num, - "product_amount_" : this.sales_num*this.curItem.ecPrice, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, + "product_quantity" : this.sales_num, + "product_amount" : this.sales_num*this.curItem.ecPrice, } ]) } @@ -685,11 +685,11 @@ export default { "_trackCustomEvent", "add_to_cart", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, - "product_quantity_" : this.sales_num, - "product_amount_" : this.sales_num*this.curItem.ecPrice, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, + "product_quantity" : this.sales_num, + "product_amount" : this.sales_num*this.curItem.ecPrice, } ]) diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index d11951f8..4dde4374 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -39,8 +39,8 @@
    • -
    -
    +
    +

    年龄:

    -
    -
    +
    +

    功能:

    -
    -
    +
    +

    品种:

    +
    +
    +

    功能:

    +
      +
    1. + {{ item.tagName }} +
      2. +
    +
    @@ -313,12 +327,14 @@ import Myheader from "~/components/header.vue"; import MyFooter from '~/components/rc-footer.vue' import FixRight from "~/components/fixed-right.vue"; import tabs from "~/components/tabs.vue"; +import envData from "~/config/env-data.js"; import { userstype, biaome, biaomessage, searchchanpin, - userquery + userquery, + userque } from "../../ajax/getData"; export default { data() { @@ -328,6 +344,8 @@ export default { path:'/productdetails/productlist/', } ], + envData, + rxFilters:[], value: "", isLoading: false, userstype: [], @@ -507,13 +525,10 @@ export default { _self.chooseDefaultOptions(); //_self.usetmessage(); }); - /* - if (stype !== "" && stype !== undefined) { - this.onmessage(stype);//Wont happen - } else { - this.usetmessage(); - } - */ + //Handling RxGoods filter + let curEnv = process.env.NODE_ENV; + this.rxFilters = envData[curEnv].rxGoodsFilter; + //Handling RxGoods filter end }, methods: { async usersearch(stype, usertype) { @@ -598,7 +613,7 @@ export default { async usetmessage() { this.isLoading = true; - let data = await biaome(this.activeIndex1, "", 1, 10); + let data = await biaome(this.activeIndex1, "", 1, 20); if (data) { this.rccontair = data; this.isLoading = false; @@ -606,12 +621,21 @@ export default { }, async onmessage(stype) { this.isLoading = true; - let data = await biaomessage(stype, "", 1, 10); + let data = await biaomessage(stype, "", 1, 20); if (data) { this.rccontair = data; this.isLoading = false; } }, + async getRxGoodsByFunc(functionName) { + this.isLoading = true; + let petType = this.activeIndex1; + let data = await userque(functionName, petType, 1, 20); + if (data) { + this.rccontair = data; + this.isLoading = false; + } + }, chooseDefaultOptions(){ let tagStatus = this.routeParams.tagStatus; let categoryName = this.routeParams.categoryName; @@ -713,8 +737,24 @@ export default { else { this.prefecture[this.rxGoodsIndexPointer].checked=false; this.inRxGoods=false; + for(let tmp of this.rxFilters) { + tmp.checked = false; + } } }, + selectFilter(item) { + for(let tmp of this.rxFilters) { + if(item.tagValue == tmp.tagValue) { + item.checked = !item.checked; + } else { + tmp.checked = false; + } + } + if(item.checked) + this.getRxGoodsByFunc(item.tagValue); + else + this.getRxGoodsByFunc(); + }, resetAllOptions(){ let _self = this; let categoriesSelectionEles=this.prefecture; @@ -725,6 +765,7 @@ export default { allSelectionEles.forEach(function(tmp,index){ tmp.checked=false; }); + this.checkRxGoods(false); this.userserachlist = [ { categoryName: [], //专区 diff --git a/rc-busness/pages/resentation/resentation.vue b/rc-busness/pages/resentation/resentation.vue index 9b6aff63..2d3182b8 100644 --- a/rc-busness/pages/resentation/resentation.vue +++ b/rc-busness/pages/resentation/resentation.vue @@ -22,7 +22,7 @@ :key="index" class="rc-margin-top--md" > -

    {{ index==1?'明星犬粮':'明星猫粮' }}

    +

    {{ index==1?'明星猫粮':'明星犬粮' }}

    点击查看立即购买
    diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue index dd302b96..e1f39cab 100644 --- a/rc-busness/pages/userlogin/login.vue +++ b/rc-busness/pages/userlogin/login.vue @@ -144,47 +144,49 @@