diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java index 0427fb9..361f886 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import java.math.BigDecimal; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -184,7 +185,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { // 初始化累加器 int countSum = 0; - Double moneySum = 0.0; + BigDecimal moneySum = new BigDecimal("0.0"); // 遍历充值记录并累加金币 for (BeanOnlineRechargeInfo info : beanOnlineRechargeInfos) { @@ -194,13 +195,13 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { } // 累加金额 if (info.getMoney() != null) { - moneySum += info.getMoney(); + moneySum = moneySum.add(new BigDecimal(info.getMoney().toString())); } } // 将累加结果设置到Gold对象 gold.setBeanNum(countSum); - gold.setMoney(moneySum); + gold.setMoney(moneySum.doubleValue()); return gold; } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java index 7879ce8..fc4b374 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java @@ -132,8 +132,8 @@ public class GeneralServiceImpl implements GeneralService { //判断是否是总部 if (list != null && list.contains("总部")||list.contains("研发部")) { List allMarkets = getMarket(); // 获取所有地区 - allMarkets.remove("1"); // 先移除可能存在的总部 - allMarkets.add(0, "1"); // 将总部添加到列表第一位 + allMarkets.remove("总部"); // 先移除可能存在的总部 + allMarkets.add(0, "总部"); // 将总部添加到列表第一位 list = allMarkets; // 更新list } return list; diff --git a/src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java index e88867b..3858e35 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java @@ -123,33 +123,34 @@ public class MenuServiceImpl implements MenuService { } if(roleVo.getMenuIds() == null||roleVo.getMenuIds().isEmpty()) { return Result.error("角色权限为空"); - }else - { - List menuIds = new ArrayList<>(roleVo.getMenuIds()); // 创建副本避免修改原始列表 - Set processedIds = new HashSet<>(menuIds); // 使用Set快速检查存在性 - - // 处理每个菜单ID及其所有父菜单 - for (int i = 0; i < menuIds.size(); i++) { - Integer currentId = menuIds.get(i); - - // ID为1不处理 - if (currentId == 1) continue; - - // 获取父菜单ID - Integer fatherId = menuMapper.selectFatherId(currentId); - - // 递归添加所有父菜单 - while (fatherId != null) { - if (!processedIds.contains(fatherId)) { - menuIds.add(fatherId); - processedIds.add(fatherId); - } - // 继续向上查找父菜单的父菜单 - fatherId = menuMapper.selectFatherId(fatherId); - } - } - roleVo.setMenuIds(menuIds); } +// else +// { +// List menuIds = new ArrayList<>(roleVo.getMenuIds()); // 创建副本避免修改原始列表 +// Set processedIds = new HashSet<>(menuIds); // 使用Set快速检查存在性 +// +// // 处理每个菜单ID及其所有父菜单 +// for (int i = 0; i < menuIds.size(); i++) { +// Integer currentId = menuIds.get(i); +// +// // ID为1不处理 +// if (currentId == 1) continue; +// +// // 获取父菜单ID +// Integer fatherId = menuMapper.selectFatherId(currentId); +// +// // 递归添加所有父菜单 +// while (fatherId != null) { +// if (!processedIds.contains(fatherId)) { +// menuIds.add(fatherId); +// processedIds.add(fatherId); +// } +// // 继续向上查找父菜单的父菜单 +// fatherId = menuMapper.selectFatherId(fatherId); +// } +// } +// roleVo.setMenuIds(menuIds); +// } if(roleMapper.selectByRoleId(roleVo.getId())==null){ return Result.error("角色不存在"); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java index d14404c..fba3c4f 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java @@ -6,6 +6,7 @@ import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.coin.Gold; import com.example.demo.domain.vo.coin.GoldUser; import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.mapper.coin.UserMapper; import com.example.demo.service.coin.UserService; import jakarta.servlet.http.HttpServletRequest; @@ -34,6 +35,8 @@ public class UserServiceImpl implements UserService { @Autowired private UserMapper userMapper; + @Autowired + private MarketMapper marketMapper; //查找用户部分信息 @Override @@ -45,13 +48,15 @@ public class UserServiceImpl implements UserService { Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); if (admin != null) { List list = Arrays.asList(admin.getMarkets().split(",")); - GoldUser user = userMapper.selectUserCard(jwcode,list); + List markets = marketMapper.getMarketIds(list); + GoldUser user = userMapper.selectUserCard(jwcode,markets); return Result.success(user); } else{ return Result.error("用户为空"); } } catch (Exception e) { + e.printStackTrace(); return Result.error("用户查找不到"); } diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index cdf65bd..624e158 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -230,7 +230,7 @@ LIMIT 1)=#{beanConsumeArticle.author} - AND fyr.source_name =#{beanConsumeArticle.ArticleName} + AND fyr.source_name =#{beanConsumeArticle.articleName} @@ -281,7 +281,7 @@ AND fm.dept = #{beanConsumeArticle.dept} - AND fyr.source_name =#{beanConsumeArticle.ArticleName} + AND fyr.source_name =#{beanConsumeArticle.articleName} AND (SELECT fm2.nickname diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 0a54306..17718a8 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -134,6 +134,9 @@ AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime} + + AND m.name = #{refundAudit.market} + AND ugr.audit_status = #{refundAudit.auditStatus} diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml index 74a0fff..06cdbfc 100644 --- a/src/main/resources/mapper/GeneralMapper.xml +++ b/src/main/resources/mapper/GeneralMapper.xml @@ -3,7 +3,7 @@