1.优化分佣算法业务

2.修改配置

src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java

@@ -91,18 +91,26 @@ public class MybatisPlusConfig {
                         "sys_dictionary",
                         "sys_dictionary_data",
                         "apps_test_data",
-                        "cms_lang"
+                        "cms_lang",
 //                        "hjm_car",
 //                        "hjm_fence"
 //                        "cms_website"
 //                        "sys_user"
 //                        "cms_domain"
 //                        "shop_order_goods",
-//                        "shop_goods"
+                        "shop_goods",
 //                        "shop_users",
-//                        "shop_order"  // 移除shop_order，改为通过注解控制
+                        "shop_order" , // 移除shop_order，改为通过注解控制
 //                        "shop_order_info",
 //                        "booking_user_invoice"
+                        "shop_order_goods",
+                        "glt_ticket_template",
+                        "glt_user_ticket",
+                        "glt_user_ticket_release",
+                        "glt_user_ticket_log",
+                        "shop_dealer_user",
+                        "shop_dealer_order",
+                        "shop_dealer_referee"
                 ).contains(tableName);
             }
         };

src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java

@@ -1,7 +1,6 @@
 package com.gxwebsoft.glt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.glt.entity.GltTicketTemplate;
 import com.gxwebsoft.glt.entity.GltUserTicket;
 import com.gxwebsoft.glt.entity.GltUserTicketLog;
@@ -9,8 +8,8 @@ import com.gxwebsoft.glt.entity.GltUserTicketRelease;
 import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task;
 import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.entity.ShopOrderGoods;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
 import com.gxwebsoft.shop.service.ShopOrderGoodsService;
-import com.gxwebsoft.shop.service.ShopOrderService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -47,7 +46,7 @@ public class GltTicketIssueService {
         NO_TEMPLATE
     }
 
-    private final ShopOrderService shopOrderService;
+    private final ShopOrderMapper shopOrderMapper;
     private final ShopOrderGoodsService shopOrderGoodsService;
 
     private final GltTicketTemplateService gltTicketTemplateService;
