From a0af42a6acfc7a0ebbb92bffc1816525e508af70 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 十月 2025 16:54:06 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
index f0fbe97..ce89091 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -1,10 +1,9 @@
package com.stylefeng.guns.modular.system.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.controller.resp.TAgentResp;
@@ -16,10 +15,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.IDivisionRecordService;
import com.stylefeng.guns.modular.system.service.ITAgentService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.util.MallBook.model.InterfaceResponse;
-import com.stylefeng.guns.modular.system.util.MallBook.model.QueryBalance;
-import com.stylefeng.guns.modular.system.util.MallBook.util.TrhRequest;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,7 +24,6 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -66,6 +60,9 @@
@Autowired
private IDivisionRecordService divisionRecordService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
@Override
public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status) {
EntityWrapper<TAgent> wrapper = new EntityWrapper<>();
@@ -85,8 +82,8 @@
wrapper.between("createTime",startTime,endTime);
}
// 判断是否为代理商
- if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
- wrapper.eq("id",ShiroKit.getUser().getObjectId());
+ if(Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType() == 3){
+ wrapper.eq("id",shiroExtUtil.getUser().getObjectId());
}
// 状态
if(Objects.nonNull(status)){
@@ -142,15 +139,7 @@
Double aDouble = divisionRecordService.queryTotalMoney(2, agentId);
model.addAttribute("income",aDouble);
- QueryBalance queryBalance = new QueryBalance();
- queryBalance.setUserId(tAgent.getMerchantNumber());
- TrhRequest<QueryBalance> request = new TrhRequest();
- InterfaceResponse execute = request.execute(queryBalance, QueryBalance.SERVICE_CODE);
model.addAttribute("balance", 0);
- if("0000".equals(execute.getCode())){
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- model.addAttribute("balance", jsonObject.getDoubleValue("settledAmount") / 100);
- }
}
@Override
@@ -323,15 +312,7 @@
Double aDouble = divisionRecordService.queryTotalMoney(2, id);
map.put("income",aDouble);
- QueryBalance queryBalance = new QueryBalance();
- queryBalance.setUserId(tAgent.getMerchantNumber());
- TrhRequest<QueryBalance> request = new TrhRequest();
- InterfaceResponse execute = request.execute(queryBalance, QueryBalance.SERVICE_CODE);
map.put("balance", 0);
- if("0000".equals(execute.getCode())){
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- map.put("balance", jsonObject.getDoubleValue("settledAmount") / 100);
- }
return map;
}
}
--
Gitblit v1.7.1