From 9ec76929d6d473116530d25824894cf6f26bdeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com> Date: Sat, 2 Aug 2025 15:05:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(work):=20=E6=96=B0=E5=A2=9E=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=B9=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8A=B5=E6=89=A3=E9=87=91=E5=92=8C=E9=9B=86=E6=9D=90?= =?UTF-8?q?=E7=A4=BE=E8=AE=A2=E5=8D=95ID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ITpOrderService 接口中新增 updateInfoByBo 方法用于修改订单信息 - 在 TpOrder、TpOrderBo、TpOrderVo 类中添加 coupon(抵扣金)和 jcOrderId(集材社订单ID)字段 - 更新 TpOrderServiceImpl 中的订单修改逻辑,考虑抵扣金因素 --- ruoyi-admin/src/main/resources/application-dev.yml | 12 ++++++------ ruoyi-admin/src/main/resources/application.yml | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 61c4156..0661aab 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -51,9 +51,9 @@ spring: # username: sjzx0618 # password: 2b1%Hk3#1Uolol - url: jdbc:mysql://erp9.52o.site:13308/hmsj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: hmsj - password: s4xjHffmwG58RADk + url: jdbc:mysql://localhost:3306/new_xgt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: root + password: root # 从库数据源 slave: @@ -88,13 +88,13 @@ spring: spring.data: redis: # 地址 - host: sh-crs-2xoizlg8.sql.tencentcdb.com + host: localhost # 端口,默认为6379 - port: 22002 + port: 6379 # 数据库索引 database: 1 # redis 密码必须配置 - password: Songhaihua999 + password: Huitu123 # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 300867c..09fd788 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -130,6 +130,7 @@ security: - /work/panorama/listByOrderId - /wx/jssdk - /api/user/** + - /api/home/** # 多租户配置 tenant: