submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/AdminSaasApplication.java

@@ -4,9 +4,11 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,DruidDataSourceAutoConfigure.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@EnableScheduling
 public class AdminSaasApplication {
 
     public static void main(String[] args)

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderAttachmentController.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.controller.order;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOrderAttachmentService;
+import com.zhongzheng.modules.top.goods.vo.TopOrderAttachmentVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 订单附件Controller
+ * 
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Api(value = "订单附件控制器", tags = {"订单附件管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/order/attachment")
+public class TopOrderAttachmentController extends BaseController {
+
+    private final ITopOrderAttachmentService iTopOrderAttachmentService;
+
+    /**
+     * 查询订单附件列表
+     */
+    @ApiOperation("查询订单附件列表")
+    @PreAuthorize("@ss.hasPermi('system:attachment:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopOrderAttachmentVo> list(TopOrderAttachmentQueryBo bo) {
+        startPage();
+        List<TopOrderAttachmentVo> list = iTopOrderAttachmentService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单附件列表
+     */
+    @ApiOperation("导出订单附件列表")
+    @PreAuthorize("@ss.hasPermi('system:attachment:export')")
+    @Log(title = "订单附件", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopOrderAttachmentVo> export(TopOrderAttachmentQueryBo bo) {
+        List<TopOrderAttachmentVo> list = iTopOrderAttachmentService.queryList(bo);
+        ExcelUtil<TopOrderAttachmentVo> util = new ExcelUtil<TopOrderAttachmentVo>(TopOrderAttachmentVo.class);
+        return util.exportExcel(list, "订单附件");
+    }
+
+    /**
+     * 获取订单附件详细信息
+     */
+    @ApiOperation("获取订单附件详细信息")
+    @PreAuthorize("@ss.hasPermi('system:attachment:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<TopOrderAttachmentVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTopOrderAttachmentService.queryById(id));
+    }
+
+    /**
+     * 新增订单附件
+     */
+    @ApiOperation("新增订单附件")
+    @PreAuthorize("@ss.hasPermi('system:attachment:add')")
+    @Log(title = "订单附件", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopOrderAttachmentAddBo bo) {
+        return toAjax(iTopOrderAttachmentService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单附件
+     */
+    @ApiOperation("修改订单附件")
+    @PreAuthorize("@ss.hasPermi('system:attachment:edit')")
+    @Log(title = "订单附件", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopOrderAttachmentEditBo bo) {
+        return toAjax(iTopOrderAttachmentService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除订单附件
+     */
+    @ApiOperation("删除订单附件")
+    @PreAuthorize("@ss.hasPermi('system:attachment:remove')")
+    @Log(title = "订单附件" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iTopOrderAttachmentService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderController.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.controller.order;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOrderService;
+import com.zhongzheng.modules.top.goods.vo.TopOrderVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 订单Controller
+ * 
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Api(value = "订单控制器", tags = {"订单管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/order")
+public class TopOrderController extends BaseController {
+
+    private final ITopOrderService iTopOrderService;
+
+    /**
+     * 查询订单列表
+     */
+    @ApiOperation("查询订单列表")
+    @PreAuthorize("@ss.hasPermi('system:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopOrderVo> list(TopOrderQueryBo bo) {
+        startPage();
+        List<TopOrderVo> list = iTopOrderService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单列表
+     */
+    @ApiOperation("导出订单列表")
+    @PreAuthorize("@ss.hasPermi('system:order:export')")
+    @Log(title = "订单", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopOrderVo> export(TopOrderQueryBo bo) {
+        List<TopOrderVo> list = iTopOrderService.queryList(bo);
+        ExcelUtil<TopOrderVo> util = new ExcelUtil<TopOrderVo>(TopOrderVo.class);
+        return util.exportExcel(list, "订单");
+    }
+
+    /**
+     * 获取订单详细信息
+     */
+    @ApiOperation("获取订单详细信息")
+    @PreAuthorize("@ss.hasPermi('system:order:query')")
+    @GetMapping("/{orderId}")
+    public AjaxResult<TopOrderVo> getInfo(@PathVariable("orderId" ) Long orderId) {
+        return AjaxResult.success(iTopOrderService.queryById(orderId));
+    }
+
+    /**
+     * 新增订单
+     */
+    @ApiOperation("新增订单")
+    @PreAuthorize("@ss.hasPermi('system:order:add')")
+    @Log(title = "订单", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopOrderAddBo bo) {
+        return toAjax(iTopOrderService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单
+     */
+    @ApiOperation("修改订单")
+    @PreAuthorize("@ss.hasPermi('system:order:edit')")
+    @Log(title = "订单", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopOrderEditBo bo) {
+        return toAjax(iTopOrderService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除订单
+     */
+    @ApiOperation("删除订单")
+    @PreAuthorize("@ss.hasPermi('system:order:remove')")
+    @Log(title = "订单" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{orderIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] orderIds) {
+        return toAjax(iTopOrderService.deleteWithValidByIds(Arrays.asList(orderIds), true) ? 1 : 0);
+    }
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderGoodsController.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.controller.order;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQueryBo;
+import com.zhongzheng.modules.top.goods.service.ITopOrderGoodsService;
+import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 订单商品Controller
+ * 
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Api(value = "订单商品控制器", tags = {"订单商品管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/order/goods")
+public class TopOrderGoodsController extends BaseController {
+
+    private final ITopOrderGoodsService iTopOrderGoodsService;
+
+    /**
+     * 查询订单商品列表
+     */
+    @ApiOperation("查询订单商品列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopOrderGoodsVo> list(TopOrderGoodsQueryBo bo) {
+        startPage();
+        List<TopOrderGoodsVo> list = iTopOrderGoodsService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单商品列表
+     */
+    @ApiOperation("导出订单商品列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:export')")
+    @Log(title = "订单商品", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopOrderGoodsVo> export(TopOrderGoodsQueryBo bo) {
+        List<TopOrderGoodsVo> list = iTopOrderGoodsService.queryList(bo);
+        ExcelUtil<TopOrderGoodsVo> util = new ExcelUtil<TopOrderGoodsVo>(TopOrderGoodsVo.class);
+        return util.exportExcel(list, "订单商品");
+    }
+
+    /**
+     * 获取订单商品详细信息
+     */
+    @ApiOperation("获取订单商品详细信息")
+    @PreAuthorize("@ss.hasPermi('system:goods:query')")
+    @GetMapping("/{orderGoodsId}")
+    public AjaxResult<TopOrderGoodsVo> getInfo(@PathVariable("orderGoodsId" ) Long orderGoodsId) {
+        return AjaxResult.success(iTopOrderGoodsService.queryById(orderGoodsId));
+    }
+
+    /**
+     * 新增订单商品
+     */
+    @ApiOperation("新增订单商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:add')")
+    @Log(title = "订单商品", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopOrderGoodsAddBo bo) {
+        return toAjax(iTopOrderGoodsService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单商品
+     */
+    @ApiOperation("修改订单商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
+    @Log(title = "订单商品", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopOrderGoodsEditBo bo) {
+        return toAjax(iTopOrderGoodsService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除订单商品
+     */
+    @ApiOperation("删除订单商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:remove')")
+    @Log(title = "订单商品" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{orderGoodsIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] orderGoodsIds) {
+        return toAjax(iTopOrderGoodsService.deleteWithValidByIds(Arrays.asList(orderGoodsIds), true) ? 1 : 0);
+    }
+}

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_sass_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password:  zhongzheng2021
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: true
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password: zhongzheng2021
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: ruoyi
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 1000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: zhongzheng2021
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-admin-saas/src/main/resources/application-pre.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-    #    datasource:
-    #        type: com.alibaba.druid.pool.DruidDataSource
-    #        driverClassName: com.mysql.cj.jdbc.Driver
-    #        druid:
-    #            # 主库数据源
-    #            master:
-    #                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-    #                username: root
-    #                password: gdxy2021!@#zzjykj
-    #            # 从库数据源
-    #            slave:
-    #                # 从数据源开关/默认关闭
-    #                enabled: false
-    #                url:
-    #                username:
-    #                password:
-    #            # 初始连接数
-    #            initialSize: 5
-    #            # 最小连接池数量
-    #            minIdle: 10
-    #            # 最大连接池数量
-    #            maxActive: 20
-    #            # 配置获取连接等待超时的时间
-    #            maxWait: 60000
-    #            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    #            timeBetweenEvictionRunsMillis: 60000
-    #            # 配置一个连接在池中最小生存的时间，单位是毫秒
-    #            minEvictableIdleTimeMillis: 300000
-    #            # 配置一个连接在池中最大生存的时间，单位是毫秒
-    #            maxEvictableIdleTimeMillis: 900000
-    #            # 配置检测连接是否有效
-    #            validationQuery: SELECT 1 FROM DUAL
-    #            testWhileIdle: true
-    #            testOnBorrow: false
-    #            testOnReturn: false
-    #            webStatFilter:
-    #                enabled: true
-    #            statViewServlet:
-    #                enabled: true
-    #                # 设置白名单，不填则允许所有访问
-    #                allow:
-    #                url-pattern: /druid/*
-    #                # 控制台管理用户名和密码
-    #                login-username: ruoyi
-    #                login-password: 123456
-    #            filter:
-    #                stat:
-    #                    enabled: true
-    #                    # 慢SQL记录
-    #                    log-slow-sql: true
-    #                    slow-sql-millis: 4000
-    #                    merge-sql: true
-    #                wall:
-    #                    config:
-    #                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: gdxy2021!@#zzjykj
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-    #    datasource:
-    #        type: com.alibaba.druid.pool.DruidDataSource
-    #        driverClassName: com.mysql.cj.jdbc.Driver
-    #        druid:
-    #            # 主库数据源
-    #            master:
-    #                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-    #                username: root
-    #                password: gdxy2021!@#zzjykj
-    #            # 从库数据源
-    #            slave:
-    #                # 从数据源开关/默认关闭
-    #                enabled: false
-    #                url:
-    #                username:
-    #                password:
-    #            # 初始连接数
-    #            initialSize: 5
-    #            # 最小连接池数量
-    #            minIdle: 10
-    #            # 最大连接池数量
-    #            maxActive: 20
-    #            # 配置获取连接等待超时的时间
-    #            maxWait: 60000
-    #            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    #            timeBetweenEvictionRunsMillis: 60000
-    #            # 配置一个连接在池中最小生存的时间，单位是毫秒
-    #            minEvictableIdleTimeMillis: 300000
-    #            # 配置一个连接在池中最大生存的时间，单位是毫秒
-    #            maxEvictableIdleTimeMillis: 900000
-    #            # 配置检测连接是否有效
-    #            validationQuery: SELECT 1 FROM DUAL
-    #            testWhileIdle: true
-    #            testOnBorrow: false
-    #            testOnReturn: false
-    #            webStatFilter:
-    #                enabled: true
-    #            statViewServlet:
-    #                enabled: true
-    #                # 设置白名单，不填则允许所有访问
-    #                allow:
-    #                url-pattern: /druid/*
-    #                # 控制台管理用户名和密码
-    #                login-username: ruoyi
-    #                login-password: 123456
-    #            filter:
-    #                stat:
-    #                    enabled: true
-    #                    # 慢SQL记录
-    #                    log-slow-sql: true
-    #                    slow-sql-millis: 4000
-    #                    merge-sql: true
-    #                wall:
-    #                    config:
-    #                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: gdxy2021!@#zzjykj
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-admin/src/main/java/com/zhongzheng/ZhongZhengApplication.java

@@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @author zhongzheng
  */
 
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class })
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableScheduling
 public class ZhongZhengApplication
 {

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: slave #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password:  zhongzheng2021
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: false
-#                url:
-#                username:
-#                password:
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: ruoyi
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 1000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: zhongzheng2021
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-admin/src/main/resources/application-pre.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: slave #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password:  zhongzheng2021
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: false
-#                url:
-#                username:
-#                password:
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: ruoyi
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 2500
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: gdxy2021!@#zzjykj
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: slave #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password: gdxy2021!@#zzjykj
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: false
-#                url:
-#                username:
-#                password:
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: ruoyi
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 4000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: gdxy2021!@#zzjykj
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-api/src/main/java/com/zhongzheng/ZhongZhengApiApplication.java

@@ -5,9 +5,11 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@EnableScheduling
 public class ZhongZhengApiApplication {
 
     public static void main(String[] args)

zhongzheng-api/src/main/resources/application-dev.yml

@@ -1,86 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: slave #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-##                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password: zhongzheng2021
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: false
-#                url:
-#                username:
-#                password:
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: ruoyi
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 1000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: zhongzheng2021
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-api/src/main/resources/application-pre.yml

@@ -4,18 +4,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                username: root
-                password: zhongzheng2021
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
+            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: gdxy2021!@#zzjykj
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -50,7 +41,7 @@ spring:
                     enabled: true
                     # 慢SQL记录
                     log-slow-sql: true
-                    slow-sql-millis: 2500
+                    slow-sql-millis: 1000
                     merge-sql: true
                 wall:
                     config:

zhongzheng-api/src/main/resources/application-prod.yml

@@ -1,85 +1,51 @@
 # 数据源配置
 spring:
     datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: slave #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-    #    datasource:
-    #        type: com.alibaba.druid.pool.DruidDataSource
-    #        driverClassName: com.mysql.cj.jdbc.Driver
-    #        druid:
-    #            # 主库数据源
-    #            master:
-    #                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-    #                username: root
-    #                password: gdxy2021!@#zzjykj
-    #            # 从库数据源
-    #            slave:
-    #                # 从数据源开关/默认关闭
-    #                enabled: false
-    #                url:
-    #                username:
-    #                password:
-    #            # 初始连接数
-    #            initialSize: 5
-    #            # 最小连接池数量
-    #            minIdle: 10
-    #            # 最大连接池数量
-    #            maxActive: 20
-    #            # 配置获取连接等待超时的时间
-    #            maxWait: 60000
-    #            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    #            timeBetweenEvictionRunsMillis: 60000
-    #            # 配置一个连接在池中最小生存的时间，单位是毫秒
-    #            minEvictableIdleTimeMillis: 300000
-    #            # 配置一个连接在池中最大生存的时间，单位是毫秒
-    #            maxEvictableIdleTimeMillis: 900000
-    #            # 配置检测连接是否有效
-    #            validationQuery: SELECT 1 FROM DUAL
-    #            testWhileIdle: true
-    #            testOnBorrow: false
-    #            testOnReturn: false
-    #            webStatFilter:
-    #                enabled: true
-    #            statViewServlet:
-    #                enabled: true
-    #                # 设置白名单，不填则允许所有访问
-    #                allow:
-    #                url-pattern: /druid/*
-    #                # 控制台管理用户名和密码
-    #                login-username: ruoyi
-    #                login-password: 123456
-    #            filter:
-    #                stat:
-    #                    enabled: true
-    #                    # 慢SQL记录
-    #                    log-slow-sql: true
-    #                    slow-sql-millis: 4000
-    #                    merge-sql: true
-    #                wall:
-    #                    config:
-    #                        multi-statement-allow: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            username: root
+            password: gdxy2021!@#zzjykj
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
     # redis 配置
     redis:
         # 地址

zhongzheng-common/pom.xml

@@ -188,11 +188,11 @@
         </dependency>
 
         <!-- dynamic -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.0.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
+<!--            <version>3.0.0</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.baomidou</groupId>

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/DistributionSellerServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.framework.web.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -54,7 +54,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-13
  */
 @Service
-@DS("slave")
 public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSellerMapper, DistributionSeller> implements IDistributionSellerService {
 
     @Autowired

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.framework.web.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -39,8 +39,7 @@ import java.util.stream.Collectors;
  * @author hjl
  * @date 2021-08-03
  */
-@Service
-@DS("slave") //指定数据源
+@Service //指定数据源
 public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant> implements ISysTenantService {
 
     @Autowired
@@ -263,7 +262,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public List<SysTenant> getListSysTenant() {
         return list(new LambdaQueryWrapper<SysTenant>().eq(SysTenant::getStatus, 1));
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGoodsPriceServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.activity.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.modules.activity.domain.ActivityGoodsPrice;
 import com.zhongzheng.modules.activity.mapper.ActivityGoodsPriceMapper;
@@ -18,10 +18,9 @@ import java.util.List;
  * @date 2022-04-13
  */
 @Service
-@DS("slave")
 public class ActivityGoodsPriceServiceImpl extends ServiceImpl<ActivityGoodsPriceMapper, ActivityGoodsPrice> implements IActivityGoodsPriceService {
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public void saveBatchEntity(List<ActivityGoodsPrice> priceList) {
         saveBatch(priceList);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamQuestionServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-22
  */
 @Service
-@DS("slave")
 public class ExamQuestionServiceImpl extends ServiceImpl<ExamQuestionMapper, ExamQuestion> implements IExamQuestionService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -51,7 +51,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-22
  */
 @Service
-@DS("slave")
 public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IExamService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-25
  */
 @Service
-@DS("slave")
 public class QuestionBusinessServiceImpl extends ServiceImpl<QuestionBusinessMapper, QuestionBusiness> implements IQuestionBusinessService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterExamServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-25
  */
 @Service
-@DS("slave")
 public class QuestionChapterExamServiceImpl extends ServiceImpl<QuestionChapterExamMapper, QuestionChapterExam> implements IQuestionChapterExamService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -44,7 +44,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-25
  */
 @Service
-@DS("slave")
 public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMapper, QuestionChapter> implements IQuestionChapterService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionModuleChapterServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-26
  */
 @Service
-@DS("slave")
 public class QuestionModuleChapterServiceImpl extends ServiceImpl<QuestionModuleChapterMapper, QuestionModuleChapter> implements IQuestionModuleChapterService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionModuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -41,7 +41,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-25
  */
 @Service
-@DS("slave")
 public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper, QuestionModule> implements IQuestionModuleService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -86,7 +86,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-21
  */
 @Service
-@DS("slave")
 public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements IQuestionService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateCommonServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.base.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
  * @date 2022-06-07
  */
 @Service
-@DS("slave")
 public class CertificateCommonServiceImpl extends ServiceImpl<CertificateCommonMapper, CertificateCommon> implements ICertificateCommonService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.base.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-08
  */
 @Service
-@DS("slave")
 public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certificate> implements ICertificateService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.base.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -61,7 +61,6 @@ import java.util.stream.Collectors;
  * @date 2022-02-16
  */
 @Service
-@DS("slave")
 public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, CertificateTp> implements ICertificateTpService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileFieldServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.base.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-19
  */
 @Service
-@DS("slave")
 public class ProfileFieldServiceImpl extends ServiceImpl<ProfileFieldMapper, ProfileField> implements IProfileFieldService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.base.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,7 +26,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-19
  */
 @Service
-@DS("slave")
 public class ProfileTpBusinessServiceImpl extends ServiceImpl<ProfileTpBusinessMapper, ProfileTpBusiness> implements IProfileTpBusinessService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.base.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-19
  */
 @Service
-@DS("slave")
 public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp> implements IProfileTpService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -39,7 +39,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-08
  */
 @Service
-@DS("slave")
 public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper, CourseBusiness> implements ICourseBusinessService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseChapterBusinessServiceImpl extends ServiceImpl<CourseChapterBusinessMapper, CourseChapterBusiness> implements ICourseChapterBusinessService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterSectionServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -33,7 +33,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-12
  */
 @Service
-@DS("slave")
 public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSectionMapper, CourseChapterSection> implements ICourseChapterSectionService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -38,7 +38,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseChapterServiceImpl extends ServiceImpl<CourseChapterMapper, CourseChapter> implements ICourseChapterService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTierServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-01
  */
 @Service
-@DS("slave")
 public class CourseEducationTierServiceImpl extends ServiceImpl<CourseEducationTierMapper, CourseEducationTier> implements ICourseEducationTierService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTypeServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -39,7 +39,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-08
  */
 @Service
-@DS("slave")
 public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationTypeMapper, CourseEducationType> implements ICourseEducationTypeService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-02
  */
 @Service
-@DS("slave")
 public class CourseHandoutsBusinessServiceImpl extends ServiceImpl<CourseHandoutsBusinessMapper, CourseHandoutsBusiness> implements ICourseHandoutsBusinessService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-02
  */
 @Service
-@DS("slave")
 public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper, CourseHandouts> implements ICourseHandoutsService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuExamServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-17
  */
 @Service
-@DS("slave")
 public class CourseMenuExamServiceImpl extends ServiceImpl<CourseMenuExamMapper, CourseMenuExam> implements ICourseMenuExamService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-12
  */
 @Service
-@DS("slave")
 public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseMenu> implements ICourseMenuService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseModuleBusinessServiceImpl extends ServiceImpl<CourseModuleBusinessMapper, CourseModuleBusiness> implements ICourseModuleBusinessService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleChapterServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-11
  */
 @Service
-@DS("slave")
 public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChapterMapper, CourseModuleChapter> implements ICourseModuleChapterService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -43,7 +43,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseModuleServiceImpl extends ServiceImpl<CourseModuleMapper, CourseModule> implements ICourseModuleService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseProjectTypeServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-08
  */
 @Service
-@DS("slave")
 public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeMapper, CourseProjectType> implements ICourseProjectTypeService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-11
  */
 @Service
-@DS("slave")
 public class CourseSectionBusinessServiceImpl extends ServiceImpl<CourseSectionBusinessMapper, CourseSectionBusiness> implements ICourseSectionBusinessService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -51,7 +51,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-11
  */
 @Service
-@DS("slave")
 public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, CourseSection> implements ICourseSectionService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionWatchPerServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -34,7 +34,6 @@ import java.util.List;
  * @date 2022年08月16日 11:05
  */
 @Service
-@DS("slave")
 public class CourseSectionWatchPerServiceImpl extends ServiceImpl<CourseSectionWatchPerMapper, CourseSectionWatchPer> implements ICourseSectionWatchPerService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -78,7 +78,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> implements ICourseService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseStreamingBusinessServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-11
  */
 @Service
-@DS("slave")
 public class CourseStreamingBusinessServiceImpl extends ServiceImpl<CourseStreamingBusinessMapper, CourseStreamingBusiness> implements ICourseStreamingBusinessService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseStreamingServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -39,7 +39,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-11
  */
 @Service
-@DS("slave")
 public class CourseStreamingServiceImpl extends ServiceImpl<CourseStreamingMapper, CourseStreaming> implements ICourseStreamingService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectProjectServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseSubjectProjectServiceImpl extends ServiceImpl<CourseSubjectProjectMapper, CourseSubjectProject> implements ICourseSubjectProjectService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -33,7 +33,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, CourseSubject> implements ICourseSubjectService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorProjectServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class MajorProjectServiceImpl extends ServiceImpl<MajorProjectMapper, MajorProject> implements IMajorProjectService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,7 +33,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-09
  */
 @Service
-@DS("slave")
 public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements IMajorService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityGoodsServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.distribution.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -62,7 +62,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-@DS("slave")
 public class DistributionActivityGoodsServiceImpl extends ServiceImpl<DistributionActivityGoodsMapper, DistributionActivityGoods> implements IDistributionActivityGoodsService {
 
     @Autowired
@@ -584,7 +583,7 @@ public class DistributionActivityGoodsServiceImpl extends ServiceImpl<Distributi
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public void saveBatchEntity(List<DistributionActivityGoods> activityGoodsList) {
         saveBatch(activityGoodsList);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityImageServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.distribution.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityImage;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityImageMapper;
@@ -14,6 +14,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-03-06
  */
 @Service
-@DS("slave")
 public class DistributionActivityImageServiceImpl extends ServiceImpl<DistributionActivityImageMapper, DistributionActivityImage> implements IDistributionActivityImageService {
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityPosterServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -56,7 +56,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-@DS("slave")
 public class DistributionActivityPosterServiceImpl extends ServiceImpl<DistributionActivityPosterMapper, DistributionActivityPoster> implements IDistributionActivityPosterService {
 
     @Autowired
@@ -282,7 +281,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
 
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public void savePoster(DistributionActivityPoster poster) {
         save(poster);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -61,7 +61,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-@DS("slave")
 public class DistributionActivityServiceImpl extends ServiceImpl<DistributionActivityMapper, DistributionActivity> implements IDistributionActivityService {
 
     @Autowired
@@ -440,7 +439,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public void saveEntity(DistributionActivity dailyActivity) {
         save(dailyActivity);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionRebateServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.distribution.bo.DistributionRebateAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionRebateEditBo;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-@DS("slave")
 public class DistributionRebateServiceImpl extends ServiceImpl<DistributionRebateMapper, DistributionRebate> implements IDistributionRebateService {
     @Override
     public DistributionRebateVo queryById(Long id){

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamPaperServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.exam.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-18
  */
 @Service
-@DS("slave")
 public class ExamPaperServiceImpl extends ServiceImpl<ExamPaperMapper, ExamPaper> implements IExamPaperService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsAttachedServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-28
  */
 @Service
-@DS("slave")
 public class GoodsAttachedServiceImpl extends ServiceImpl<GoodsAttachedMapper, GoodsAttached> implements IGoodsAttachedService {
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsCourseServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-12
  */
 @Service
-@DS("slave")
 public class GoodsCourseServiceImpl extends ServiceImpl<GoodsCourseMapper, GoodsCourse> implements IGoodsCourseService {
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsCourseTeacherServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
  * @date 2022-09-14
  */
 @Service
-@DS("slave")
 public class GoodsCourseTeacherServiceImpl extends ServiceImpl<GoodsCourseTeacherMapper, GoodsCourseTeacher> implements IGoodsCourseTeacherService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -8,7 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -103,7 +103,6 @@ import static java.math.RoundingMode.HALF_UP;
  * @date 2021-10-12
  */
 @Service
-@DS("slave")
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements IGoodsService {
 
     @Autowired
@@ -4503,7 +4502,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public Goods getOneGoods(String code, Long id) {
         return getOne(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getCode, code)

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecAttributeRelationServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2022-09-29
  */
 @Service
-@DS("slave")
 public class GoodsSpecAttributeRelationServiceImpl extends ServiceImpl<GoodsSpecAttributeRelationMapper, GoodsSpecAttributeRelation> implements IGoodsSpecAttributeRelationService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecAttributeServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
  * @date 2022-09-29
  */
 @Service
-@DS("slave")
 public class GoodsSpecAttributeServiceImpl extends ServiceImpl<GoodsSpecAttributeMapper, GoodsSpecAttribute> implements IGoodsSpecAttributeService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
  * @date 2022-09-29
  */
 @Service
-@DS("slave")
 public class GoodsSpecServiceImpl extends ServiceImpl<GoodsSpecMapper, GoodsSpec> implements IGoodsSpecService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecTemplateServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -39,7 +39,6 @@ import java.util.stream.Collectors;
  * @date 2022-09-29
  */
 @Service
-@DS("slave")
 public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateMapper, GoodsSpecTemplate> implements IGoodsSpecTemplateService {
 
     @Autowired

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongzheng.modules.inform.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -51,7 +51,6 @@ import java.util.stream.Collectors;
  * @date 2021-11-25
  */
 @Service
-@DS("slave")
 public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, InformRemind> implements IInformRemindService {
 
 
@@ -218,7 +217,7 @@ public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, Inf
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public InformRemindVo getQueryByNameTenant(String name, Long id) {
         InformRemind db = getOne(new LambdaQueryWrapper<InformRemind>().eq(InformRemind::getRemind, name).eq(InformRemind::getTenantId,id).last("limit 1"));
         InformRemindVo informRemindVo = BeanUtil.toBean(db, InformRemindVo.class);

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformSysUserServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.inform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -38,7 +38,6 @@ import java.util.stream.Collectors;
  * @date 2022-08-04
  */
 @Service
-@DS("slave")
 public class InformSysUserServiceImpl extends ServiceImpl<InformSysUserMapper, InformSysUser> implements IInformSysUserService {
 
     @Autowired
@@ -173,7 +172,7 @@ public class InformSysUserServiceImpl extends ServiceImpl<InformSysUserMapper, I
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public void insertEntity(InformSysUserAddBo informUserAddBo) {
         insertByAddBo(informUserAddBo);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayServeServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.pay.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-12
  */
 @Service
-@DS("slave")
 public class PayServeServiceImpl extends ServiceImpl<PayServeMapper, PayServe> implements IPayServeService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PaySupplyServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.pay.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
  * @date 2021-10-12
  */
 @Service
-@DS("slave")
 public class PaySupplyServiceImpl extends ServiceImpl<PaySupplyMapper, PaySupply> implements IPaySupplyService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvCataServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.polyv.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
  * @date 2022-01-11
  */
 @Service
-@DS("slave")
 public class PolyvCataServiceImpl extends ServiceImpl<PolyvCataMapper, PolyvCata> implements IPolyvCataService {
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java

@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -57,7 +57,6 @@ import static com.squareup.okhttp.internal.Util.md5Hex;
  * @date 2021-06-11
  */
 @Service
-@DS("slave")
 public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVideo> implements IPolyvVideoService {
 
     @Value("${poliv.token.userid}")

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysRoleServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,7 +36,6 @@ import java.util.*;
  * @author zhongzheng
  */
 @Service
-@DS("slave")
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
 
     @Autowired
@@ -361,7 +360,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public SysRole getOneSysRole(String sellerAdmin, Long id) {
         return getOne(new LambdaQueryWrapper<SysRole>()
                 .eq(SysRole::getRoleKey, sellerAdmin)

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysUserRoleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.system.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.modules.system.domain.SysUserRole;
@@ -21,8 +21,7 @@ import java.util.List;
 public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
-    @DS("slave")
+
     public List<SysUserRole> getList(Long roleId, Long id) {
         return list(new LambdaQueryWrapper<SysUserRole>()
                 .eq(SysUserRole::getRoleId, roleId)

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateGoodsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-@DS("master")
 public class DistributionActivityTemplateGoodsServiceImpl extends ServiceImpl<DistributionActivityTempGoodsMapper, DistributionActivityTemplateGoods> implements IDistributionActivityTemplateGoodsService {
 
     @Override
@@ -103,7 +102,7 @@ public class DistributionActivityTemplateGoodsServiceImpl extends ServiceImpl<Di
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public List<DistributionActivityTemplateGoods> getListEntity(Long tempId) {
         return list(new LambdaQueryWrapper<DistributionActivityTemplateGoods>()
                 .eq(DistributionActivityTemplateGoods::getDistributionTempId, tempId)

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -71,7 +71,6 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
-@DS("master")
 public class DistributionActivityTemplateServiceImpl extends ServiceImpl<DistributionActivityTempMapper, DistributionActivityTemplate> implements IDistributionActivityTemplateService {
 
     @Autowired
@@ -465,7 +464,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public DistributionActivityTemplate getEntityById(Long tempId) {
         return getById(tempId);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAddBo.java

@@ -0,0 +1,134 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 订单添加对象 top_order
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单添加对象")
+public class TopOrderAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 订单标准价格 */
+    @ApiModelProperty("订单标准价格")
+    private BigDecimal orderPrice;
+    /** 支付订单号 */
+    @ApiModelProperty("支付订单号")
+    private String orderGeneral;
+    /** 订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款 */
+    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款")
+    private Integer orderStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 支付时间 */
+    @ApiModelProperty("支付时间")
+    private Long payTime;
+    /** 支付平台  */
+    @ApiModelProperty("支付平台 ")
+    private Integer payType;
+    /** 微信流水号 */
+    @ApiModelProperty("微信流水号")
+    private String transid;
+    /** 关闭时间 */
+    @ApiModelProperty("关闭时间")
+    private Long cancelTime;
+    /** 订单完成时间 */
+    @ApiModelProperty("订单完成时间")
+    private Long finishTime;
+    /** 订单类型   1线上，2线下 */
+    @ApiModelProperty("订单类型   1线上，2线下")
+    private Integer orderType;
+    /** 支付价格(成交价) */
+    @ApiModelProperty("支付价格(成交价)")
+    private BigDecimal payPrice;
+    /** 订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单  */
+    @ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+    private Integer orderFrom;
+    /** 业务员名称 */
+    @ApiModelProperty("业务员名称")
+    private String createUsername;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 业务员名称ID */
+    @ApiModelProperty("业务员名称ID")
+    private Long createSysUserId;
+    /** 业务号 */
+    @ApiModelProperty("业务号")
+    private String createNo;
+    /** 录单订单编号 */
+    @ApiModelProperty("录单订单编号")
+    private String inputOrderSn;
+    /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
+    @ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
+    private Integer payStatus;
+    /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
+    @ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
+    private Integer checkStaus;
+    /** 退款状态：0待审核，1未通过，2未退款，3已完成 */
+    @ApiModelProperty("退款状态：0待审核，1未通过，2未退款，3已完成")
+    private Integer refundStatus;
+    /** 账款状态：0未结清，1已结清 */
+    @ApiModelProperty("账款状态：0未结清，1已结清")
+    private Integer creditStatus;
+    /** 发票状态：0未开票，1已开票 */
+    @ApiModelProperty("发票状态：0未开票，1已开票")
+    private Integer invoiceStatus;
+    /** 盈亏（元） */
+    @ApiModelProperty("盈亏（元）")
+    private BigDecimal orderProfit;
+    /** 成本（元） */
+    @ApiModelProperty("成本（元）")
+    private BigDecimal orderCost;
+    /** 退款（元） */
+    @ApiModelProperty("退款（元）")
+    private BigDecimal orderRefund;
+    /** 已退（元） */
+    @ApiModelProperty("已退（元）")
+    private BigDecimal orderRefunded;
+    /** 未收账款（元） */
+    @ApiModelProperty("未收账款（元）")
+    private BigDecimal orderUncollected;
+    /** 实收账款（元） */
+    @ApiModelProperty("实收账款（元）")
+    private BigDecimal orderReceived;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 业务分类 */
+    @ApiModelProperty("业务分类")
+    private String orderBusiness;
+    /** 成本设置 */
+    @ApiModelProperty("成本设置")
+    private String costJson;
+    /** 订单来源系统名称 */
+    @ApiModelProperty("订单来源系统名称")
+    private String orderOrg;
+    /** 业务员机构 */
+    @ApiModelProperty("业务员机构")
+    private Integer createOrg;
+
+    @ApiModelProperty("订单商品")
+    private List<TopOrderGoodsAddBo> orderGoodsList;
+
+    @ApiModelProperty("订单附件")
+    private List<TopOrderAttachmentAddBo> orderAttachmentList;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAttachmentAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单附件添加对象 top_order_attachment
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单附件添加对象")
+public class TopOrderAttachmentAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 附件地址 */
+    @ApiModelProperty("附件地址")
+    private String attachmentUrl;
+    /** 类型：1转账凭证，2附件 */
+    @ApiModelProperty("类型：1转账凭证，2附件")
+    private Integer attachmentType;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAttachmentEditBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单附件编辑对象 top_order_attachment
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单附件编辑对象")
+public class TopOrderAttachmentEditBo {
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 附件地址 */
+    @ApiModelProperty("附件地址")
+    private String attachmentUrl;
+
+    /** 类型：1转账凭证，2附件 */
+    @ApiModelProperty("类型：1转账凭证，2附件")
+    private Integer attachmentType;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderAttachmentQueryBo.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单附件分页查询对象 top_order_attachment
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单附件分页查询对象")
+public class TopOrderAttachmentQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 附件地址 */
+	@ApiModelProperty("附件地址")
+	private String attachmentUrl;
+	/** 类型：1转账凭证，2附件 */
+	@ApiModelProperty("类型：1转账凭证，2附件")
+	private Integer attachmentType;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderEditBo.java

@@ -0,0 +1,164 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单编辑对象 top_order
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单编辑对象")
+public class TopOrderEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 订单标准价格 */
+    @ApiModelProperty("订单标准价格")
+    private BigDecimal orderPrice;
+
+    /** 支付订单号 */
+    @ApiModelProperty("支付订单号")
+    private String orderGeneral;
+
+    /** 订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款 */
+    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款")
+    private Integer orderStatus;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 支付时间 */
+    @ApiModelProperty("支付时间")
+    private Long payTime;
+
+    /** 支付平台  */
+    @ApiModelProperty("支付平台 ")
+    private Integer payType;
+
+    /** 微信流水号 */
+    @ApiModelProperty("微信流水号")
+    private String transid;
+
+    /** 关闭时间 */
+    @ApiModelProperty("关闭时间")
+    private Long cancelTime;
+
+    /** 订单完成时间 */
+    @ApiModelProperty("订单完成时间")
+    private Long finishTime;
+
+    /** 订单类型   1线上，2线下 */
+    @ApiModelProperty("订单类型   1线上，2线下")
+    private Integer orderType;
+
+    /** 支付价格(成交价) */
+    @ApiModelProperty("支付价格(成交价)")
+    private BigDecimal payPrice;
+
+
+    /** 订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单  */
+    @ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+    private Integer orderFrom;
+
+    /** 业务员名称 */
+    @ApiModelProperty("业务员名称")
+    private String createUsername;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 业务员名称ID */
+    @ApiModelProperty("业务员名称ID")
+    private Long createSysUserId;
+
+    /** 业务号 */
+    @ApiModelProperty("业务号")
+    private String createNo;
+
+    /** 录单订单编号 */
+    @ApiModelProperty("录单订单编号")
+    private String inputOrderSn;
+
+    /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
+    @ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
+    private Integer payStatus;
+
+    /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
+    @ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
+    private Integer checkStaus;
+
+    /** 退款状态：0待审核，1未通过，2未退款，3已完成 */
+    @ApiModelProperty("退款状态：0待审核，1未通过，2未退款，3已完成")
+    private Integer refundStatus;
+
+    /** 账款状态：0未结清，1已结清 */
+    @ApiModelProperty("账款状态：0未结清，1已结清")
+    private Integer creditStatus;
+
+    /** 发票状态：0未开票，1已开票 */
+    @ApiModelProperty("发票状态：0未开票，1已开票")
+    private Integer invoiceStatus;
+
+    /** 盈亏（元） */
+    @ApiModelProperty("盈亏（元）")
+    private BigDecimal orderProfit;
+
+    /** 成本（元） */
+    @ApiModelProperty("成本（元）")
+    private BigDecimal orderCost;
+
+    /** 退款（元） */
+    @ApiModelProperty("退款（元）")
+    private BigDecimal orderRefund;
+
+    /** 已退（元） */
+    @ApiModelProperty("已退（元）")
+    private BigDecimal orderRefunded;
+
+    /** 未收账款（元） */
+    @ApiModelProperty("未收账款（元）")
+    private BigDecimal orderUncollected;
+
+    /** 实收账款（元） */
+    @ApiModelProperty("实收账款（元）")
+    private BigDecimal orderReceived;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 业务分类 */
+    @ApiModelProperty("业务分类")
+    private String orderBusiness;
+
+    /** 成本设置 */
+    @ApiModelProperty("成本设置")
+    private String costJson;
+
+    /** 订单来源系统名称 */
+    @ApiModelProperty("订单来源系统名称")
+    private String orderOrg;
+    /** 业务员机构 */
+    @ApiModelProperty("业务员机构")
+    private Integer createOrg;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderGoodsAddBo.java

@@ -0,0 +1,87 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单商品添加对象 top_order_goods
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单商品添加对象")
+public class TopOrderGoodsAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+    /** 商品标准价格 */
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+    /** 商品成交价格 */
+    @ApiModelProperty("商品成交价格")
+    private BigDecimal goodsRealPrice;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 已收金额 */
+    @ApiModelProperty("已收金额")
+    private BigDecimal goodsReceived;
+    /** 退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款 */
+    @ApiModelProperty("退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款")
+    private Integer refundStatus;
+    /** 支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变) */
+    @ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变)")
+    private Integer payStatus;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 所属专业 */
+    @ApiModelProperty("所属专业")
+    private Long majorId;
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
+    /** 专业名称 */
+    @ApiModelProperty("专业名称")
+    private String majorName;
+    /** 商品名称 */
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    /** 业务名称 */
+    @ApiModelProperty("业务名称")
+    private String businessName;
+    /** 学习状态：0未开始，1学习中，2已结束 */
+    @ApiModelProperty("学习状态：0未开始，1学习中，2已结束")
+    private Integer studyStatus;
+    @ApiModelProperty("学员ID")
+    private Long userId;
+    @ApiModelProperty("学员名称")
+    private String userName;
+    @ApiModelProperty("学员身份证")
+    private String userCard;
+    @ApiModelProperty("学员手机号码")
+    private String userPhone;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderGoodsEditBo.java

@@ -0,0 +1,109 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单商品编辑对象 top_order_goods
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单商品编辑对象")
+public class TopOrderGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderGoodsId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    /** 商品标准价格 */
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+
+    /** 商品成交价格 */
+    @ApiModelProperty("商品成交价格")
+    private BigDecimal goodsRealPrice;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+    /** 已收金额 */
+    @ApiModelProperty("已收金额")
+    private BigDecimal goodsReceived;
+
+    /** 退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款 */
+    @ApiModelProperty("退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款")
+    private Integer refundStatus;
+
+    /** 支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变) */
+    @ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变)")
+    private Integer payStatus;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+    /** 所属专业 */
+    @ApiModelProperty("所属专业")
+    private Long majorId;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
+
+    /** 专业名称 */
+    @ApiModelProperty("专业名称")
+    private String majorName;
+
+    /** 商品名称 */
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    /** 业务名称 */
+    @ApiModelProperty("业务名称")
+    private String businessName;
+
+    /** 学习状态：0未开始，1学习中，2已结束 */
+    @ApiModelProperty("学习状态：0未开始，1学习中，2已结束")
+    private Integer studyStatus;
+
+    @ApiModelProperty("学员ID")
+    private Long userId;
+    @ApiModelProperty("学员名称")
+    private String userName;
+    @ApiModelProperty("学员身份证")
+    private String userCard;
+    @ApiModelProperty("学员手机号码")
+    private String userPhone;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderGoodsQueryBo.java

@@ -0,0 +1,87 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单商品分页查询对象 top_order_goods
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单商品分页查询对象")
+public class TopOrderGoodsQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 商品标准价格 */
+	@ApiModelProperty("商品标准价格")
+	private BigDecimal goodsPrice;
+	/** 商品成交价格 */
+	@ApiModelProperty("商品成交价格")
+	private BigDecimal goodsRealPrice;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 已收金额 */
+	@ApiModelProperty("已收金额")
+	private BigDecimal goodsReceived;
+	/** 退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款 */
+	@ApiModelProperty("退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款")
+	private Integer refundStatus;
+	/** 支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变) */
+	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变)")
+	private Integer payStatus;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 所属专业 */
+	@ApiModelProperty("所属专业")
+	private Long majorId;
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 科目ID，拼接 */
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
+	/** 专业名称 */
+	@ApiModelProperty("专业名称")
+	private String majorName;
+	/** 商品名称 */
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	/** 业务名称 */
+	@ApiModelProperty("业务名称")
+	private String businessName;
+	/** 学习状态：0未开始，1学习中，2已结束 */
+	@ApiModelProperty("学习状态：0未开始，1学习中，2已结束")
+	private Integer studyStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOrderQueryBo.java

@@ -0,0 +1,135 @@
+package com.zhongzheng.modules.top.goods.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单分页查询对象 top_order
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单分页查询对象")
+public class TopOrderQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单标准价格 */
+	@ApiModelProperty("订单标准价格")
+	private BigDecimal orderPrice;
+	/** 支付订单号 */
+	@ApiModelProperty("支付订单号")
+	private String orderGeneral;
+	/** 订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款 */
+	@ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款")
+	private Integer orderStatus;
+	/** 支付时间 */
+	@ApiModelProperty("支付时间")
+	private Long payTime;
+	/** 支付平台  */
+	@ApiModelProperty("支付平台 ")
+	private Integer payType;
+	/** 微信流水号 */
+	@ApiModelProperty("微信流水号")
+	private String transid;
+	/** 关闭时间 */
+	@ApiModelProperty("关闭时间")
+	private Long cancelTime;
+	/** 订单完成时间 */
+	@ApiModelProperty("订单完成时间")
+	private Long finishTime;
+	/** 订单类型   1线上，2线下 */
+	@ApiModelProperty("订单类型   1线上，2线下")
+	private Integer orderType;
+	/** 支付价格(成交价) */
+	@ApiModelProperty("支付价格(成交价)")
+	private BigDecimal payPrice;
+	/** 订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单  */
+	@ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+	private Integer orderFrom;
+	/** 业务员名称 */
+	@ApiModelProperty("业务员名称")
+	private String createUsername;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	/** 业务员名称ID */
+	@ApiModelProperty("业务员名称ID")
+	private Long createSysUserId;
+	/** 业务号 */
+	@ApiModelProperty("业务号")
+	private String createNo;
+	/** 录单订单编号 */
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
+	/** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
+	@ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
+	private Integer payStatus;
+	/** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
+	@ApiModelProperty("审核状态：0待审核，1已通过，2未通过，3已撤销")
+	private Integer checkStaus;
+	/** 退款状态：0待审核，1未通过，2未退款，3已完成 */
+	@ApiModelProperty("退款状态：0待审核，1未通过，2未退款，3已完成")
+	private Integer refundStatus;
+	/** 账款状态：0未结清，1已结清 */
+	@ApiModelProperty("账款状态：0未结清，1已结清")
+	private Integer creditStatus;
+	/** 发票状态：0未开票，1已开票 */
+	@ApiModelProperty("发票状态：0未开票，1已开票")
+	private Integer invoiceStatus;
+	/** 盈亏（元） */
+	@ApiModelProperty("盈亏（元）")
+	private BigDecimal orderProfit;
+	/** 成本（元） */
+	@ApiModelProperty("成本（元）")
+	private BigDecimal orderCost;
+	/** 退款（元） */
+	@ApiModelProperty("退款（元）")
+	private BigDecimal orderRefund;
+	/** 已退（元） */
+	@ApiModelProperty("已退（元）")
+	private BigDecimal orderRefunded;
+	/** 未收账款（元） */
+	@ApiModelProperty("未收账款（元）")
+	private BigDecimal orderUncollected;
+	/** 实收账款（元） */
+	@ApiModelProperty("实收账款（元）")
+	private BigDecimal orderReceived;
+	/** 业务分类 */
+	@ApiModelProperty("业务分类")
+	private String orderBusiness;
+	/** 成本设置 */
+	@ApiModelProperty("成本设置")
+	private String costJson;
+	/** 订单来源系统名称 */
+	@ApiModelProperty("订单来源系统名称")
+	private String orderOrg;
+	/** 业务员机构 */
+	@ApiModelProperty("业务员机构")
+	private Integer createOrg;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOrder.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.modules.top.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 订单对象 top_order
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_order")
+public class TopOrder implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "order_id")
+    private Long orderId;
+    /** 订单编号 */
+    private String orderSn;
+    /** 用户ID */
+    private Long userId;
+    /** 订单标准价格 */
+    private BigDecimal orderPrice;
+    /** 支付订单号 */
+    private String orderGeneral;
+    /** 订单状态 -2 超时关闭，-1手动关闭，0待支付，1已支付 3部分已退款 4完全退款 */
+    private Integer orderStatus;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 支付时间 */
+    private Long payTime;
+    /** 支付平台  */
+    private Integer payType;
+    /** 微信流水号 */
+    private String transid;
+    /** 关闭时间 */
+    private Long cancelTime;
+    /** 订单完成时间 */
+    private Long finishTime;
+    /** 订单类型   1线上，2线下 */
+    private Integer orderType;
+    /** 支付价格(成交价) */
+    private BigDecimal payPrice;
+    /** 订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单  */
+    private Integer orderFrom;
+    /** 业务员名称 */
+    private String createUsername;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 业务员名称ID */
+    private Long createSysUserId;
+    /** 业务号 */
+    private String createNo;
+    /** 录单订单编号 */
+    private String inputOrderSn;
+    /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
+    private Integer payStatus;
+    /** 审核状态：0待审核，1已通过，2未通过，3已撤销 */
+    private Integer checkStaus;
+    /** 退款状态：0待审核，1未通过，2未退款，3已完成 */
+    private Integer refundStatus;
+    /** 账款状态：0未结清，1已结清 */
+    private Integer creditStatus;
+    /** 发票状态：0未开票，1已开票 */
+    private Integer invoiceStatus;
+    /** 盈亏（元） */
+    private BigDecimal orderProfit;
+    /** 成本（元） */
+    private BigDecimal orderCost;
+    /** 退款（元） */
+    private BigDecimal orderRefund;
+    /** 已退（元） */
+    private BigDecimal orderRefunded;
+    /** 未收账款（元） */
+    private BigDecimal orderUncollected;
+    /** 实收账款（元） */
+    private BigDecimal orderReceived;
+    /** 备注 */
+    private String remark;
+    /** 业务分类 */
+    private String orderBusiness;
+    /** 成本设置 */
+    private String costJson;
+    /** 订单来源系统名称 */
+    private String orderOrg;
+    /** 业务员机构 */
+    private Integer createOrg;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOrderAttachment.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.top.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 订单附件对象 top_order_attachment
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_order_attachment")
+public class TopOrderAttachment implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+    /** 订单编号 */
+    private String orderSn;
+    /** 附件地址 */
+    private String attachmentUrl;
+    /** 类型：1转账凭证，2附件 */
+    private Integer attachmentType;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOrderGoods.java

@@ -0,0 +1,82 @@
+package com.zhongzheng.modules.top.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 订单商品对象 top_order_goods
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_order_goods")
+public class TopOrderGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "order_goods_id")
+    private Long orderGoodsId;
+    /** 订单编号 */
+    private String orderSn;
+    /** 商品id */
+    private Long goodsId;
+    /** 商品标准价格 */
+    private BigDecimal goodsPrice;
+    /** 商品成交价格 */
+    private BigDecimal goodsRealPrice;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    /** 已收金额 */
+    private BigDecimal goodsReceived;
+    /** 退款状态 0（无和学员端拒绝退款）  1退款中 2已退款 3拒绝退款 */
+    private Integer refundStatus;
+    /** 支付状态 1未收费 2部分收费 3完全收费 4免费 (退款此状态保持不变) */
+    private Integer payStatus;
+    /** 备注 */
+    private String remark;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 所属专业 */
+    private Long majorId;
+    /** 项目ID */
+    private Long projectId;
+    /** 科目ID，拼接 */
+    private String subjectIds;
+    /** 专业名称 */
+    private String majorName;
+    /** 商品名称 */
+    private String goodsName;
+    /** 业务名称 */
+    private String businessName;
+    /** 学习状态：0未开始，1学习中，2已结束 */
+    private Integer studyStatus;
+    @ApiModelProperty("学员ID")
+    private Long userId;
+    @ApiModelProperty("学员名称")
+    private String userName;
+    @ApiModelProperty("学员身份证")
+    private String userCard;
+    @ApiModelProperty("学员手机号码")
+    private String userPhone;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOrderAttachmentMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.goods.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
+
+/**
+ * 订单附件Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOrderAttachmentMapper extends BaseMapper<TopOrderAttachment> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOrderGoodsMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.domain.TopOrderGoods;
+
+/**
+ * 订单商品Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOrderGoodsMapper extends BaseMapper<TopOrderGoods> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOrderMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.goods.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.goods.domain.TopOrder;
+
+/**
+ * 订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface TopOrderMapper extends BaseMapper<TopOrder> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOrderAttachmentService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.goods.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAttachmentQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOrderAttachment;
+import com.zhongzheng.modules.top.goods.vo.TopOrderAttachmentVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单附件Service接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ITopOrderAttachmentService extends IService<TopOrderAttachment> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopOrderAttachmentVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopOrderAttachmentVo> queryList(TopOrderAttachmentQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单附件
+	 * @param bo 订单附件新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopOrderAttachmentAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单附件
+	 * @param bo 订单附件编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopOrderAttachmentEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOrderGoodsService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.top.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderGoodsQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOrderGoods;
+import com.zhongzheng.modules.top.goods.vo.TopOrderGoodsVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单商品Service接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ITopOrderGoodsService extends IService<TopOrderGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopOrderGoodsVo queryById(Long orderGoodsId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopOrderGoodsVo> queryList(TopOrderGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单商品
+	 * @param bo 订单商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopOrderGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单商品
+	 * @param bo 订单商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopOrderGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOrderService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.goods.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.goods.bo.TopOrderAddBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOrderQueryBo;
+import com.zhongzheng.modules.top.goods.domain.TopOrder;
+import com.zhongzheng.modules.top.goods.vo.TopOrderVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单Service接口
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ITopOrderService extends IService<TopOrder> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopOrderVo queryById(Long orderId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopOrderVo> queryList(TopOrderQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单
+	 * @param bo 订单新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopOrderAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单
+	 * @param bo 订单编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopOrderEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopActivityGoodsPriceServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.modules.top.goods.domain.TopActivityGoodsPrice;
@@ -17,11 +17,10 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2023-03-15
  */
 @Service
-@DS("master")
 public class TopActivityGoodsPriceServiceImpl extends ServiceImpl<TopActivityGoodsPriceMapper, TopActivityGoodsPrice> implements ITopActivityGoodsPriceService {
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    
     public TopActivityGoodsPrice getEntity(Long goodsId, String code) {
         return getOne(new LambdaQueryWrapper<TopActivityGoodsPrice>()
         .eq(TopActivityGoodsPrice::getGoodsId,goodsId)