From 8e6131bcc7f511cc6353505e767a631f14d89b2f Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Mon, 4 Aug 2025 13:52:22 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=884=E6=97=A5=E5=9C=B0=E5=8C=BA=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/mapper/coin/MarketMapper.java | 3 +++ .../example/demo/service/coin/MarketService.java | 3 +++ .../demo/serviceImpl/coin/ConsumeServiceImpl.java | 12 ++++++++++++ .../demo/serviceImpl/coin/MarketServiceImpl.java | 10 +++++++++- .../demo/serviceImpl/coin/RechargeServiceImpl.java | 11 +++++++++++ .../demo/serviceImpl/coin/RefundServiceImpl.java | 9 +++++++++ src/main/resources/mapper/ConsumeMapper.xml | 13 +++++++------ src/main/resources/mapper/MarketMapper.xml | 22 ++++++++++++++++++++++ src/main/resources/mapper/RechargeMapper.xml | 18 ++++++++++-------- src/main/resources/mapper/RefundMapper.xml | 13 +++++++------ src/main/resources/mapper/RoleMapper.xml | 4 ++-- 11 files changed, 95 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java index a043938..6377f7a 100644 --- a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java @@ -6,4 +6,7 @@ import java.util.List; public interface MarketMapper { List getMarket(); + + //获取市场id + List getMarketIds(List list); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/coin/MarketService.java b/src/main/java/com/example/demo/service/coin/MarketService.java index 54de093..43437ee 100644 --- a/src/main/java/com/example/demo/service/coin/MarketService.java +++ b/src/main/java/com/example/demo/service/coin/MarketService.java @@ -14,4 +14,7 @@ import java.util.List; **/ public interface MarketService { List selectMarket(); + + //获取市场id + List getMarketIds(List list); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index 3babb05..f15bec1 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -10,6 +10,7 @@ import com.example.demo.domain.vo.coin.Result; import com.example.demo.mapper.coin.ConsumeMapper; import com.example.demo.mapper.coin.UserMapper; import com.example.demo.service.coin.ConsumeService; +import com.example.demo.service.coin.MarketService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; @@ -41,10 +42,15 @@ public class ConsumeServiceImpl implements ConsumeService { @Autowired private UserMapper userMapper; + @Autowired + private MarketService marketService; //消耗明细 @Override public PageInfo selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser){ + //获取市场id + List markets = marketService.getMarketIds(consumeUser.getMarkets()); + consumeUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List consumeUsers = consumeMapper.selectAll(consumeUser); return new PageInfo<>(consumeUsers); @@ -53,6 +59,9 @@ public class ConsumeServiceImpl implements ConsumeService { //消耗金币统计 @Override public Gold statsGold(ConsumeUser consumeUser) { + //获取市场id + List markets = marketService.getMarketIds(consumeUser.getMarkets()); + consumeUser.setMarkets(markets); Gold gold = new Gold(); List consumeUsers = consumeMapper.selectBy(consumeUser); @@ -88,6 +97,9 @@ public class ConsumeServiceImpl implements ConsumeService { //消耗明细筛选 @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) { + //获取市场id + List markets = marketService.getMarketIds(consumeUser.getMarkets()); + consumeUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List consumeUsers = consumeMapper.selectBy(consumeUser); return new PageInfo<>(consumeUsers); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java index 31d028c..b3df7af 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java @@ -15,6 +15,7 @@ import java.util.stream.Collectors; public class MarketServiceImpl implements MarketService { @Autowired private MarketMapper marketMapper; + @Override public List selectMarket() { List markets = marketMapper.getMarket(); @@ -22,10 +23,11 @@ public class MarketServiceImpl implements MarketService { // 2. 构建树形结构（根节点parentId=1） return buildTree(markets, -1); } + private List buildTree(List markets, Integer parentId) { // 过滤出当前父节点的子菜单 List children = markets.stream() - .filter(menu -> Objects.equals(menu.getParentId(), parentId)) + .filter(menu -> Objects.equals(menu.getParentId(), parentId)) .collect(Collectors.toList()); // 过滤出当前父节点的子菜单，同时过滤掉id为9的权限 // List children = allMenus.stream() @@ -39,4 +41,10 @@ public class MarketServiceImpl implements MarketService { return children; } + + @Override + public List getMarketIds(List list) { + return marketMapper.getMarketIds(list); + } + } \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index 3644526..a5c1c5d 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.mapper.coin.RechargeMapper; import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.MarketService; import com.example.demo.service.coin.RechargeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -34,11 +35,17 @@ public class RechargeServiceImpl implements RechargeService { @Autowired private UserMapper userMapper; + @Autowired + private MarketService marketService; + //查询所有充值 @Override public PageInfo selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws Exception{ + //获取市场id + List markets = marketService.getMarketIds(rechargeUser.getMarkets()); + rechargeUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List rechargeUsers = rechargeMapper.selectAll(rechargeUser); return new PageInfo<>(rechargeUsers); @@ -47,6 +54,8 @@ public class RechargeServiceImpl implements RechargeService { //查询筛选充值 @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws Exception{ + List markets = marketService.getMarketIds(rechargeUser.getMarkets()); + rechargeUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List rechargeUsers = rechargeMapper.selectBy(rechargeUser); return new PageInfo<>(rechargeUsers); @@ -55,6 +64,8 @@ public class RechargeServiceImpl implements RechargeService { //统计金币记录 @Override public Gold statsGold(RechargeUser rechargeUser) { + List markets = marketService.getMarketIds(rechargeUser.getMarkets()); + rechargeUser.setMarkets(markets); Gold gold = new Gold(); List rechargeUsers = rechargeMapper.selectBy(rechargeUser); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index 58edfb6..2b9d823 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -4,6 +4,7 @@ import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.mapper.coin.ConsumeMapper; import com.example.demo.mapper.coin.RefundMapper; import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.MarketService; import com.example.demo.service.coin.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -39,10 +40,14 @@ public class RefundServiceImpl implements RefundService { @Autowired private UserMapper userMapper; + @Autowired + private MarketService marketService; //查找全部退款 @Override public PageInfo selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser) throws Exception{ + List markets = marketService.getMarketIds(refundUser.getMarkets()); + refundUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List refundUsers = refundMapper.selectAll(refundUser); return new PageInfo<>(refundUsers); @@ -51,6 +56,8 @@ public class RefundServiceImpl implements RefundService { //统计退款金额 @Override public Gold statsGold(RefundUser refundUser) { + List markets = marketService.getMarketIds(refundUser.getMarkets()); + refundUser.setMarkets(markets); Gold gold = new Gold(); List refundUsers = refundMapper.selectBy(refundUser); @@ -86,6 +93,8 @@ public class RefundServiceImpl implements RefundService { //查找筛选退款 @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser)throws Exception { + List markets = marketService.getMarketIds(refundUser.getMarkets()); + refundUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List refundUsers = refundMapper.selectBy(refundUser); return new PageInfo<>(refundUsers); diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 38d429b..e80e025 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -24,10 +24,10 @@ ugr.type = 1 AND ugr.flag = 1 - + AND ( - u.market LIKE CONCAT('%', #{market}, '%') + u.market = #{market} ) @@ -92,11 +92,12 @@ admin a ON ugr.admin_id = a.id ugr.type = 1 AND ugr.flag = 1 - - AND u.market IN - - #{market} + + AND ( + + u.market = #{market} + ) AND ugr.jwcode = #{jwcode} diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml index 6904cbd..5ed1af2 100644 --- a/src/main/resources/mapper/MarketMapper.xml +++ b/src/main/resources/mapper/MarketMapper.xml @@ -4,4 +4,26 @@ + + + \ No newline at end of file diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index 5ee4e84..3b39d62 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -28,11 +28,12 @@ ugr.type = 0 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 - - AND user.market IN - - #{markets} + + AND ( + + u.market = #{market} + ) @@ -96,11 +97,12 @@ ugr.type = 0 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 - - AND u.market IN - - #{market} + + AND ( + + u.market = #{market} + ) AND ugr.jwcode = #{jwcode} diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 1c12cf7..038e02b 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -26,10 +26,10 @@ ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 - + AND ( - u.market LIKE CONCAT('%', #{market}, '%') + u.market = #{market} ) @@ -95,11 +95,12 @@ admin a ON ugr.admin_id = a.id ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 - - AND u.market IN - - #{market} + + AND ( + + u.market = #{market} + ) AND ugr.jwcode = #{jwcode} diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index 125c3be..fe5cb51 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -37,7 +37,7 @@ SELECT id,role_name FROM role - + AND market IN #{market} @@ -91,7 +91,7 @@ r.market LIKE CONCAT('%', #{market}, '%') - + AND r.market IN #{market}