huangqizhen
/
gold-java
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'milestone-20250727-金币重构三期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250727-金币重构三期

lihuilin/hotfix-20250810160509-余额地区传参
lihuilin 2 weeks ago
parent
042617044d bab9bbf578
commit
e4784dcfb6
7 changed files with 45 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java
  2. 4
      src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
  3. 53
      src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java
  4. 7
      src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java
  5. 4
      src/main/resources/jindouMapper/BeanConsumeMapper.xml
  6. 3
      src/main/resources/mapper/AuditMapper.xml
  7. 2
      src/main/resources/mapper/GeneralMapper.xml

7
src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java
View File

@ -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;
}

4
src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
View File

@ -132,8 +132,8 @@ public class GeneralServiceImpl implements GeneralService {
//判断是否是总部
if (list != null && list.contains("总部")||list.contains("研发部")) {
List<String> allMarkets = getMarket(); // 获取所有地区
allMarkets.remove("1"); // 先移除可能存在的总部
allMarkets.add(0, "1"); // 将总部添加到列表第一位
allMarkets.remove("总部"); // 先移除可能存在的总部
allMarkets.add(0, "总部"); // 将总部添加到列表第一位
list = allMarkets; // 更新list
}
return list;

53
src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java
View File

@ -123,33 +123,34 @@ public class MenuServiceImpl implements MenuService {
}
if(roleVo.getMenuIds() == null||roleVo.getMenuIds().isEmpty()) {
return Result.error("角色权限为空");
}else
{
List<Integer> menuIds = new ArrayList<>(roleVo.getMenuIds()); // 创建副本避免修改原始列表
Set<Integer> 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<Integer> menuIds = new ArrayList<>(roleVo.getMenuIds()); // 创建副本避免修改原始列表
// Set<Integer> 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("角色不存在");
}

7
src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java
View File

@ -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<String> list = Arrays.asList(admin.getMarkets().split(","));
GoldUser user = userMapper.selectUserCard(jwcode,list);
List<String> 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("用户查找不到");
}

4
src/main/resources/jindouMapper/BeanConsumeMapper.xml
View File

@ -230,7 +230,7 @@
LIMIT 1)=#{beanConsumeArticle.author}
</if>
<if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
AND fyr.source_name =#{beanConsumeArticle.ArticleName}
AND fyr.source_name =#{beanConsumeArticle.articleName}
</if>
<if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
@ -281,7 +281,7 @@
AND fm.dept = #{beanConsumeArticle.dept}
</if>
<if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
AND fyr.source_name =#{beanConsumeArticle.ArticleName}
AND fyr.source_name =#{beanConsumeArticle.articleName}
</if>
<if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''">
AND (SELECT fm2.nickname

3
src/main/resources/mapper/AuditMapper.xml
View File

@ -134,6 +134,9 @@
<if test="refundAudit.startTime != null and refundAudit.endTime != null ">
AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime}
</if>
<if test="refundAudit.market != null and refundAudit.market != ''">
AND m.name = #{refundAudit.market}
</if>
<if test="refundAudit.auditStatus != null and refundAudit.auditStatus != ''">
AND ugr.audit_status = #{refundAudit.auditStatus}

2
src/main/resources/mapper/GeneralMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.example.demo.mapper.coin.GeneralMapper">
<select id="getMarket" resultType="java.lang.String">
select DISTINCT market from user
select DISTINCT name from market where type=2
</select>
<select id="getALLAdminMarket" resultType="java.lang.String">
select DISTINCT market from admin

Write Preview
Loading…
Cancel
Save