From 92ca45a5c18f1dae7e69ed72cbe824cec66d51d0 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Tue, 12 May 2026 16:47:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=88=86=E4=BD=A3=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E4=B8=9A=E5=8A=A1=202.=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/MybatisPlusConfig.java | 14 +++- .../glt/service/GltTicketIssueService.java | 38 ++++------ src/main/resources/application-dev.yml | 7 +- src/main/resources/application-glt.yml | 2 +- src/main/resources/application-local.yml | 69 ------------------- src/main/resources/application.yml | 4 +- 6 files changed, 32 insertions(+), 102 deletions(-) delete mode 100644 src/main/resources/application-local.yml diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index b3655bc..9018256 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/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); } }; diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 0b5091c..049898a 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/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 orders = shopOrderService.list( + List orders = shopOrderMapper.selectList( new LambdaQueryWrapper() .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() + .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() - .eq(ShopOrder::getOrderId, shopOrder.getOrderId()) - .eq(ShopOrder::getTenantId, tenantId) - .eq(ShopOrder::getOrderStatus, 0) - .set(ShopOrder::getOrderStatus, 1) - .set(ShopOrder::getHasTakeGift, true) - .set(ShopOrder::getUpdateTime, LocalDateTime.now()) - ); + shopOrder.setOrderStatus(1); + shopOrder.setHasTakeGift(true); + shopOrder.setUpdateTime(LocalDateTime.now()); + shopOrderMapper.updateById(shopOrder); } } @@ -225,15 +222,10 @@ public class GltTicketIssueService { if (shouldCompleteOrder) { LocalDateTime now = LocalDateTime.now(); // 任务执行完后将订单置为“已完成”，避免后续扫描重复处理（幂等虽可挡住，但会产生大量无意义查询）。 - shopOrderService.update( - new LambdaUpdateWrapper() - .eq(ShopOrder::getOrderId, order.getOrderId()) - .eq(ShopOrder::getTenantId, tenantId) - .eq(ShopOrder::getOrderStatus, 0) - .set(ShopOrder::getOrderStatus, 1) - .set(ShopOrder::getHasTakeGift, true) - .set(ShopOrder::getUpdateTime, now) - ); + order.setOrderStatus(1); + order.setHasTakeGift(true); + order.setUpdateTime(LocalDateTime.now()); + shopOrderMapper.updateById(order); } 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() .eq(ShopOrder::getOrderId, order.getOrderId()) .eq(ShopOrder::getTenantId, tenantId) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 00df5b5..c22fd88 100644 --- a/src/main/resources/application-dev.yml +++ b/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 - port: 6379 - password: redis_t74P8C + host: localhost + port: 6379 # 日志配置 logging: diff --git a/src/main/resources/application-glt.yml b/src/main/resources/application-glt.yml index 4eb942f..844d97e 100644 --- a/src/main/resources/application-glt.yml +++ b/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云存储 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml deleted file mode 100644 index c22fd88..0000000 --- a/src/main/resources/application-local.yml +++ /dev/null @@ -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":"配送费"}]' diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 910449c..703b485 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,8 +4,8 @@ server: # 多环境配置 spring: profiles: - active: local -# active: dev + active: dev +# active: glt # active: prod application: