feat(config): 更新生产环境配置信息

- 修改 RabbitMQ 主机地址为 47.109.18.141- 更新 MySQL 数据库连接地址和密码- 禁用 MyBatis SQL 日志输出
- 更新微信小程序配置信息- 启用定时任务同步门禁记录功能- 修正订单状态过滤条件，排除状态 0

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/job/OrTeachingJobService.java

@@ -242,7 +242,7 @@ public class OrTeachingJobService {
      * @return
      **/
     //todo
-//    @Scheduled(fixedDelay = 600000)
+    @Scheduled(fixedDelay = 600000)
 //    @Scheduled(cron = "0 0 23 * * ?")
     public void synchronousDoorOpeningAndClosingRecords(){
         try {

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/StatisticsMapper.xml

@@ -11,7 +11,7 @@
                  JOIN nm_order o ON opi.order_code = o.order_code
                  JOIN nm_site s ON o.org_code = s.org_code
         WHERE opi.type NOT IN (0,3, 4, 6)
-            AND opi.order_status NOT IN (3, 4, 5, 6)
+            AND opi.order_status NOT IN (0, 3, 4, 5, 6)
             AND (
                   (#{type} = 1 AND DATE(opi.create_time) = CURDATE()) OR
             (#{type} = 2 AND YEARWEEK(opi.create_time, 1) = YEARWEEK(CURDATE(), 1)) OR
@@ -117,7 +117,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = CURDATE()
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS salesAmount,
 
@@ -126,7 +126,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = CURDATE()
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order_pro_info.type = 6
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS insuranceSalesAmount,
@@ -136,7 +136,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = CURDATE()
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS validOrderCount,
 
@@ -152,7 +152,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = CURDATE()
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS platformConsumptionUsers,
 
@@ -173,7 +173,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS salesAmount,
 
@@ -182,7 +182,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order_pro_info.type = 6
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS insuranceSalesAmount,
@@ -192,7 +192,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS validOrderCount,
 
@@ -208,7 +208,7 @@
                                   FROM nm_order_pro_info
                                            LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
                                   WHERE DATE(nm_order_pro_info.create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-                                  AND nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                                  AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                                   AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                          ), 0) AS platformConsumptionUsers,
 
@@ -239,7 +239,7 @@
             FROM nm_order_pro_info
             LEFT JOIN nm_order ON nm_order_pro_info.order_code = nm_order.order_code
             WHERE
-                nm_order_pro_info.order_status NOT IN (3, 4, 5, 6)
+                nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
                 AND nm_order.org_code LIKE CONCAT(#{orgCode}, '%')
                 AND YEAR(nm_order_pro_info.create_time) = YEAR(CURDATE())
                 AND MONTH(nm_order_pro_info.create_time) = MONTH(CURDATE())

national-motion-module-system/national-motion-system-start/src/main/resources/application-prod.yml

@@ -47,7 +47,7 @@ spring:
       smtp.ssl.enable: true
       mail.debug: true  # 启用调试模式(查看详细日志)
   rabbitmq:
-    host: localhost
+    host: 47.109.18.141
     port: 5672
     username: admin
     password: admin123
@@ -162,9 +162,12 @@ spring:
           #          url: jdbc:mysql://192.168.110.241:3306/national_motion?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           #          username: root
           #          password: c7ix0bJv2GvyhbkRw6
-          url: jdbc:mysql://rm-bp15g68z8j527q9n9xo.mysql.rds.aliyuncs.com:3306/national_motion?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          url: jdbc:mysql://rm-bp15g68z8j527q9n9xo.mysql.rds.aliyuncs.com:3306/national_motion?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: BXyzm3RKR2nA9vn5ZkeP!
+          url: jdbc:mysql://47.109.67.112:3306/national_motion?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: BXyzm3RKR2nA9vn5ZkeP!
+          password: TtbTeGJBnDvH4hMx
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
@@ -195,7 +198,7 @@ mybatis-plus:
       logic-not-delete-value: 0 # 未删除值
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -343,15 +346,15 @@ justauth:
     prefix: 'demo::'
     timeout: 1h
 # 微信相关
-wx:
-  # 微信小程序
-  miniapp:
-    configs:
-      - appid: wx6260718c6fd46efb
-        secret: 353c9d6d84347de7af9a7788a00a725e
-        token: #微信小程序消息服务器配置的token
-        aesKey: #微信小程序消息服务器配置的EncodingAESKey
-        msgDataFormat: JSON
+#wx:
+#  # 微信小程序
+#  miniapp:
+#    configs:
+#      - appid: wx6260718c6fd46efb
+#        secret: 353c9d6d84347de7af9a7788a00a725e
+#        token: #微信小程序消息服务器配置的token
+#        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+#        msgDataFormat: JSON
 #wx:
 #  # 微信小程序
 #  miniapp:
@@ -361,6 +364,17 @@ wx:
 #        token: #微信小程序消息服务器配置的token
 #        aesKey: #微信小程序消息服务器配置的EncodingAESKey
 #        msgDataFormat: JSON
+
+# 微信相关
+wx:
+  # 微信小程序
+  miniapp:
+    configs:
+      - appid: wxe70e6c132e5b4c28
+        secret: 1b33b5f64d4745d3f6c6a3097a914415
+        token: #微信小程序消息服务器配置的token
+        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+        msgDataFormat: JSON
   # 微信支付配置
   pay:
     #服务商微信支付商户号
@@ -392,10 +406,12 @@ baidu:
 # 微信小程序配置
 wechat:
   miniprogram:
-#    appid: wxc032a09413289004
-    appid: wx6260718c6fd46efb
-#    appsecret: 453c5047ae43288f1d015d48df32a5c0
-    appsecret: 353c9d6d84347de7af9a7788a00a725e
+#    appid: wxc032a09413289004  #嘉年华
+#    appid: wx6260718c6fd46efb  #全龄用户(目前商家端再用)
+    appid: wxe70e6c132e5b4c28  #全龄商家(目前用户端再用)
+#    appsecret: 453c5047ae43288f1d015d48df32a5c0 #嘉年华
+#    appsecret: 353c9d6d84347de7af9a7788a00a725e #全龄用户(目前商家端再用)
+    appsecret: 1b33b5f64d4745d3f6c6a3097a914415 #全龄商家(目前用户端再用)
     token:
       cache:
         enabled: true