From f76af44a0aebe1a3dcbdf355cc825cc6abe136e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E4=BD=B3=E8=B1=AA?= <18505142974@163.com> Date: Wed, 6 Aug 2025 09:55:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E8=B4=A6=E6=88=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 4 +- .../SysTenantAccountController.java | 7 ++- .../system/domain/bo/SysTenantAccountBo.java | 12 ++--- .../system/domain/vo/SysTenantAccountVo.java | 14 ++++-- .../system/mapper/SysTenantAccountMapper.java | 9 ++++ .../service/ISysTenantAccountService.java | 2 + .../impl/SysTenantAccountServiceImpl.java | 6 +++ .../mapper/system/SysTenantAccountMapper.xml | 48 +++++++++++++++++++ .../controller/DivideController.java | 2 +- 10 files changed, 85 insertions(+), 21 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index af1350aa2..b2c55b3ee 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -56,7 +56,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://82.156.121.2:23306/wzj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://82.156.121.2:13306/wzj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: wzj password: A085F27A43B0 # # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 2f5f780d9..7c519c6ff 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://82.156.121.2:23306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://82.156.121.2:13306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: wzj password: A085F27A43B0 # # 从库数据源 @@ -103,7 +103,7 @@ spring.data: # 地址 host: localhost # 端口，默认为6379 - port: 6379 + port: 26379 # 数据库索引 database: 0 # redis 密码必须配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java index 78df412f5..af10602bf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java @@ -35,10 +35,9 @@ public class SysTenantAccountController { @Operation(summary = "查询租户账户列表") @PostMapping("/list") - public R> fansList(@RequestBody SysTenantAccountBo bo, @RequestBody Page page) { - LambdaQueryWrapper fansQuery = new LambdaQueryWrapper<>(); - Page fans = service.page(page, fansQuery); - return R.ok(convert.toVO(fans)); + public R> fansList(@RequestBody SysTenantAccountBo bo, Page page) { + IPage result = service.selectTenantAccountPage(page, bo); + return R.ok(result); } @Operation(summary = "导出租户账户列表") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java index 9197c1ac0..5da427583 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java @@ -19,20 +19,16 @@ public class SysTenantAccountBo extends BaseAudit { private Long tenantId; @Schema(description = "积分余额") private BigDecimal integralBalance; - @Schema(description = "累计积分余额") - private BigDecimal totalIntegralBalance; - @Schema(description = "现金余额") - private BigDecimal moneyBalance; + @Schema(description = "钱包余额") private BigDecimal wallet; - @Schema(description = "累计收益") + @Schema(description = "营收") private BigDecimal revenue; - @Schema(description = "创建人") - private Long createBy; - @Schema(description = "更新人") + private Long updateBy; @Schema(description = "账户类型 1商家 2代理 3平台") private Integer type; + private String storeName; public LambdaQueryWrapper toWrapper() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java index 9a9715693..cdabb5493 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java @@ -14,14 +14,14 @@ public class SysTenantAccountVo { private Long tenantId; @Schema(description = "积分余额") private BigDecimal integralBalance; - @Schema(description = "累计积分余额") - private BigDecimal totalIntegralBalance; +// @Schema(description = "累计积分余额") +// private BigDecimal totalIntegralBalance; @Schema(description = "更新时间") private Date updateTime; @Schema(description = "创建时间") private Date createTime; - @Schema(description = "现金余额") - private BigDecimal moneyBalance; +// @Schema(description = "现金余额") +// private BigDecimal moneyBalance; @Schema(description = "钱包余额") private BigDecimal wallet; @Schema(description = "累计收益") @@ -32,4 +32,8 @@ public class SysTenantAccountVo { private Long updateBy; @Schema(description = "账户类型 1商家 2代理 3平台") private Integer type; -} \ No newline at end of file + @Schema(description = "店铺名称") + private String storeName; + @Schema(description = "店铺名称") + private String companyName; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java index 65fc873d5..229889eb2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java @@ -1,13 +1,22 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.CommissionSection; import org.dromara.system.domain.SysTenantAccount; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.system.domain.bo.SysTenantAccountBo; import org.dromara.system.domain.vo.CommissionSectionVo; import org.dromara.system.domain.vo.SysTenantAccountVo; @Mapper public interface SysTenantAccountMapper extends BaseMapperPlus { + + /** + * 分页查询租户账户列表（关联租户表获取店铺名称） + */ + IPage selectTenantAccountPage(Page page, @Param("bo") SysTenantAccountBo bo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java index bd855e3c8..00a4abf8e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java @@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.system.domain.CommissionSection; import org.dromara.system.domain.SysTenantAccount; import org.dromara.system.domain.bo.SysTenantAccountBo; +import org.dromara.system.domain.vo.SysTenantAccountVo; import java.util.List; public interface ISysTenantAccountService extends IService { IPage pageWithTenant(Page page, SysTenantAccountBo bo); + IPage selectTenantAccountPage(Page page, SysTenantAccountBo bo); List list(SysTenantAccountBo bo); SysTenantAccount getById(Long id); boolean save(SysTenantAccount po); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java index a51a7f48b..e0251519f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.dromara.system.domain.SysTenantAccount; import org.dromara.system.domain.bo.SysTenantAccountBo; +import org.dromara.system.domain.vo.SysTenantAccountVo; import org.dromara.system.mapper.SysTenantAccountMapper; import org.dromara.system.service.ISysTenantAccountService; import org.springframework.stereotype.Service; @@ -24,6 +25,11 @@ public class SysTenantAccountServiceImpl extends ServiceImpl selectTenantAccountPage(Page page, SysTenantAccountBo bo) { + return mapper.selectTenantAccountPage(page, bo); + } + @Override public List list(SysTenantAccountBo bo) { LambdaQueryWrapper wrapper = buildWrapper(bo); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml new file mode 100644 index 000000000..e308bc394 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java index 25c55c31a..64845cbe7 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java @@ -29,7 +29,7 @@ public class DivideController { @Tag(name = "查询列表") @PostMapping("/list") - public R> list(@RequestBody DivideBO bo, @RequestBody Page page) { + public R> slist(@RequestBody DivideBO bo, @RequestBody Page page) { Page pages = service.page(page, bo.toWrapper()); return R.ok(convert.toVO(pages)); }