代充信息管理添加字段
This commit is contained in:
@@ -34,6 +34,7 @@ public class RechargeUserAdminDto {
|
||||
@ApiModelProperty("星级")
|
||||
private Integer starLevel;
|
||||
private Byte hasCharge;
|
||||
private Byte hasGuildCharge;
|
||||
|
||||
private String subErbanNos;
|
||||
|
||||
|
@@ -122,6 +122,7 @@ public class RechargeUserAdminServiceImpl implements RechargeUserAdminService {
|
||||
}
|
||||
rechargeUser.setStarLevel(param.getStarLevel());
|
||||
rechargeUser.setHasCharge(param.getHasCharge());
|
||||
rechargeUser.setHasGuildCharge(param.getHasGuildCharge());
|
||||
rechargeUser.setUpdateTime(now);
|
||||
rechargeUserService.saveOrUpdate(rechargeUser);
|
||||
|
||||
@@ -179,7 +180,7 @@ public class RechargeUserAdminServiceImpl implements RechargeUserAdminService {
|
||||
rechargeUser.setManageUid(uid);
|
||||
rechargeUser.setHasCharge(param.getHasCharge());
|
||||
rechargeUser.setStarLevel(0);
|
||||
rechargeUser.setHasCharge(param.getHasCharge());
|
||||
rechargeUser.setHasGuildCharge(param.getHasGuildCharge());
|
||||
rechargeUser.setCreateTime(now);
|
||||
}
|
||||
rechargeUser.setType(type);
|
||||
|
@@ -51,6 +51,9 @@ public class RechargeUser {
|
||||
@ApiModelProperty("是否有代充功能,0-否(只有转增功能),1-是")
|
||||
private Byte hasCharge;
|
||||
|
||||
@ApiModelProperty("是否有公会代理功能,0-否(只有转增功能),1-是")
|
||||
private Byte hasGuildCharge;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
|
@@ -23,7 +23,7 @@ public interface RechargeUserMapper extends BaseMapper<RechargeUser> {
|
||||
*/
|
||||
List<RechargeUserVo> getRechargeUserList(@Param("regionCode") String regionCode);
|
||||
|
||||
List<RechargeUserVo> listByPartitionId(@Param("partitionId") Integer partitionId);
|
||||
List<RechargeUserVo> listByPartitionIdByGuildTab(@Param("partitionId") Integer partitionId);
|
||||
|
||||
List<RechargeUserVo> listByManageUid(@Param("manageUids") List<Long> manageUids);
|
||||
|
||||
|
@@ -18,7 +18,7 @@ import static com.accompany.common.constant.ApplicationConstant.PublicParameters
|
||||
*/
|
||||
public interface RechargeUserService extends IService<RechargeUser> {
|
||||
|
||||
List<RechargeUserVo> selectList(Integer partitionId);
|
||||
List<RechargeUserVo> listByPartitionIdByGuildTab(Integer partitionId);
|
||||
|
||||
/**
|
||||
* 列表
|
||||
|
@@ -44,8 +44,8 @@ public class RechargeUserServiceImpl extends ServiceImpl<RechargeUserMapper, Rec
|
||||
private JedisService jedisService;
|
||||
|
||||
@Override
|
||||
public List<RechargeUserVo> selectList(Integer partitionId) {
|
||||
List<RechargeUserVo> list = rechargeUserMapper.listByPartitionId(partitionId);
|
||||
public List<RechargeUserVo> listByPartitionIdByGuildTab(Integer partitionId) {
|
||||
List<RechargeUserVo> list = rechargeUserMapper.listByPartitionIdByGuildTab(partitionId);
|
||||
if (CollectionUtil.isEmpty(list)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
@@ -21,7 +21,7 @@
|
||||
where cr.`code` = #{regionCode} and ru.has_charge = 1
|
||||
</select>
|
||||
|
||||
<select id="listByPartitionId" resultType="com.accompany.payment.vo.RechargeUserVo">
|
||||
<select id="listByPartitionIdByGuildTab" resultType="com.accompany.payment.vo.RechargeUserVo">
|
||||
select u.uid,
|
||||
u.erban_no as erbanNo,
|
||||
u.nick,
|
||||
@@ -29,10 +29,11 @@
|
||||
ru.star_level starLevel,
|
||||
ru.star_level starLevelSeq,
|
||||
ru.manage_uid manageUid,
|
||||
ru.has_charge hasCharge
|
||||
ru.has_guild_charge hasCharge,
|
||||
ru.has_guild_charge hasGuildCharge
|
||||
from recharge_user ru
|
||||
inner join users u on ru.uid = u.uid
|
||||
where u.partition_id = #{partitionId} and ru.has_charge = 1
|
||||
where u.partition_id = #{partitionId} and ru.has_guild_charge = 1
|
||||
</select>
|
||||
|
||||
<select id="listByManageUid" resultType="com.accompany.payment.vo.RechargeUserVo">
|
||||
|
@@ -184,7 +184,7 @@ public class GuildUsdChannelService {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
List<RechargeUserVo> rechargeUserVoList = rechargeUserService.selectList(u.getPartitionId());
|
||||
List<RechargeUserVo> rechargeUserVoList = rechargeUserService.listByPartitionIdByGuildTab(u.getPartitionId());
|
||||
if (CollectionUtils.isEmpty(rechargeUserVoList)){
|
||||
return rechargeUserVoList;
|
||||
}
|
||||
|
Reference in New Issue
Block a user