From a7534e89f3d7feb293611a93c7bedfd726176061 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Mon, 8 Jul 2024 19:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusAgentInfoController.java | 17 +++++++- .../ruoyi/business/domain/BusAgentInfo.java | 42 +++++++++---------- .../business/domain/BusIntegralRecord.java | 12 +++--- .../service/IBusStoreInfoService.java | 2 + .../service/impl/BusAgentInfoServiceImpl.java | 9 ++-- .../mapper/business/BusAgentInfoMapper.xml | 14 +++---- 6 files changed, 57 insertions(+), 39 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java index 80e8540..85b8cc3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java @@ -2,10 +2,12 @@ package com.ruoyi.business.controller; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.ruoyi.business.domain.BusIntegralRecord; import com.ruoyi.business.service.IBusIntegralRecordService; +import com.ruoyi.business.service.IBusStoreInfoService; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; @@ -45,6 +47,10 @@ public class BusAgentInfoController extends BaseController { @Autowired private IBusAgentInfoService busAgentInfoService; + @Autowired + private IBusStoreInfoService iBusStoreInfoService; + @Autowired + private ISysUserService iSysUserService; /** * 查询代理管理列表 */ @@ -53,8 +59,17 @@ public class BusAgentInfoController extends BaseController public TableDataInfo list(BusAgentInfo busAgentInfo) { startPage(); + LoginUser user = SecurityUtils.getLoginUser(); + busAgentInfo.setSuperiorAgentCode(user.getUserId()); List list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo); - return getDataTable(list); + List listData = list.stream().map(bean -> { + bean.setGrantStoreNum(iBusStoreInfoService.getStoreNum(bean.getAgentAccount())); + SysUser user1 = iSysUserService.selectUserById(bean.getId()); + bean.setLastLoginIp(user1.getLoginIp()); + bean.setLastLoginTime(user1.getLoginDate()); + return bean; + }).collect(Collectors.toList()); + return getDataTable(listData); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java index 52fcaed..904ea3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java @@ -38,30 +38,30 @@ public class BusAgentInfo extends BaseEntity /** 授权店铺数 */ @Excel(name = "授权店铺数") - private Long grantStoreNum; + private int grantStoreNum; /** 运营店铺数 */ @Excel(name = "运营店铺数") - private Long operateStoreNum; + private int operateStoreNum; /** 昨日消耗积分数 */ @Excel(name = "昨日消耗积分数") - private Long lastUseIntegralNum; + private int lastUseIntegralNum; /** 昨日好评量 */ @Excel(name = "昨日好评量") - private Long lastPositiveReviewsNum; + private int lastPositiveReviewsNum; /** AI时长余额 */ @Excel(name = "AI时长余额") - private Long aiDurationBalance; - private Long aiDurationBalance1; + private int aiDurationBalance; + private int aiDurationBalance1; - public Long getAiDurationBalance1() { + public int getAiDurationBalance1() { return aiDurationBalance1; } - public void setAiDurationBalance1(Long aiDurationBalance1) { + public void setAiDurationBalance1(int aiDurationBalance1) { this.aiDurationBalance1 = aiDurationBalance1; } @@ -76,7 +76,7 @@ public class BusAgentInfo extends BaseEntity /** 登录次数 */ @Excel(name = "登录次数") - private Long loginNum; + private int loginNum; private String integral; private String integral1; @@ -184,48 +184,48 @@ public class BusAgentInfo extends BaseEntity { return superiorAgentAccount; } - public void setGrantStoreNum(Long grantStoreNum) + public void setGrantStoreNum(int grantStoreNum) { this.grantStoreNum = grantStoreNum; } - public Long getGrantStoreNum() + public int getGrantStoreNum() { return grantStoreNum; } - public void setOperateStoreNum(Long operateStoreNum) + public void setOperateStoreNum(int operateStoreNum) { this.operateStoreNum = operateStoreNum; } - public Long getOperateStoreNum() + public int getOperateStoreNum() { return operateStoreNum; } - public void setLastUseIntegralNum(Long lastUseIntegralNum) + public void setLastUseIntegralNum(int lastUseIntegralNum) { this.lastUseIntegralNum = lastUseIntegralNum; } - public Long getLastUseIntegralNum() + public int getLastUseIntegralNum() { return lastUseIntegralNum; } - public void setLastPositiveReviewsNum(Long lastPositiveReviewsNum) + public void setLastPositiveReviewsNum(int lastPositiveReviewsNum) { this.lastPositiveReviewsNum = lastPositiveReviewsNum; } - public Long getLastPositiveReviewsNum() + public int getLastPositiveReviewsNum() { return lastPositiveReviewsNum; } - public void setAiDurationBalance(Long aiDurationBalance) + public void setAiDurationBalance(int aiDurationBalance) { this.aiDurationBalance = aiDurationBalance; } - public Long getAiDurationBalance() + public int getAiDurationBalance() { return aiDurationBalance; } @@ -247,12 +247,12 @@ public class BusAgentInfo extends BaseEntity { return lastLoginIp; } - public void setLoginNum(Long loginNum) + public void setLoginNum(int loginNum) { this.loginNum = loginNum; } - public Long getLoginNum() + public int getLoginNum() { return loginNum; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java index de06791..4dd0ae8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java @@ -34,7 +34,7 @@ public class BusIntegralRecord extends BaseEntity /** 积分变更数值 */ @Excel(name = "积分变更数值") - private Long integralUpdateNum; + private int integralUpdateNum; /** 变更时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -43,7 +43,7 @@ public class BusIntegralRecord extends BaseEntity /** 积分余额 */ @Excel(name = "积分余额") - private Long integralBalance; + private int integralBalance; /** 代理备注 */ @Excel(name = "代理备注") @@ -85,12 +85,12 @@ public class BusIntegralRecord extends BaseEntity { return updateType; } - public void setIntegralUpdateNum(Long integralUpdateNum) + public void setIntegralUpdateNum(int integralUpdateNum) { this.integralUpdateNum = integralUpdateNum; } - public Long getIntegralUpdateNum() + public int getIntegralUpdateNum() { return integralUpdateNum; } @@ -103,12 +103,12 @@ public class BusIntegralRecord extends BaseEntity { return integralUpdateTime; } - public void setIntegralBalance(Long integralBalance) + public void setIntegralBalance(int integralBalance) { this.integralBalance = integralBalance; } - public Long getIntegralBalance() + public int getIntegralBalance() { return integralBalance; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java index 201eb22..f894fbc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java @@ -76,4 +76,6 @@ public interface IBusStoreInfoService * @return 结果 */ int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo); + + int getStoreNum(String agentAccount); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java index d7ea9ab..d66196a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java @@ -130,6 +130,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService busAgentInfo.setSuperiorAgentCode(loginUser.getUserId()); busAgentInfo.setSuperiorAgentAccount(loginUser.getUsername()); busAgentInfo.setDelStatus("1"); + busAgentInfo.setCreateTime(new Date()); Long[] roles = {101L}; user.setRoleIds(roles); userService.insertUser(user); @@ -145,10 +146,10 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService record.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1()); BusAgentInfo temp = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getId()); - int oldValue = temp.getAiDurationBalance().intValue(); - int newValue = busAgentInfo.getAiDurationBalance1().intValue(); - busAgentInfo.setAiDurationBalance(Long.valueOf(oldValue+newValue)); - record.setIntegralBalance(Long.valueOf(oldValue+newValue)); + int oldValue = temp.getAiDurationBalance(); + int newValue = busAgentInfo.getAiDurationBalance1(); + busAgentInfo.setAiDurationBalance((oldValue+newValue)); + record.setIntegralBalance((oldValue+newValue)); record.setCreateTime(new Date()); recordService.insertBusIntegralRecord(record); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml index c76c6f9..51ac255 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml @@ -34,15 +34,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and agent_name like concat('%', #{agentName}, '%') and superior_agent_code = #{superiorAgentCode} and superior_agent_account = #{superiorAgentAccount} - and grant_store_num = #{grantStoreNum} - and operate_store_num = #{operateStoreNum} - and last_use_integral_num = #{lastUseIntegralNum} - and last_positive_reviews_num = #{lastPositiveReviewsNum} - and ai_duration_balance = #{aiDurationBalance} + + + + + and last_login_time = #{lastLoginTime} and last_login_ip = #{lastLoginIp} - and login_num = #{loginNum} - and integral = #{integral} + + and create_time = #{createTime} and del_status = #{delStatus}