查询统计
This commit is contained in:
parent
2d894f563d
commit
a7534e89f3
|
@ -2,10 +2,12 @@ package com.ruoyi.business.controller;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.ruoyi.business.domain.BusIntegralRecord;
|
import com.ruoyi.business.domain.BusIntegralRecord;
|
||||||
import com.ruoyi.business.service.IBusIntegralRecordService;
|
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.SysDept;
|
||||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||||
|
@ -45,6 +47,10 @@ public class BusAgentInfoController extends BaseController
|
||||||
{
|
{
|
||||||
@Autowired
|
@Autowired
|
||||||
private IBusAgentInfoService busAgentInfoService;
|
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)
|
public TableDataInfo list(BusAgentInfo busAgentInfo)
|
||||||
{
|
{
|
||||||
startPage();
|
startPage();
|
||||||
|
LoginUser user = SecurityUtils.getLoginUser();
|
||||||
|
busAgentInfo.setSuperiorAgentCode(user.getUserId());
|
||||||
List<BusAgentInfo> list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo);
|
List<BusAgentInfo> list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo);
|
||||||
return getDataTable(list);
|
List<BusAgentInfo> 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -38,30 +38,30 @@ public class BusAgentInfo extends BaseEntity
|
||||||
|
|
||||||
/** 授权店铺数 */
|
/** 授权店铺数 */
|
||||||
@Excel(name = "授权店铺数")
|
@Excel(name = "授权店铺数")
|
||||||
private Long grantStoreNum;
|
private int grantStoreNum;
|
||||||
|
|
||||||
/** 运营店铺数 */
|
/** 运营店铺数 */
|
||||||
@Excel(name = "运营店铺数")
|
@Excel(name = "运营店铺数")
|
||||||
private Long operateStoreNum;
|
private int operateStoreNum;
|
||||||
|
|
||||||
/** 昨日消耗积分数 */
|
/** 昨日消耗积分数 */
|
||||||
@Excel(name = "昨日消耗积分数")
|
@Excel(name = "昨日消耗积分数")
|
||||||
private Long lastUseIntegralNum;
|
private int lastUseIntegralNum;
|
||||||
|
|
||||||
/** 昨日好评量 */
|
/** 昨日好评量 */
|
||||||
@Excel(name = "昨日好评量")
|
@Excel(name = "昨日好评量")
|
||||||
private Long lastPositiveReviewsNum;
|
private int lastPositiveReviewsNum;
|
||||||
|
|
||||||
/** AI时长余额 */
|
/** AI时长余额 */
|
||||||
@Excel(name = "AI时长余额")
|
@Excel(name = "AI时长余额")
|
||||||
private Long aiDurationBalance;
|
private int aiDurationBalance;
|
||||||
private Long aiDurationBalance1;
|
private int aiDurationBalance1;
|
||||||
|
|
||||||
public Long getAiDurationBalance1() {
|
public int getAiDurationBalance1() {
|
||||||
return aiDurationBalance1;
|
return aiDurationBalance1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAiDurationBalance1(Long aiDurationBalance1) {
|
public void setAiDurationBalance1(int aiDurationBalance1) {
|
||||||
this.aiDurationBalance1 = aiDurationBalance1;
|
this.aiDurationBalance1 = aiDurationBalance1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ public class BusAgentInfo extends BaseEntity
|
||||||
|
|
||||||
/** 登录次数 */
|
/** 登录次数 */
|
||||||
@Excel(name = "登录次数")
|
@Excel(name = "登录次数")
|
||||||
private Long loginNum;
|
private int loginNum;
|
||||||
private String integral;
|
private String integral;
|
||||||
private String integral1;
|
private String integral1;
|
||||||
|
|
||||||
|
@ -184,48 +184,48 @@ public class BusAgentInfo extends BaseEntity
|
||||||
{
|
{
|
||||||
return superiorAgentAccount;
|
return superiorAgentAccount;
|
||||||
}
|
}
|
||||||
public void setGrantStoreNum(Long grantStoreNum)
|
public void setGrantStoreNum(int grantStoreNum)
|
||||||
{
|
{
|
||||||
this.grantStoreNum = grantStoreNum;
|
this.grantStoreNum = grantStoreNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getGrantStoreNum()
|
public int getGrantStoreNum()
|
||||||
{
|
{
|
||||||
return grantStoreNum;
|
return grantStoreNum;
|
||||||
}
|
}
|
||||||
public void setOperateStoreNum(Long operateStoreNum)
|
public void setOperateStoreNum(int operateStoreNum)
|
||||||
{
|
{
|
||||||
this.operateStoreNum = operateStoreNum;
|
this.operateStoreNum = operateStoreNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getOperateStoreNum()
|
public int getOperateStoreNum()
|
||||||
{
|
{
|
||||||
return operateStoreNum;
|
return operateStoreNum;
|
||||||
}
|
}
|
||||||
public void setLastUseIntegralNum(Long lastUseIntegralNum)
|
public void setLastUseIntegralNum(int lastUseIntegralNum)
|
||||||
{
|
{
|
||||||
this.lastUseIntegralNum = lastUseIntegralNum;
|
this.lastUseIntegralNum = lastUseIntegralNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getLastUseIntegralNum()
|
public int getLastUseIntegralNum()
|
||||||
{
|
{
|
||||||
return lastUseIntegralNum;
|
return lastUseIntegralNum;
|
||||||
}
|
}
|
||||||
public void setLastPositiveReviewsNum(Long lastPositiveReviewsNum)
|
public void setLastPositiveReviewsNum(int lastPositiveReviewsNum)
|
||||||
{
|
{
|
||||||
this.lastPositiveReviewsNum = lastPositiveReviewsNum;
|
this.lastPositiveReviewsNum = lastPositiveReviewsNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getLastPositiveReviewsNum()
|
public int getLastPositiveReviewsNum()
|
||||||
{
|
{
|
||||||
return lastPositiveReviewsNum;
|
return lastPositiveReviewsNum;
|
||||||
}
|
}
|
||||||
public void setAiDurationBalance(Long aiDurationBalance)
|
public void setAiDurationBalance(int aiDurationBalance)
|
||||||
{
|
{
|
||||||
this.aiDurationBalance = aiDurationBalance;
|
this.aiDurationBalance = aiDurationBalance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getAiDurationBalance()
|
public int getAiDurationBalance()
|
||||||
{
|
{
|
||||||
return aiDurationBalance;
|
return aiDurationBalance;
|
||||||
}
|
}
|
||||||
|
@ -247,12 +247,12 @@ public class BusAgentInfo extends BaseEntity
|
||||||
{
|
{
|
||||||
return lastLoginIp;
|
return lastLoginIp;
|
||||||
}
|
}
|
||||||
public void setLoginNum(Long loginNum)
|
public void setLoginNum(int loginNum)
|
||||||
{
|
{
|
||||||
this.loginNum = loginNum;
|
this.loginNum = loginNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getLoginNum()
|
public int getLoginNum()
|
||||||
{
|
{
|
||||||
return loginNum;
|
return loginNum;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class BusIntegralRecord extends BaseEntity
|
||||||
|
|
||||||
/** 积分变更数值 */
|
/** 积分变更数值 */
|
||||||
@Excel(name = "积分变更数值")
|
@Excel(name = "积分变更数值")
|
||||||
private Long integralUpdateNum;
|
private int integralUpdateNum;
|
||||||
|
|
||||||
/** 变更时间 */
|
/** 变更时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
@ -43,7 +43,7 @@ public class BusIntegralRecord extends BaseEntity
|
||||||
|
|
||||||
/** 积分余额 */
|
/** 积分余额 */
|
||||||
@Excel(name = "积分余额")
|
@Excel(name = "积分余额")
|
||||||
private Long integralBalance;
|
private int integralBalance;
|
||||||
|
|
||||||
/** 代理备注 */
|
/** 代理备注 */
|
||||||
@Excel(name = "代理备注")
|
@Excel(name = "代理备注")
|
||||||
|
@ -85,12 +85,12 @@ public class BusIntegralRecord extends BaseEntity
|
||||||
{
|
{
|
||||||
return updateType;
|
return updateType;
|
||||||
}
|
}
|
||||||
public void setIntegralUpdateNum(Long integralUpdateNum)
|
public void setIntegralUpdateNum(int integralUpdateNum)
|
||||||
{
|
{
|
||||||
this.integralUpdateNum = integralUpdateNum;
|
this.integralUpdateNum = integralUpdateNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getIntegralUpdateNum()
|
public int getIntegralUpdateNum()
|
||||||
{
|
{
|
||||||
return integralUpdateNum;
|
return integralUpdateNum;
|
||||||
}
|
}
|
||||||
|
@ -103,12 +103,12 @@ public class BusIntegralRecord extends BaseEntity
|
||||||
{
|
{
|
||||||
return integralUpdateTime;
|
return integralUpdateTime;
|
||||||
}
|
}
|
||||||
public void setIntegralBalance(Long integralBalance)
|
public void setIntegralBalance(int integralBalance)
|
||||||
{
|
{
|
||||||
this.integralBalance = integralBalance;
|
this.integralBalance = integralBalance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getIntegralBalance()
|
public int getIntegralBalance()
|
||||||
{
|
{
|
||||||
return integralBalance;
|
return integralBalance;
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,4 +76,6 @@ public interface IBusStoreInfoService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo);
|
int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo);
|
||||||
|
|
||||||
|
int getStoreNum(String agentAccount);
|
||||||
}
|
}
|
||||||
|
|
|
@ -130,6 +130,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
busAgentInfo.setSuperiorAgentCode(loginUser.getUserId());
|
busAgentInfo.setSuperiorAgentCode(loginUser.getUserId());
|
||||||
busAgentInfo.setSuperiorAgentAccount(loginUser.getUsername());
|
busAgentInfo.setSuperiorAgentAccount(loginUser.getUsername());
|
||||||
busAgentInfo.setDelStatus("1");
|
busAgentInfo.setDelStatus("1");
|
||||||
|
busAgentInfo.setCreateTime(new Date());
|
||||||
Long[] roles = {101L};
|
Long[] roles = {101L};
|
||||||
user.setRoleIds(roles);
|
user.setRoleIds(roles);
|
||||||
userService.insertUser(user);
|
userService.insertUser(user);
|
||||||
|
@ -145,10 +146,10 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
record.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
record.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
||||||
|
|
||||||
BusAgentInfo temp = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getId());
|
BusAgentInfo temp = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getId());
|
||||||
int oldValue = temp.getAiDurationBalance().intValue();
|
int oldValue = temp.getAiDurationBalance();
|
||||||
int newValue = busAgentInfo.getAiDurationBalance1().intValue();
|
int newValue = busAgentInfo.getAiDurationBalance1();
|
||||||
busAgentInfo.setAiDurationBalance(Long.valueOf(oldValue+newValue));
|
busAgentInfo.setAiDurationBalance((oldValue+newValue));
|
||||||
record.setIntegralBalance(Long.valueOf(oldValue+newValue));
|
record.setIntegralBalance((oldValue+newValue));
|
||||||
record.setCreateTime(new Date());
|
record.setCreateTime(new Date());
|
||||||
|
|
||||||
recordService.insertBusIntegralRecord(record);
|
recordService.insertBusIntegralRecord(record);
|
||||||
|
|
|
@ -34,15 +34,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="agentName != null and agentName != ''"> and agent_name like concat('%', #{agentName}, '%')</if>
|
<if test="agentName != null and agentName != ''"> and agent_name like concat('%', #{agentName}, '%')</if>
|
||||||
<if test="superiorAgentCode != null "> and superior_agent_code = #{superiorAgentCode}</if>
|
<if test="superiorAgentCode != null "> and superior_agent_code = #{superiorAgentCode}</if>
|
||||||
<if test="superiorAgentAccount != null and superiorAgentAccount != ''"> and superior_agent_account = #{superiorAgentAccount}</if>
|
<if test="superiorAgentAccount != null and superiorAgentAccount != ''"> and superior_agent_account = #{superiorAgentAccount}</if>
|
||||||
<if test="grantStoreNum != null "> and grant_store_num = #{grantStoreNum}</if>
|
<!-- <if test="grantStoreNum != null "> and grant_store_num = #{grantStoreNum}</if>-->
|
||||||
<if test="operateStoreNum != null "> and operate_store_num = #{operateStoreNum}</if>
|
<!-- <if test="operateStoreNum != null "> and operate_store_num = #{operateStoreNum}</if>-->
|
||||||
<if test="lastUseIntegralNum != null "> and last_use_integral_num = #{lastUseIntegralNum}</if>
|
<!-- <if test="lastUseIntegralNum != null "> and last_use_integral_num = #{lastUseIntegralNum}</if>-->
|
||||||
<if test="lastPositiveReviewsNum != null "> and last_positive_reviews_num = #{lastPositiveReviewsNum}</if>
|
<!-- <if test="lastPositiveReviewsNum != null "> and last_positive_reviews_num = #{lastPositiveReviewsNum}</if>-->
|
||||||
<if test="aiDurationBalance != null "> and ai_duration_balance = #{aiDurationBalance}</if>
|
<!-- <if test="aiDurationBalance != null "> and ai_duration_balance = #{aiDurationBalance}</if>-->
|
||||||
<if test="lastLoginTime != null "> and last_login_time = #{lastLoginTime}</if>
|
<if test="lastLoginTime != null "> and last_login_time = #{lastLoginTime}</if>
|
||||||
<if test="lastLoginIp != null and lastLoginIp != ''"> and last_login_ip = #{lastLoginIp}</if>
|
<if test="lastLoginIp != null and lastLoginIp != ''"> and last_login_ip = #{lastLoginIp}</if>
|
||||||
<if test="loginNum != null "> and login_num = #{loginNum}</if>
|
<!-- <if test="loginNum != null "> and login_num = #{loginNum}</if>-->
|
||||||
<if test="integral != null "> and integral = #{integral}</if>
|
<!-- <if test="integral != null "> and integral = #{integral}</if>-->
|
||||||
<if test="createTime != null "> and create_time = #{createTime}</if>
|
<if test="createTime != null "> and create_time = #{createTime}</if>
|
||||||
<if test="delStatus != null and delStatus != ''"> and del_status = #{delStatus}</if>
|
<if test="delStatus != null and delStatus != ''"> and del_status = #{delStatus}</if>
|
||||||
</where>
|
</where>
|
||||||
|
|
Loading…
Reference in New Issue