From 3d304e0d73f32954ca3f39ff6448f7fc35dec5c3 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Wed, 10 Sep 2025 15:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=B7=BB=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E7=90=83=E5=9B=BD=E5=AE=B6=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChargeRegionAdminServiceImpl.java | 4 +- .../impl/RechargeUserAdminServiceImpl.java | 60 ++++++++++--------- .../accompany/common/status/BusiStatus.java | 2 + .../accompany/common/constant/Constant.java | 1 + .../accompany/payment/vo/RechargeUserVo.java | 13 +--- .../payment/mapper/RechargeUserMapper.java | 4 +- .../payment/service/RechargeUserService.java | 8 +-- .../service/impl/RechargeUserServiceImpl.java | 19 ++++-- .../resources/mapper/RechargeUserMapper.xml | 13 +++- 9 files changed, 73 insertions(+), 51 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java index 8ba7b714d..0739f1a76 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java @@ -37,7 +37,9 @@ public class ChargeRegionAdminServiceImpl implements ChargeRegionAdminService { @Override public List list() { - return chargeRegionService.list(); + return chargeRegionService.lambdaQuery() + .orderByAsc(ChargeRegion::getSeq) + .list(); } @Override diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeUserAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeUserAdminServiceImpl.java index 4c424ed93..688b7c96f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeUserAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeUserAdminServiceImpl.java @@ -239,36 +239,40 @@ public class RechargeUserAdminServiceImpl implements RechargeUserAdminService { } private long saveRechargeUserRegion(List userRegions, long type, Long uid, Date now) { - if (CollectionUtil.isNotEmpty(userRegions)) { - log.info("userRegions : {}", JSONObject.toJSON(userRegions)); - for (RechargeUserRegionAdminDto userRegion : userRegions) { - String name = userRegion.getName(); - Long userRegionType = userRegion.getType(); - Boolean isCheck = userRegion.getIsCheck(); - Integer seq = userRegion.getSeq(); - if (isCheck) { - type |= userRegionType; - RechargeUserRegion rechargeUserRegion = null; - List rechargeUserRegions = rechargeUserRegionService.list(Wrappers.lambdaQuery() - .eq(RechargeUserRegion::getUid, uid) - .eq(RechargeUserRegion::getType, userRegionType)); - if (CollectionUtil.isNotEmpty(rechargeUserRegions)) { - rechargeUserRegion = rechargeUserRegions.get(0); - } else { - rechargeUserRegion = new RechargeUserRegion(); - rechargeUserRegion.setUid(uid); - rechargeUserRegion.setType(userRegionType); - rechargeUserRegion.setCreateTime(now); - } - rechargeUserRegion.setName(name); - rechargeUserRegion.setSeq(seq); - rechargeUserRegion.setUpdateTime(now); - rechargeUserRegionService.saveOrUpdate(rechargeUserRegion); + if (CollectionUtil.isEmpty(userRegions)) { + return type; + } + log.info("userRegions : {}", JSONObject.toJSON(userRegions)); + for (RechargeUserRegionAdminDto userRegion : userRegions) { + String name = userRegion.getName(); + Long userRegionType = userRegion.getType(); + Boolean isCheck = userRegion.getIsCheck(); + Integer seq = userRegion.getSeq(); + if (isCheck && userRegionType != null && userRegionType == 0) { + continue; + } + if (isCheck) { + type |= userRegionType; + RechargeUserRegion rechargeUserRegion = null; + List rechargeUserRegions = rechargeUserRegionService.list(Wrappers.lambdaQuery() + .eq(RechargeUserRegion::getUid, uid) + .eq(RechargeUserRegion::getType, userRegionType)); + if (CollectionUtil.isNotEmpty(rechargeUserRegions)) { + rechargeUserRegion = rechargeUserRegions.get(0); } else { - rechargeUserRegionService.remove(Wrappers.lambdaQuery() - .eq(RechargeUserRegion::getUid, uid) - .eq(RechargeUserRegion::getType, userRegionType)); + rechargeUserRegion = new RechargeUserRegion(); + rechargeUserRegion.setUid(uid); + rechargeUserRegion.setType(userRegionType); + rechargeUserRegion.setCreateTime(now); } + rechargeUserRegion.setName(name); + rechargeUserRegion.setSeq(seq); + rechargeUserRegion.setUpdateTime(now); + rechargeUserRegionService.saveOrUpdate(rechargeUserRegion); + } else { + rechargeUserRegionService.remove(Wrappers.lambdaQuery() + .eq(RechargeUserRegion::getUid, uid) + .eq(RechargeUserRegion::getType, userRegionType)); } } return type; diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/status/BusiStatus.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/status/BusiStatus.java index 1d231a266..399aed038 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/status/BusiStatus.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/status/BusiStatus.java @@ -985,6 +985,8 @@ public enum BusiStatus { SUPER_BLOCK_NOAUTHORITY(500, "NOAUTHORITY OPERATE"), SUPER_BLOCK_MUST_BLOCK_REASON(500, "MUST SIGN BLOCK REASON"), DAILY_TASK_REWARD_ERROR(500, "DAILY TASK REWARD ERROR"), + RECHARGE_REGION_GIVE_LIMIT(500,"你暂时还未开启该区域业务"), + RECHARGE_REGION_SALARY_LIMIT(500,"该代理暂不代理该区域业务"), ROOM_DAY_DIAMOND_REWARD_DATE_CHECK(500, "TODAY NOT ALLOW RECEIVE"), ; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java index 25bc258f3..e293138fe 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java @@ -4091,5 +4091,6 @@ public class Constant { public static final int ADD = 2; } + public static final String GLOBAL_CODE = "Global"; } diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/vo/RechargeUserVo.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/vo/RechargeUserVo.java index 8e1d1914c..9b189efc9 100644 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/vo/RechargeUserVo.java +++ b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/vo/RechargeUserVo.java @@ -1,21 +1,10 @@ package com.accompany.payment.vo; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; import com.accompany.common.annotation.ReplaceAppDomain; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.PartitionEnum; import com.accompany.payment.model.RechargeUser; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.time.DayOfWeek; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAdjusters; -import java.util.Date; - /** * @author: liaozetao * @date: 2023/8/17 19:02 @@ -73,4 +62,6 @@ public class RechargeUserVo extends RechargeUser { private Integer subNum;//子代理数量 + private Long type; + } diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mapper/RechargeUserMapper.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mapper/RechargeUserMapper.java index 269431e6b..381f89fef 100644 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mapper/RechargeUserMapper.java +++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mapper/RechargeUserMapper.java @@ -23,7 +23,7 @@ public interface RechargeUserMapper extends BaseMapper { */ List getRechargeUserList(@Param("regionCode") String regionCode); - List listByPartitionIdByGuildTab(@Param("partitionId") Integer partitionId); + List listByPartitionIdByGuildTab(@Param("partitionId") Integer partitionId, @Param("regionCode") String regionCode); List listByManageUid(@Param("manageUids") List manageUids); @@ -31,4 +31,6 @@ public interface RechargeUserMapper extends BaseMapper { Integer countByManageUid(@Param("manageUid") Long manageUid); List listByPartitionId(@Param("partitionId") Integer partitionId); + + List regionCodeList(@Param("rechargeUid") Long rechargeUid); } diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/RechargeUserService.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/RechargeUserService.java index 26d825601..7de55cfd7 100644 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/RechargeUserService.java +++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/RechargeUserService.java @@ -1,16 +1,12 @@ package com.accompany.payment.service; -import com.accompany.common.result.BusiResult; import com.accompany.payment.model.RechargeUser; import com.accompany.payment.vo.RechargeUserVo; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.web.bind.annotation.RequestHeader; import java.util.List; import java.util.Map; -import static com.accompany.common.constant.ApplicationConstant.PublicParameters.PUB_UID; - /** * @author: liaozetao * @date: 2023/8/15 11:20 @@ -18,7 +14,7 @@ import static com.accompany.common.constant.ApplicationConstant.PublicParameters */ public interface RechargeUserService extends IService { - List listByPartitionIdByGuildTab(Integer partitionId); + List listByPartitionIdByGuildTab(Integer partitionId, String regionCode); /** * 列表 @@ -54,4 +50,6 @@ public interface RechargeUserService extends IService { List selectListByManageUids(List manageUids); Integer countByManageUid(Long manageUid); + + List regionCodeList(Long rechargeUid); } diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/impl/RechargeUserServiceImpl.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/impl/RechargeUserServiceImpl.java index 20e72d8e7..f2292c10d 100644 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/impl/RechargeUserServiceImpl.java +++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/impl/RechargeUserServiceImpl.java @@ -3,7 +3,6 @@ package com.accompany.payment.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; @@ -22,9 +21,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; +import static com.accompany.common.constant.Constant.GLOBAL_CODE; import static java.util.Collections.EMPTY_MAP; /** @@ -44,8 +47,8 @@ public class RechargeUserServiceImpl extends ServiceImpl listByPartitionIdByGuildTab(Integer partitionId) { - List list = rechargeUserMapper.listByPartitionIdByGuildTab(partitionId); + public List listByPartitionIdByGuildTab(Integer partitionId, String regionCode) { + List list = rechargeUserMapper.listByPartitionIdByGuildTab(partitionId, regionCode); if (CollectionUtil.isEmpty(list)) { return Collections.emptyList(); } @@ -54,6 +57,9 @@ public class RechargeUserServiceImpl extends ServiceImpl selectList(String regionCode) { + if (GLOBAL_CODE.equals(regionCode)) { + return Collections.emptyList(); + } List list = rechargeUserMapper.getRechargeUserList(regionCode); if (CollectionUtil.isEmpty(list)) { return Collections.emptyList(); @@ -144,4 +150,9 @@ public class RechargeUserServiceImpl extends ServiceImpl regionCodeList(Long rechargeUid) { + return baseMapper.regionCodeList(rechargeUid); + } + } diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/RechargeUserMapper.xml b/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/RechargeUserMapper.xml index 0c8ba5c72..e7ca27f0e 100644 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/RechargeUserMapper.xml +++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/RechargeUserMapper.xml @@ -32,8 +32,12 @@ ru.has_guild_charge hasCharge, ru.has_guild_charge hasGuildCharge from recharge_user ru + left join charge_region as cr on ((ru.`type` cr.`type`) != 0) + left join recharge_user_region as rur on rur.`type` = cr.`type` and ru.uid = rur.uid inner join users u on ru.uid = u.uid - where u.partition_id = #{partitionId} and ru.has_guild_charge = 1 + where u.partition_id = #{partitionId} + and ru.has_guild_charge = 1 + and (cr.`code` = #{regionCode} or cr.`code` = 'Global') + + \ No newline at end of file