moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代理添加全球国家代理

Browse Source
This commit is contained in:
hokli
2025-09-10 15:52:57 +08:00
parent 64eb667638
commit 3d304e0d73
9 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java
View File

@@ -37,7 +37,9 @@ public class ChargeRegionAdminServiceImpl implements ChargeRegionAdminService {
@Override
public List<ChargeRegion> list() {
return chargeRegionService.list();
return chargeRegionService.lambdaQuery()
.orderByAsc(ChargeRegion::getSeq)
.list();
}
@Override

60
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeUserAdminServiceImpl.java
View File

@@ -239,36 +239,40 @@ public class RechargeUserAdminServiceImpl implements RechargeUserAdminService {
}
private long saveRechargeUserRegion(List<RechargeUserRegionAdminDto> 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<RechargeUserRegion> rechargeUserRegions = rechargeUserRegionService.list(Wrappers.<RechargeUserRegion>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<RechargeUserRegion> rechargeUserRegions = rechargeUserRegionService.list(Wrappers.<RechargeUserRegion>lambdaQuery()
.eq(RechargeUserRegion::getUid, uid)
.eq(RechargeUserRegion::getType, userRegionType));
if (CollectionUtil.isNotEmpty(rechargeUserRegions)) {
rechargeUserRegion = rechargeUserRegions.get(0);
} else {
rechargeUserRegionService.remove(Wrappers.<RechargeUserRegion>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.<RechargeUserRegion>lambdaQuery()
.eq(RechargeUserRegion::getUid, uid)
.eq(RechargeUserRegion::getType, userRegionType));
}
}
return type;