@@ -86,7 +85,7 @@ public class GltTicketIssueService {
         LocalDateTime todayStart = LocalDate.now().atStartOfDay();
         LocalDateTime tomorrowStart = todayStart.plusDays(1);
 
-        List<ShopOrder> orders = shopOrderService.list(
+        List<ShopOrder> orders = shopOrderMapper.selectList(
             new LambdaQueryWrapper<ShopOrder>()
                 .eq(ShopOrder::getTenantId, tenantId)
                 .in(ShopOrder::getFormId, uniqueGoodsIds)
@@ -155,7 +154,9 @@ public class GltTicketIssueService {
     @Transactional
     public void suerTicketRelease(String orderNo, Integer tenantId){
         //1.订单为空跳过执行
-        ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId);
+        ShopOrder shopOrder = shopOrderMapper.selectOne(new LambdaQueryWrapper<ShopOrder>()
+                .eq(ShopOrder::getOrderNo, orderNo)
+                .eq(ShopOrder::getTenantId, tenantId));
         if(shopOrder == null){
             return;
         }
@@ -187,14 +188,10 @@ public class GltTicketIssueService {
 
         //6.更新商品订单为已完成、已收到赠品状态
         if (release.get()) {
-            shopOrderService.update(new LambdaUpdateWrapper<ShopOrder>()
+            shopOrder.setOrderStatus(1);
-                    .eq(ShopOrder::getOrderId, shopOrder.getOrderId())
+            shopOrder.setHasTakeGift(true);
-                    .eq(ShopOrder::getTenantId, tenantId)
+            shopOrder.setUpdateTime(LocalDateTime.now());
-                    .eq(ShopOrder::getOrderStatus, 0)
+            shopOrderMapper.updateById(shopOrder);
-                    .set(ShopOrder::getOrderStatus, 1)
-                    .set(ShopOrder::getHasTakeGift, true)
-                    .set(ShopOrder::getUpdateTime, LocalDateTime.now())
-            );
         }
     }
 
@@ -225,15 +222,10 @@ public class GltTicketIssueService {
         if (shouldCompleteOrder) {
             LocalDateTime now = LocalDateTime.now();
             // 任务执行完后将订单置为“已完成”，避免后续扫描重复处理（幂等虽可挡住，但会产生大量无意义查询）。
-            shopOrderService.update(
+            order.setOrderStatus(1);
-                new LambdaUpdateWrapper<ShopOrder>()
+            order.setHasTakeGift(true);
-                    .eq(ShopOrder::getOrderId, order.getOrderId())
+            order.setUpdateTime(LocalDateTime.now());
-                    .eq(ShopOrder::getTenantId, tenantId)
+            shopOrderMapper.updateById(order);
-                    .eq(ShopOrder::getOrderStatus, 0)
-                    .set(ShopOrder::getOrderStatus, 1)
-                    .set(ShopOrder::getHasTakeGift, true)
-                    .set(ShopOrder::getUpdateTime, now)
-            );
         }
 
         return issuedCount;
@@ -254,7 +246,7 @@ public class GltTicketIssueService {
         // - 这里先对商城订单行加行锁，保证同一订单在同一时刻只会被一个事务处理。
         //   (注意：需数据库支持 SELECT ... FOR UPDATE，且 shop_order.order_id 为主键/有索引)
         if (order.getOrderId() != null) {
-            shopOrderService.getOne(
+            shopOrderMapper.selectOne(
                 new LambdaQueryWrapper<ShopOrder>()
                     .eq(ShopOrder::getOrderId, order.getOrderId())
                     .eq(ShopOrder::getTenantId, tenantId)

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ server:
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: modules
     password: tYmmMGh5wpwXR3ae
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -15,9 +15,8 @@ spring:
 
   redis:
     database: 0
-      host: 127.0.0.1
+    host: localhost
-      port: 6379
+    port: 6379
-      password: redis_t74P8C
 
 # 日志配置
 logging:

src/main/resources/application-glt.yml

@@ -50,7 +50,7 @@ config:
   # 生产环境接口
   server-url: https://glt-server.websoft.top/api
   # 业务模块接口
-  api-url: https://glt-api.websoft.top/api
+  api-url: https://glt-dev-api.websoft.top/api
   upload-path: /www/wwwroot/file.ws
 
   # 阿里云OSS云存储

src/main/resources/application-local.yml

@@ -1,69 +0,0 @@
-# 开发环境配置
-
-# 服务器配置
-server:
-  port: 9200
-
-# 数据源配置
-spring:
-  datasource:
-    url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-    username: modules
-    password: tYmmMGh5wpwXR3ae
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-
-  redis:
-    database: 0
-    host: localhost
-    port: 6379
-
-# 日志配置
-logging:
-  level:
-    com.gxwebsoft: DEBUG
-    com.baomidou.mybatisplus: DEBUG
-
-socketio:
-  host: localhost #IP地址
-
-# MQTT配置
-mqtt:
-  enabled: false  # 添加开关来禁用MQTT服务
-  host: tcp://132.232.214.96:1883
-  username: swdev
-  password: Sw20250523
-  client-id-prefix: hjm_car_
-  topic: /SW_GPS/#
-  qos: 2
-  connection-timeout: 10
-  keep-alive-interval: 20
-  auto-reconnect: true
-
-# 框架配置
-config:
-  # 开发环境接口
-  server-url: https://glt-server.websoft.top/api
-  upload-path: /Users/gxwebsoft/Documents/uploads/   # window(D:\Temp)
-
-# 开发环境证书配置
-certificate:
-  load-mode: CLASSPATH  # 开发环境从classpath加载
-  wechat-pay:
-    dev:
-      private-key-file: "apiclient_key.pem"
-      apiclient-cert-file: "apiclient_cert.pem"
-      wechatpay-cert-file: "wechatpay_cert.pem"
-
-# 阿里云翻译配置
-aliyun:
-  translate:
-    access-key-id: LTAI5tEsyhW4GCKbds1qsopg
-    access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO
-    endpoint: mt.cn-hangzhou.aliyuncs.com
-
-# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致）
-wechatpay:
-  transfer:
-    scene-id: 1005
-    scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]'

src/main/resources/application.yml

@@ -4,8 +4,8 @@ server:
 # 多环境配置
 spring:
   profiles:
-    active: local
+    active: dev
-#    active: dev
+#    active: glt
 #    active: prod
 
   application: