土耳其实时薪资-bug1

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java

@@ -73,34 +73,33 @@ public class RoomBoomAwardRecordAdminController extends BaseController {
 
         //1 创建IPage分页对象,设置分页参数
         IPage<RoomBoomSign> page=new Page<>(params.getPageNo(),params.getPageSize());
-        LambdaQueryWrapper<RoomBoomSign> wrapper = new LambdaQueryWrapper<>();
+        Long uid = null;
+        Long roomUid = null;
         if (params.getRoomErbanNo() != null){
             Users erbanNo = usersService.getUserByErbanNo(params.getRoomErbanNo());
             if (erbanNo == null) {
                 throw new AdminServiceException(BusiStatus.SERVERERROR, "房间id不存在");
             }
-            wrapper.eq(RoomBoomSign::getRoomUid,erbanNo.getUid());
+            roomUid = erbanNo.getUid();
         }
         if (params.getErbanNo() != null){
             Users erbanNo = usersService.getUserByErbanNo(params.getErbanNo());
             if (erbanNo == null) {
                 throw new AdminServiceException(BusiStatus.SERVERERROR, "触发者id不存在");
             }
-            wrapper.eq(RoomBoomSign::getUid,erbanNo.getUid());
+            uid = erbanNo.getUid();
         }
-        if (params.getLevel() != null){
-            wrapper.eq(RoomBoomSign::getLevel,params.getLevel());
+        Date startTime = null, endTime = null;
+        if (StringUtils.isNotEmpty(params.getStartTime())) {
+            startTime = DateUtil.parseDateTime(params.getStartTime());
         }
-        if (StringUtils.isNotEmpty(params.getStartTime())){
-            wrapper.ge(RoomBoomSign::getCreateTime, (Date)DateUtil.parseDateTime(params.getStartTime()));
+        if (StringUtils.isNotEmpty(params.getEndTime())) {
+            endTime = DateUtil.parseDateTime(params.getEndTime());
         }
-        if (StringUtils.isNotEmpty(params.getEndTime())){
-            wrapper.le(RoomBoomSign::getCreateTime, (Date)DateUtil.parseDateTime(params.getEndTime()));
-        }
-        wrapper.eq(RoomBoomSign::getStatus,2);
-        wrapper.orderByDesc(RoomBoomSign::getId);
         //2 执行分页查询
-        IPage<RoomBoomSign> boomSignIPage = roomBoomSignService.page(page, wrapper);
+        IPage<RoomBoomSign> boomSignIPage = roomBoomSignService.list(page, uid, roomUid, params.getLevel(),
+                startTime, endTime, params.getPartitionId());
+
         Page<RoomBoomSignVO> resultVo = new Page<>();
         resultVo.setTotal(boomSignIPage.getTotal());
         List<RoomBoomSignVO> roomBoomSignVOS = new ArrayList<>();

accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/UsersMapper.java

@@ -76,4 +76,6 @@ public interface UsersMapper {
 
 
     List<Users> listUid(@Param("start") Integer start, @Param("len") Integer len);
+
+    Integer recharegeCount(@Param("uid") Long uid);
 }

accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/user/UsersBaseService.java

@@ -22,7 +22,6 @@ import com.google.gson.reflect.TypeToken;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
@@ -523,4 +522,9 @@ public class UsersBaseService extends BaseService {
         deleteUserRelateCache(uid.toString());
     }
 
+
+    public Integer rechargeUserCount(Long uid) {
+        return usersMapper.recharegeCount(uid);
+    }
+
 }

accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/UsersMapper.xml

@@ -1082,4 +1082,8 @@
         /* SHARDINGSPHERE_HINT: WRITE_ROUTE_ONLY=true */
         select uid, partition_id partitionId from users order by uid asc limit #{start},#{len}
     </select>
+
+    <select id="recharegeCount" resultType="java.lang.Integer">
+        select ifnull(count(1),0) from recharge_user where uid = #{uid}
+    </select>
 </mapper>

accompany-base/accompany-common/src/main/java/com/accompany/common/status/BusiStatus.java

@@ -990,6 +990,7 @@ public enum BusiStatus {
     ROOM_DAY_DIAMOND_REWARD_DATE_CHECK(500, "TODAY NOT ALLOW RECEIVE"),
     GUILD_USD_OPT_LIMIT(500, "该交易类型已达到本周交易次数上限"),
     GUILD_MEMBER_REMOVE_LIMIT(500, "仅在每个月1号、2号、3号才可以移除主播"),
+    H5_RECHARGE_USER_NOT_OPEN(1404, "Your account has not enabled this function yet, so it cannot be used."),
     ;
 
     private final int value;

accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java

@@ -1148,4 +1148,14 @@ public class DateTimeUtil {
         return Date.from(eastEightZonedDateTime.toInstant());
     }
 
+    public static Date convertToEastEightZone(Date date, String originalZoneId) {
+        ZonedDateTime cycleBeginDateZoneDate = DateTimeUtil.convertWithZoneId(date, originalZoneId);
+        // 2. 转换为东八区时间
+        ZonedDateTime eastEightZonedDateTime = cycleBeginDateZoneDate
+                .withZoneSameInstant(ZoneId.of("Asia/Shanghai"));
+
+        // 3. 返回Date对象
+        return Date.from(eastEightZonedDateTime.toInstant());
+    }
+
 }

accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mapper/ChargeRecordMapperMgr.java

@@ -82,4 +82,7 @@ public interface ChargeRecordMapperMgr {
                                         @Param("startTime") Date startTime, @Param("endTime") Date endTime);
   List<ChargeRecord> getAllChargeUserAmount(@Param("list") List<Long> uids, @Param("startTime") Date startTime,
                                             @Param("endTime") Date endTime);
+
+  List<ChargeRecord> getRefundGroupUidDateMap(@Param("uids") List<Long> uids, @Param("startTime") Date startTime,
+                             @Param("endTime") Date endTime);
 }

accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/ChargeRecordService.java

@@ -19,7 +19,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 public class ChargeRecordService extends BaseService {
@@ -177,4 +181,12 @@ public class ChargeRecordService extends BaseService {
     public ChargeRecordMapper getChargeRecordMapper() {
         return chargeRecordMapper;
     }
+
+    public Map<Long, ChargeRecord> getRefundGroupUidDateMap(List<Long> uids, Date startTime, Date endTime) {
+        List<ChargeRecord> refundGroupUidDateMap = chargeRecordMapperMgr.getRefundGroupUidDateMap(uids, startTime, endTime);
+        if (CollectionUtils.isEmpty(refundGroupUidDateMap)) {
+            return new HashMap<>();
+        }
+        return refundGroupUidDateMap.stream().collect(Collectors.toMap(ChargeRecord::getUid, Function.identity()));
+    }
 }

accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapperMgr.xml

@@ -404,4 +404,18 @@
         group by uid
     </select>
 
+    <select id="getRefundGroupUidDateMap" resultType="com.accompany.payment.model.ChargeRecord">
+        select uid,
+               sum(amount) amount,
+               sum(total_gold) totalGold
+        from charge_record
+        where refund = 1
+        and create_time &gt;= #{startTime}
+        and create_time &lt; #{endTime}
+        <foreach collection="uids" item="u" open="and uid in(" separator="," close=")">
+            #{u}
+        </foreach>
+        group by uid
+    </select>
+
 </mapper>

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/RoomBoomConstant.java

@@ -115,10 +115,12 @@ public interface RoomBoomConstant {
      * 土耳其：普通100%+lucky5%+Bravo2%
      * 英语区：普通100%+lucky2%+Bravo2%
      * 英语2区：普通100%+lucky5%+Bravo2%
+     * 独联体：普通礼物100%+幸运礼物4%
      * @return
      */
     BigDecimal NORMAL_GIFT_BOOM_RATE = BigDecimal.valueOf(1.0D);
     BigDecimal SUPER_GIFT_BOOM_RATE_AR = BigDecimal.valueOf(0.05D);
+    BigDecimal SUPER_GIFT_BOOM_RATE_SO = BigDecimal.valueOf(0.04D);
     BigDecimal SUPER_GIFT_BOOM_RATE_EN = BigDecimal.valueOf(0.02D);
     BigDecimal BRAVO_GIFT_BOOM_RATE_EN = BigDecimal.valueOf(0.02D);
 
@@ -127,6 +129,8 @@ public interface RoomBoomConstant {
         LUCKY((type, partition) -> {
             if (PartitionEnum.ENGLISH.getId() == partition || PartitionEnum.CHINESE.getId() == partition) {
                 return SUPER_GIFT_BOOM_RATE_EN;
+            } else if (PartitionEnum.SOVIET.getId() == partition) {
+                return SUPER_GIFT_BOOM_RATE_SO;
             }
             return SUPER_GIFT_BOOM_RATE_AR;
         }),

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/resource/RuleCodeEnum.java

@@ -28,6 +28,9 @@ public enum RuleCodeEnum {
     //用户等级
     USER_LEVEL,
 
+    //用户等级限制身份,1-全部用户，2非主播身份
+    USER_LEVEL_LIMIT_ROLE,
+
     //备用字段
     RESERVE,;
 

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guildpolicy2/GuildDiamondStatisticsPolicy2Settle.java

@@ -53,6 +53,10 @@ public class GuildDiamondStatisticsPolicy2Settle implements Serializable {
      * 公会长薪资
      */
     private BigDecimal ownerSalary;
+    /**
+     * 问题薪资
+     */
+    private BigDecimal issueSalary;
     /**
      * 创建时间
      */

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/SimpleGuildVo.java

@@ -10,6 +10,7 @@ public class SimpleGuildVo {
 
     private Integer guildId;
     private String guildName;
+    private Long ownerUid;
     private SimpleUserVo owner;
     private Double weekIncome;
     private String markScore;

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildpolicy/GuildPolicy2AgencyVo.java

@@ -0,0 +1,22 @@
+package com.accompany.business.vo.guildpolicy;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class GuildPolicy2AgencyVo {
+    @ApiModelProperty("周期开始日期yyyy-MM-dd")
+    private String cycleDate;
+
+    @ApiModelProperty("钻石数量")
+    private BigDecimal diamondNum = BigDecimal.ZERO;
+
+    @ApiModelProperty("成员数据")
+    private List<GuildPolicy2MemberVo> memberData = new ArrayList<>();
+
+    private GuildPolicy2SalaryVo guildSalary = new GuildPolicy2SalaryVo();
+}

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildpolicy/GuildPolicy2MemberVo.java

@@ -14,4 +14,12 @@ public class GuildPolicy2MemberVo extends SimpleUserVo {
     private BigDecimal diamondNum;
     @ApiModelProperty("有效天数")
     private Integer micDay;
+    @ApiModelProperty("钻石薪资")
+    private BigDecimal diamondSalary = BigDecimal.ZERO;
+    @ApiModelProperty("时长薪资")
+    private BigDecimal micSalary = BigDecimal.ZERO;
+    @ApiModelProperty("公会长薪资")
+    private BigDecimal ownerSalary = BigDecimal.ZERO;
+    @ApiModelProperty("问题薪资")
+    private BigDecimal issueSalary = BigDecimal.ZERO;
 }

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildpolicy/GuildPolicy2MyVo.java

@@ -10,23 +10,22 @@ import java.util.List;
 
 @ApiModel
 @Data
-public class GuildPolicy2Vo {
+public class GuildPolicy2MyVo {
     @ApiModelProperty("周期开始日期yyyy-MM-dd")
     private String cycleDate;
+    @ApiModelProperty("当前")
+    private String curCycleDate;
 
     @ApiModelProperty("钻石数量")
     private BigDecimal diamondNum = BigDecimal.ZERO;
 
-    @ApiModelProperty("公会钻石数量")
-    private BigDecimal guildDiamondNum = BigDecimal.ZERO;
-
     @ApiModelProperty("上麦有效天数")
     private Integer micDay = 0;
 
-    @ApiModelProperty("成员数据")
-    private List<GuildPolicy2MemberVo> memberData = new ArrayList<>();
-
     @ApiModelProperty("我的数据")
     private List<GuildPolicy2PersonalVo> myData = new ArrayList<>();
 
+    @ApiModelProperty("我的薪资")
+    private GuildPolicy2SalaryVo mySalary;
+
 }

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildpolicy/GuildPolicy2SalaryVo.java

@@ -0,0 +1,45 @@
+package com.accompany.business.vo.guildpolicy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel
+@Data
+public class GuildPolicy2SalaryVo {
+    @ApiModelProperty("钻石薪资")
+    private BigDecimal diamondSalary = BigDecimal.ZERO;
+    @ApiModelProperty("时长薪资")
+    private BigDecimal micSalary = BigDecimal.ZERO;
+    @ApiModelProperty("公会长薪资")
+    private BigDecimal ownerSalary = BigDecimal.ZERO;
+    @ApiModelProperty("问题薪资")
+    private BigDecimal issueSalary = BigDecimal.ZERO;
+
+    @ApiModelProperty("钻石数量")
+    private BigDecimal diamondNum = BigDecimal.ZERO;
+    @ApiModelProperty("有效天数")
+    private Integer micDay = 0;
+
+
+    @ApiModelProperty("当前档位流水开始值")
+    private BigDecimal curLevelDiamondNum = BigDecimal.ZERO;
+    @ApiModelProperty("当前档位流水开始值描述")
+    private String curLevelName = "";
+    @ApiModelProperty("当前档位在麦时长达标值")
+    private Integer curLevelMicDay = 0;
+    @ApiModelProperty("下一档开始值")
+    private BigDecimal nextLevelDiamondNum = BigDecimal.ZERO;
+    @ApiModelProperty("下一档开始值描述")
+    private String nextLevelName = "";
+
+
+}

accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildDiamondStatisticsDayMapper.java

@@ -4,6 +4,7 @@ import com.accompany.business.model.guild.GuildDiamondStatisticsDay;
 import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo;
 import com.accompany.business.vo.guild.GuildInfoVo;
 import com.accompany.business.vo.guild.GuildMemberDiamondStatisticsDayVo;
+import com.accompany.business.vo.guild.SimpleGuildVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,4 +50,6 @@ public interface GuildDiamondStatisticsDayMapper extends BaseMapper<GuildDiamond
 
     List<GuildDiamondStatisticsDayVo> listByStatDateGuildIds(@Param("startDate")String startDate, @Param("endDate")String endDate,
                                                      @Param("guildIds") List<Integer> guildIds, @Param("partitionId") Integer partitionId);
+
+    List<SimpleGuildVo> listRank(@Param("ipage") IPage<SimpleGuildVo> ipage, @Param("partitionId") Integer partitionId, @Param("startDate")String startDate);
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guildpolicy2/GuildDiamondStatisticsPolicy2SettleMapper.java

@@ -24,4 +24,7 @@ public interface GuildDiamondStatisticsPolicy2SettleMapper extends BaseMapper<Gu
                                                    @Param("startDate")String startDate,
                                                    @Param("guildId") Integer guildId, @Param("uid") Long uid,
                                                    @Param("partitionId") Integer partitionId);
+
+    List<GuildDiamondStatisticsPolicy2Settle> groupByMemberStatDate(@Param("cycleDate") String cycleDate, @Param("partitionId") Integer partitionId,
+                                                                    @Param("guildMemberId") Long guildMemberId, @Param("guildId") Integer guildId);
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java

@@ -2,8 +2,10 @@ package com.accompany.business.mybatismapper.room;
 
 import com.accompany.business.model.room.RoomBoomSign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,4 +36,8 @@ public interface RoomBoomSignMapper extends BaseMapper<RoomBoomSign> {
      * @return 开奖情况
      */
     RoomBoomSign getOneByRecordIdAndLevel(@Param("recordId") Long recordId, @Param("level") Integer level);
+
+    IPage<RoomBoomSign> list(@Param("page") IPage<RoomBoomSign> page, @Param("roomUid") Long roomUid, @Param("uid") Long uid,
+                             @Param("level") Integer level, @Param("startTime") Date startTime, @Param("endTime") Date endTime,
+                             @Param("partitionId") Integer partitionId);
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java

@@ -5,6 +5,7 @@ import com.accompany.business.model.guild.GuildMember;
 import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo;
 import com.accompany.business.vo.guild.GuildInfoVo;
 import com.accompany.business.vo.guild.GuildMemberDiamondStatisticsDayVo;
+import com.accompany.business.vo.guild.SimpleGuildVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -40,4 +41,6 @@ public interface GuildDiamondStatisticsDayService extends IService<GuildDiamondS
     Map<Integer, Double> mapByStatDate(String statDate, String endDate, int partitionId, List<Integer> guildIds);
 
     RMap<Integer, BigDecimal> guildStatDateDiamondMap(Integer partitionId, String statDate);
+
+    List<SimpleGuildVo> listRank(Integer partitionId, String startDate, Integer pageNo, Integer pageSize);
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayServiceImpl.java

@@ -7,6 +7,7 @@ import com.accompany.business.mybatismapper.guild.GuildDiamondStatisticsDayMappe
 import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo;
 import com.accompany.business.vo.guild.GuildInfoVo;
 import com.accompany.business.vo.guild.GuildMemberDiamondStatisticsDayVo;
+import com.accompany.business.vo.guild.SimpleGuildVo;
 import com.accompany.core.enumeration.PartitionEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -100,4 +101,10 @@ public class GuildDiamondStatisticsDayServiceImpl extends ServiceImpl<GuildDiamo
                 new TypedJsonJacksonCodec(Integer.class, BigDecimal.class));
     }
 
+    @Override
+    public List<SimpleGuildVo> listRank(Integer partitionId, String startDate, Integer pageNo, Integer pageSize) {
+        IPage<SimpleGuildVo> page = new Page<>(pageNo, pageSize, false);
+        return baseMapper.listRank(page, partitionId, startDate);
+    }
+
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java

@@ -1,5 +1,6 @@
 package com.accompany.business.service.guild;
 
+import cn.hutool.core.date.DateUtil;
 import com.accompany.business.constant.guild.GuildConstant;
 import com.accompany.business.event.GuildMemberStatusChangeEvent;
 import com.accompany.business.model.UserPurse;
@@ -93,6 +94,8 @@ public class GuildManagerService {
     private UserPurseService userPurseService;
     @Autowired
     private UploadAvatarService uploadAvatarService;
+    @Autowired
+    private GuildDiamondStatisticsDayService guildDiamondStatisticsDayService;
 
     @SneakyThrows
     public GuildVo getGuildVo(Long uid) {
@@ -484,7 +487,7 @@ public class GuildManagerService {
         return listGuildMember(guildMember.getGuildId(), GuildConstant.RoleType.MANAGER);
     }
 
-    public List<SimpleGuildVo> listRank(Long uid) {
+    public List<SimpleGuildVo> listRank(Long uid, Integer pageNo, Integer pageSize) {
         GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(uid);
         if (null != guildMember){
             throw new ServiceException(BusiStatus.HAS_ONE_HALL);
@@ -495,12 +498,48 @@ public class GuildManagerService {
             throw new ServiceException(BusiStatus.USERNOTEXISTS);
         }
 
-        List<Guild> guildList = guildService.listVaildGuildByPartitionId(u.getPartitionId());
+        Integer partitionId = u.getPartitionId();
+        List<SimpleGuildVo> simpleGuildVos;
+        if (PartitionEnum.SOVIET.getId() == partitionId) {
+            Date offsetDay = DateUtil.offsetDay(new Date(), -60);
+            simpleGuildVos = guildDiamondStatisticsDayService.listRank(partitionId, DateUtil.formatDate(offsetDay), pageNo, pageSize);
+        } else {
+            simpleGuildVos = this.listRank(partitionId);
+        }
+        if (CollectionUtils.isEmpty(simpleGuildVos)) {
+            return Collections.emptyList();
+        }
+
+        List<Integer> guildIds = simpleGuildVos.stream().map(SimpleGuildVo::getGuildId).collect(Collectors.toList());
+        Map<Integer, GuildSSRankDetailVo> ssMarkMap = ssGuildService.getSSMarkByGuildId(partitionId, guildIds);
+        Map<Integer, Integer> memberNumMap = guildService.getGuildMemberNumMapByGuildIds(guildIds);
+        List<Long> ownerUids = simpleGuildVos.stream().map(SimpleGuildVo::getOwnerUid).collect(Collectors.toList());
+        Map<Long, SimpleUserVo> ownerErbanNoMap = usersService.getSimpleUsersByUid(ownerUids);
+        for (SimpleGuildVo simpleGuildVo : simpleGuildVos) {
+            Integer guildId = simpleGuildVo.getGuildId();
+            simpleGuildVo.setOwner(ownerErbanNoMap.get(simpleGuildVo.getOwnerUid()));
+
+            GuildSSRankDetailVo guildSSRankDetailVo = ssMarkMap.get(guildId);
+            if (guildSSRankDetailVo != null) {
+                simpleGuildVo.setMarkScore(guildSSRankDetailVo.getMarkScore());
+                simpleGuildVo.setSsLevel(guildSSRankDetailVo.getSsLevel());
+            }
+            Integer memberNum = memberNumMap.get(guildId);
+            memberNum = memberNum == null ? 0 : memberNum;
+            simpleGuildVo.setMemberNum(memberNum);
+        }
+
+        return simpleGuildVos;
+    }
+
+    public List<SimpleGuildVo> listRank(Integer partitionId) {
+
+        List<Guild> guildList = guildService.listVaildGuildByPartitionId(partitionId);
         if (CollectionUtils.isEmpty(guildList)){
             return Collections.emptyList();
         }
-        PartitionInfo partitionInfo = partitionInfoService.getById(u.getPartitionId());
-        Map<Integer, Double> weekIncomeMap = guildRankService.getWeekRankScoreMap(u.getPartitionId(),
+        PartitionInfo partitionInfo = partitionInfoService.getById(partitionId);
+        Map<Integer, Double> weekIncomeMap = guildRankService.getWeekRankScoreMap(partitionId,
                 null != partitionInfo? partitionInfo.getZoneId(): ZoneId.systemDefault().getId());
 
         List<SimpleGuildVo> voList = new ArrayList<>();
@@ -516,18 +555,8 @@ public class GuildManagerService {
             vo.setGuildId(guild.getId());
             vo.setGuildName(guild.getName());
             vo.setMemberNumLimit(guild.getMemberNumLimit());
-            SimpleUserVo ownerVo = usersService.getSimpleUserByUid(guild.getOwnerUid());
-            vo.setOwner(ownerVo);
 
             vo.setWeekIncome(weekIncomeMap.getOrDefault(guild.getId(), 0D));
-            GuildSSRankDetailVo guildSSRankDetailVo = ssMarkMap.get(guild.getId());
-            if (guildSSRankDetailVo != null) {
-                    vo.setMarkScore(guildSSRankDetailVo.getMarkScore());
-                    vo.setSsLevel(guildSSRankDetailVo.getSsLevel());
-            }
-            Integer memberNum = memberNumMap.get(guild.getId());
-            memberNum = memberNum == null ? 0 : memberNum;
-            vo.setMemberNum(memberNum);
             voList.add(vo);
         }
 

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildDiamondStatisticsPolicy2SettleService.java

@@ -6,6 +6,7 @@ import com.accompany.business.vo.guildpolicy.GuildPolicy2MemberAdminVo;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,4 +32,20 @@ public class GuildDiamondStatisticsPolicy2SettleService extends ServiceImpl<Guil
         Page<GuildPolicy2MemberAdminVo> page = new Page<>(pageNo, pageSize);
         return baseMapper.listByStatDate(page, cycleDate, guildId, uid, partitionId);
     }
+
+    public GuildDiamondStatisticsPolicy2Settle groupByMemberStatDate(String cycleDate, Integer partitionId,
+                                                                                 Long guildMemberId) {
+        List<GuildDiamondStatisticsPolicy2Settle> guildDiamondStatisticsPolicy2Settles =
+                baseMapper.groupByMemberStatDate(cycleDate, partitionId, guildMemberId, null);
+        if (CollectionUtils.isEmpty(guildDiamondStatisticsPolicy2Settles)) {
+            return null;
+        }
+        return guildDiamondStatisticsPolicy2Settles.get(0);
+    }
+
+    public List<GuildDiamondStatisticsPolicy2Settle> groupByGuildMemberStatDate(String cycleDate, Integer partitionId,
+                                                                                     Integer guildId) {
+        return baseMapper.groupByMemberStatDate(cycleDate, partitionId, null, guildId);
+    }
+
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildDiamondWagePolicy2Service.java

@@ -2,6 +2,7 @@ package com.accompany.business.service.guildpolicy2;
 
 import com.accompany.business.model.guildpolicy2.GuildDiamondWagePolicy2;
 import com.accompany.business.mybatismapper.guildpolicy2.GuildDiamondWagePolicy2Mapper;
+import com.accompany.business.vo.guildpolicy.GuildPolicy2SalaryVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -77,11 +78,35 @@ public class GuildDiamondWagePolicy2Service extends ServiceImpl<GuildDiamondWage
         if (CollectionUtils.isEmpty(wageList)){
             return map;
         }
-
         for (GuildDiamondWagePolicy2 wage : wageList) {
             map.put(wage.getDiamondNum(), wage);
         }
         return map;
     }
 
+    public GuildPolicy2SalaryVo getSalaryVo(TreeMap<BigDecimal, GuildDiamondWagePolicy2> treeMap, BigDecimal diamondNum, Integer micDay) {
+        GuildPolicy2SalaryVo salaryVo = new GuildPolicy2SalaryVo();
+        salaryVo.setDiamondNum(diamondNum);
+        salaryVo.setMicDay(micDay);
+
+        Map.Entry<BigDecimal, GuildDiamondWagePolicy2> curDiamondLevel = treeMap.headMap(diamondNum, true).lastEntry();
+        Map.Entry<BigDecimal, GuildDiamondWagePolicy2> nextDiamondLevel = treeMap.tailMap(diamondNum, false).firstEntry();
+
+        GuildDiamondWagePolicy2 curLevel = curDiamondLevel.getValue();
+        salaryVo.setDiamondSalary(curLevel.getAnchorDiamondSalary());
+        salaryVo.setMicSalary(micDay < curLevel.getMicDay() ? BigDecimal.ZERO : curLevel.getAnchorMicSalary());
+        salaryVo.setOwnerSalary(curLevel.getOwnerSalary());
+        salaryVo.setCurLevelName(curLevel.getLevel());
+        salaryVo.setCurLevelDiamondNum(curLevel.getDiamondNum());
+        salaryVo.setCurLevelMicDay(curLevel.getMicDay());
+
+        if (nextDiamondLevel != null) {
+            GuildDiamondWagePolicy2 nextLevel = nextDiamondLevel.getValue();
+            salaryVo.setNextLevelDiamondNum(nextLevel.getDiamondNum());
+            salaryVo.setNextLevelName(nextLevel.getLevel());
+        }
+
+        return salaryVo;
+    }
+
 }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java

@@ -11,24 +11,26 @@ import com.accompany.business.service.guild.GuildAuthService;
 import com.accompany.business.service.guild.GuildMemberService;
 import com.accompany.business.service.guild.GuildMemberWeekLevelRewardV2Service;
 import com.accompany.business.service.purse.UserPurseService;
-import com.accompany.business.service.room.RoomMicService;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.business.util.CycleTimeUtil;
 import com.accompany.business.util.FullMonthCycleTimeUtil;
 import com.accompany.business.vo.guild.CycleDateVo;
-import com.accompany.business.vo.guildpolicy.GuildPolicy2PersonalVo;
-import com.accompany.business.vo.guildpolicy.GuildPolicy2Vo;
+import com.accompany.business.vo.guildpolicy.*;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
+import com.accompany.common.utils.StringUtils;
 import com.accompany.core.enumeration.BillObjTypeEnum;
 import com.accompany.core.enumeration.PartitionEnum;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.Users;
+import com.accompany.payment.model.ChargeRecord;
+import com.accompany.payment.service.ChargeRecordService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,8 +56,6 @@ public class GuildPolicy2Service {
     @Autowired
     private GuildAuthService guildAuthService;
     @Autowired
-    private RoomMicService roomMicService;
-    @Autowired
     private GuildMicStatisticsPolicy2Service guildMicStatisticsPolicy2Service;
     @Autowired
     private UsersService usersService;
@@ -73,10 +73,13 @@ public class GuildPolicy2Service {
     private GuildDiamondWagePolicy2Service guildDiamondWagePolicy2Service;
     @Autowired
     private GuildDiamondStatisticsPolicy2SettleService guildDiamondStatisticsPolicy2SettleService;
-    public BusiResult<GuildPolicy2Vo> getGuildPolicy2(Long uid, String cycleBeginDate) {
-        GuildPolicy2Vo guildPolicy2Vo = new GuildPolicy2Vo();
-        guildPolicy2Vo.setCycleDate(cycleBeginDate);
+    @Autowired
+    private ChargeRecordService chargeRecordService;
 
+    private static final String MIN_CYCLE_DATE = "2025-09-01";
+    private static final BigDecimal ISSUE_SALARY_RATE = BigDecimal.valueOf(1.2);
+
+    private GuildMember validateAndGetGuildMember(Long uid) {
         GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(uid);
         if (null == guildMember){
             throw new ServiceException(BusiStatus.FAMILY_NOT_EXIST);
@@ -87,55 +90,72 @@ public class GuildPolicy2Service {
             throw new ServiceException(BusiStatus.FAMILY_PERMISSION_DENIED);
         }
 
+        return guildMember;
+    }
+
+    private boolean isCurrentOrPastCycle(String cycleBeginDate, String curCycleBeginDate) {
+        return cycleBeginDate.equals(curCycleBeginDate) || cycleBeginDate.compareTo(MIN_CYCLE_DATE) < 0;
+    }
+
+    @NotNull
+    private static BigDecimal getIssiueSalary(ChargeRecord chargeRecord) {
+        if (chargeRecord == null) {
+            return BigDecimal.ZERO;
+        }
+        return BigDecimal.valueOf(chargeRecord.getAmount() != null ? chargeRecord.getAmount() : 0D)
+                .divide(BigDecimal.valueOf(100))
+                .multiply(ISSUE_SALARY_RATE);
+    }
+
+    public BusiResult<GuildPolicy2MyVo> getGuildPolicy2(Long uid, String cycleBeginDate) {
+        GuildPolicy2MyVo guildPolicy2MyVo = new GuildPolicy2MyVo();
+        guildPolicy2MyVo.setCycleDate(cycleBeginDate);
+
+        GuildMember guildMember = this.validateAndGetGuildMember(uid);
+
+        PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(guildMember.getPartitionId());
         Long guildMemberId = guildMember.getId();
 
-        guildPolicy2Vo.setDiamondNum(guildDiamondStatisticsPolicy2Service.getTotalDiamondInCycleMember(cycleBeginDate, guildMemberId));
+        String curCycleBeginDate = FullMonthCycleTimeUtil.getCycleDate(DateTimeUtil.convertWithZoneId(new Date(), partitionEnum.getZoneId()));
+        guildPolicy2MyVo.setCurCycleDate(curCycleBeginDate);
 
-        List<GuildPolicy2PersonalVo> myDiamondData = guildDiamondStatisticsPolicy2Service.listPersonalDiamondData(cycleBeginDate, guildMemberId);
         List<GuildPolicy2PersonalVo> myMicData = guildMicStatisticsPolicy2Service.listPersonalMicData(cycleBeginDate, guildMemberId);
+        Integer micDay = 0;
+        if (CollectionUtils.isNotEmpty(myMicData)) {
+            micDay = myMicData.stream().collect(Collectors.summingInt(GuildPolicy2PersonalVo::getMicDay));
+        }
+        guildPolicy2MyVo.setMicDay(micDay);
 
-        List<GuildPolicy2PersonalVo> myData = mergeMyDataLists(myDiamondData, myMicData);
+        if (isCurrentOrPastCycle(cycleBeginDate, curCycleBeginDate)) {// 当前周期
+            guildPolicy2MyVo.setDiamondNum(guildDiamondStatisticsPolicy2Service.getTotalDiamondInCycleMember(cycleBeginDate, guildMemberId));
+            TreeMap<BigDecimal, GuildDiamondWagePolicy2> diamondWageMap = guildDiamondWagePolicy2Service.getDiamondWageMap(partitionEnum.getId());
+            GuildPolicy2SalaryVo salaryVo = guildDiamondWagePolicy2Service.getSalaryVo(diamondWageMap, guildPolicy2MyVo.getDiamondNum(), micDay);
+            guildPolicy2MyVo.setMySalary(salaryVo);
+        } else {
+            GuildDiamondStatisticsPolicy2Settle settleMap = guildDiamondStatisticsPolicy2SettleService
+                    .groupByMemberStatDate(cycleBeginDate, partitionEnum.getId(), guildMemberId);
+            if (settleMap == null || !settleMap.getGuildMemberId().equals(guildMemberId)) {//历史周期是否有结算,或者不在当前公会
+                return BusiResult.success(guildPolicy2MyVo);
+            }
 
-        if (CollectionUtils.isNotEmpty(myData)) {
-            guildPolicy2Vo.setMicDay(myData.stream().collect(Collectors.summingInt(GuildPolicy2PersonalVo::getMicDay)));
+            guildPolicy2MyVo.setDiamondNum(settleMap.getDiamondNum());
+            guildPolicy2MyVo.setMySalary(GuildPolicy2SalaryVo.builder()
+                            .diamondNum(settleMap.getDiamondNum())
+                            .diamondSalary(settleMap.getAnchorSalary())
+                            .micSalary(settleMap.getAnchorMicSalary())
+                            .ownerSalary(settleMap.getOwnerSalary())
+                            .micDay(micDay)
+                            .build());
         }
 
-        fillAllDayOfMonth(guildPolicy2Vo, myData, cycleBeginDate, partitionEnum);
-
-        if (guildAuthService.hasAuthByRoleType(partitionEnum.getClanMode(), guildMember.getRoleType(), GuildConstant.AuthCode.GUILD_POLICY2_MEMBER)) {
-            guildPolicy2Vo.setGuildDiamondNum(guildDiamondStatisticsPolicy2Service.getTotalDiamondInCycle(cycleBeginDate, guildMember.getGuildId()));
-            guildPolicy2Vo.setMemberData(guildDiamondStatisticsPolicy2Service.listMemberData(cycleBeginDate, guildMember.getGuildId()));
-        }
-
-        return BusiResult.success(guildPolicy2Vo);
+        this.fillPersonDetailData(cycleBeginDate, guildMemberId, myMicData, guildPolicy2MyVo, partitionEnum, micDay);
+        return BusiResult.success(guildPolicy2MyVo);
     }
 
-    public List<GuildPolicy2PersonalVo> mergeMyDataLists(List<GuildPolicy2PersonalVo> list1, List<GuildPolicy2PersonalVo> list2) {
-        // 处理空列表情况
-        if (list1 == null || list1.isEmpty()) return list2 != null ? list2 : new ArrayList<>();
-        if (list2 == null || list2.isEmpty()) return list1;
-
-        // 合并两个列表并按statDate分组
-        Map<String, GuildPolicy2PersonalVo> mergedMap = Stream.concat(list1.stream(), list2.stream())
-                .collect(Collectors.toMap(
-                        GuildPolicy2PersonalVo::getStatDate,
-                        vo -> vo,
-                        (vo1, vo2) -> {
-                            // 合并相同statDate的对象
-                            GuildPolicy2PersonalVo merged = new GuildPolicy2PersonalVo();
-                            merged.setStatDate(vo1.getStatDate());
-                            merged.setDiamondNum(vo1.getDiamondNum().add(vo2.getDiamondNum()));
-                            merged.setMicMinute(vo1.getMicMinute() + vo2.getMicMinute());
-                            merged.setMicDay(vo1.getMicDay() + vo2.getMicDay());
-                            merged.setValidMicDay(vo1.getValidMicDay() || vo2.getValidMicDay());
-                            return merged;
-                        }
-                ));
-
-        return new ArrayList<>(mergedMap.values());
-    }
-
-    private void fillAllDayOfMonth(GuildPolicy2Vo guildPolicy2Vo, List<GuildPolicy2PersonalVo> myData, String cycleBeginDate, PartitionEnum partitionEnum) {
+    private void fillPersonDetailData(String cycleBeginDate, Long guildMemberId, List<GuildPolicy2PersonalVo> myMicData, GuildPolicy2MyVo guildPolicy2MyVo, PartitionEnum partitionEnum, Integer micDay) {
+        List<GuildPolicy2PersonalVo> myDiamondData = guildDiamondStatisticsPolicy2Service.listPersonalDiamondData(cycleBeginDate, guildMemberId);
+        List<GuildPolicy2PersonalVo> myData = this.mergeMyDataLists(myDiamondData, myMicData);
+        //填满整月天数
         List<GuildPolicy2PersonalVo> resultMyDate = new ArrayList<>();
         ZonedDateTime nowZoneDateTime = DateTimeUtil.convertWithZoneId(new Date(), partitionEnum.getZoneId());
         Map<String, GuildPolicy2PersonalVo> realMap = new HashMap<>();
@@ -160,7 +180,117 @@ public class GuildPolicy2Service {
             resultMyDate.add(guildPolicy2PersonalVo);
             monthEnd = DateUtil.offsetDay(monthEnd, -1);
         }
-        guildPolicy2Vo.setMyData(resultMyDate);
+        guildPolicy2MyVo.setMyData(resultMyDate);
+    }
+
+    //合并流水与在麦天数数据
+    private List<GuildPolicy2PersonalVo> mergeMyDataLists(List<GuildPolicy2PersonalVo> list1, List<GuildPolicy2PersonalVo> list2) {
+        // 处理空列表情况
+        if (list1 == null || list1.isEmpty()) return list2 != null ? list2 : new ArrayList<>();
+        if (list2 == null || list2.isEmpty()) return list1;
+
+        // 合并两个列表并按statDate分组
+        Map<String, GuildPolicy2PersonalVo> mergedMap = Stream.concat(list1.stream(), list2.stream())
+                .collect(Collectors.toMap(
+                        GuildPolicy2PersonalVo::getStatDate,
+                        vo -> vo,
+                        (vo1, vo2) -> {
+                            // 合并相同statDate的对象
+                            GuildPolicy2PersonalVo merged = new GuildPolicy2PersonalVo();
+                            merged.setStatDate(vo1.getStatDate());
+                            merged.setDiamondNum(vo1.getDiamondNum().add(vo2.getDiamondNum()));
+                            merged.setMicMinute(vo1.getMicMinute() + vo2.getMicMinute());
+                            merged.setMicDay(vo1.getMicDay() + vo2.getMicDay());
+                            merged.setValidMicDay(vo1.getValidMicDay() || vo2.getValidMicDay());
+                            return merged;
+                        }
+                ));
+
+        return new ArrayList<>(mergedMap.values());
+    }
+
+    public BusiResult<GuildPolicy2AgencyVo> getGuildMemberPolicy2(Long uid, String cycleBeginDate) {
+        GuildPolicy2AgencyVo guildPolicy2AgencyVo = new GuildPolicy2AgencyVo();
+        guildPolicy2AgencyVo.setCycleDate(cycleBeginDate);
+
+        GuildMember guildMember = this.validateAndGetGuildMember(uid);
+
+        PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(guildMember.getPartitionId());
+        if (!guildAuthService.hasAuthByRoleType(partitionEnum.getClanMode(), guildMember.getRoleType(),
+                GuildConstant.AuthCode.GUILD_POLICY2_MEMBER)){
+            return BusiResult.success(guildPolicy2AgencyVo);
+        }
+
+        String curCycleBeginDate = FullMonthCycleTimeUtil.getCycleDate(DateTimeUtil.convertWithZoneId(new Date(), partitionEnum.getZoneId()));
+
+        if (isCurrentOrPastCycle(cycleBeginDate, curCycleBeginDate)) {// 当前周期
+            TreeMap<BigDecimal, GuildDiamondWagePolicy2> diamondWageMap = guildDiamondWagePolicy2Service.getDiamondWageMap(partitionEnum.getId());
+            guildPolicy2AgencyVo.setDiamondNum(guildDiamondStatisticsPolicy2Service.getTotalDiamondInCycle(cycleBeginDate, guildMember.getGuildId()));
+            List<GuildPolicy2MemberVo> memberData = guildDiamondStatisticsPolicy2Service.listMemberData(cycleBeginDate, guildMember.getGuildId());
+            guildPolicy2AgencyVo.setMemberData(memberData);
+            if (CollectionUtils.isEmpty(memberData)) {
+                return BusiResult.success(guildPolicy2AgencyVo);
+            }
+
+            List<Long> uids = memberData.stream().map(GuildPolicy2MemberVo::getUid).collect(Collectors.toList());
+
+            Date cycleBegin = DateUtil.beginOfDay(DateUtil.parseDate(cycleBeginDate));
+            Date cycleEnd = DateUtil.endOfMonth(cycleBegin);
+            Date beginOfMonth = DateTimeUtil.convertToEastEightZone(cycleBegin, partitionEnum.getZoneId());
+            Date endOfMonth = DateTimeUtil.convertToEastEightZone(cycleEnd, partitionEnum.getZoneId());
+
+            Map<Long, ChargeRecord> refundGroupUidDateMap = chargeRecordService.getRefundGroupUidDateMap(uids, beginOfMonth, endOfMonth);
+
+            memberData.forEach(item -> {
+                GuildDiamondWagePolicy2 diamondWageVo = guildDiamondWagePolicy2Service.calDiamondWageVo(diamondWageMap, item.getDiamondNum(), item.getMicDay());
+                item.setDiamondSalary(item.getDiamondSalary().add(diamondWageVo.getAnchorDiamondSalary()));
+                item.setMicSalary(item.getMicSalary().add(diamondWageVo.getAnchorMicSalary()));
+                item.setOwnerSalary(item.getOwnerSalary().add(diamondWageVo.getOwnerSalary()));
+                ChargeRecord chargeRecord = refundGroupUidDateMap.get(item.getUid());
+                item.setIssueSalary(this.getIssiueSalary(chargeRecord));
+            });
+            GuildPolicy2SalaryVo salaryVo = new GuildPolicy2SalaryVo();
+            salaryVo.setDiamondSalary(memberData.stream().map(GuildPolicy2MemberVo::getDiamondSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            salaryVo.setMicSalary(memberData.stream().map(GuildPolicy2MemberVo::getMicSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            salaryVo.setOwnerSalary(memberData.stream().map(GuildPolicy2MemberVo::getOwnerSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            salaryVo.setIssueSalary(memberData.stream().map(GuildPolicy2MemberVo::getIssueSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            guildPolicy2AgencyVo.setGuildSalary(salaryVo);
+        } else {
+            List<GuildDiamondStatisticsPolicy2Settle>  settleList = guildDiamondStatisticsPolicy2SettleService
+                    .groupByGuildMemberStatDate(cycleBeginDate, partitionEnum.getId(), guildMember.getGuildId());
+            if (CollectionUtils.isEmpty(settleList)) {
+                return BusiResult.success(guildPolicy2AgencyVo);
+            }
+            List<GuildPolicy2MemberVo> memberData = guildPolicy2AgencyVo.getMemberData();
+            List<Long> uids = settleList.stream().map(GuildDiamondStatisticsPolicy2Settle::getUid).collect(Collectors.toList());
+            Map<Long, Users> usersMap = usersService.getUsersMapByUids(uids);
+            for (GuildDiamondStatisticsPolicy2Settle policy2Settle : settleList) {
+                GuildPolicy2MemberVo memberVo = new GuildPolicy2MemberVo();
+                memberVo.setUid(policy2Settle.getUid());
+                memberVo.setMicDay(policy2Settle.getMicDay());
+                memberVo.setDiamondNum(policy2Settle.getDiamondNum());
+                memberVo.setDiamondSalary(policy2Settle.getAnchorSalary());
+                memberVo.setMicSalary(policy2Settle.getAnchorMicSalary());
+                memberVo.setOwnerSalary(policy2Settle.getOwnerSalary());
+                memberVo.setIssueSalary(policy2Settle.getIssueSalary());
+                Users users = usersMap.get(memberVo.getUid());
+                if (null != users) {
+                    memberVo.setNick(users.getNick());
+                    memberVo.setErbanNo(users.getErbanNo());
+                    memberVo.setAvatar(users.getAvatar());
+                }
+
+                memberData.add(memberVo);
+            }
+            GuildPolicy2SalaryVo salaryVo = new GuildPolicy2SalaryVo();
+            salaryVo.setDiamondSalary(memberData.stream().map(GuildPolicy2MemberVo::getDiamondSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            salaryVo.setMicSalary(memberData.stream().map(GuildPolicy2MemberVo::getMicSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            salaryVo.setOwnerSalary(memberData.stream().map(GuildPolicy2MemberVo::getOwnerSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            salaryVo.setIssueSalary(memberData.stream().map(GuildPolicy2MemberVo::getIssueSalary).reduce(BigDecimal.ZERO, BigDecimal::add));
+            guildPolicy2AgencyVo.setDiamondNum(memberData.stream().map(GuildPolicy2MemberVo::getDiamondNum).reduce(BigDecimal.ZERO, BigDecimal::add));
+            guildPolicy2AgencyVo.setGuildSalary(salaryVo);
+        }
+        return BusiResult.success(guildPolicy2AgencyVo);
     }
 
     public BusiResult<List<CycleDateVo>> getCycleDatesV2(Integer partitionId) {
@@ -288,7 +418,7 @@ public class GuildPolicy2Service {
     }
 
     public void settle(PartitionEnum partitionEnum, String cycleDate) {
-        if (!GUILD_POLICY2.equals(partitionEnum.getClanMode())) {
+        if (!GUILD_POLICY2.equals(partitionEnum.getClanMode()) || StringUtils.isEmpty(cycleDate)) {
             log.info("GuildPolicy2Service.settle partitionEnum:{}, clanMode:{} cycleDate:{}", partitionEnum, partitionEnum.getClanMode(), cycleDate);
             return;
         }
@@ -298,6 +428,14 @@ public class GuildPolicy2Service {
             log.info("Policy2Settle.emptyData");
             return;
         }
+
+        Date cycleBegin = DateUtil.beginOfDay(DateUtil.parseDate(cycleDate));
+        Date cycleEnd = DateUtil.endOfMonth(cycleBegin);
+        Date beginOfMonth = DateTimeUtil.convertToEastEightZone(cycleBegin, partitionEnum.getZoneId());
+        Date endOfMonth = DateTimeUtil.convertToEastEightZone(cycleEnd, partitionEnum.getZoneId());
+        List<Long> uids = list.stream().map(GuildDiamondStatisticsPolicy2Settle::getUid).collect(Collectors.toList());
+        Map<Long, ChargeRecord> refundGroupUidDateMap = chargeRecordService.getRefundGroupUidDateMap(uids, beginOfMonth, endOfMonth);
+
         Date date = new Date();
         TreeMap<BigDecimal, GuildDiamondWagePolicy2> diamondWageMap = guildDiamondWagePolicy2Service.getDiamondWageMap(partitionId);
         for (GuildDiamondStatisticsPolicy2Settle settle : list) {
@@ -311,6 +449,8 @@ public class GuildPolicy2Service {
             settle.setAnchorSalary(diamondWagePolicy2.getAnchorDiamondSalary());
             settle.setOwnerSalary(diamondWagePolicy2.getOwnerSalary());
             settle.setAnchorMicSalary(diamondWagePolicy2.getAnchorMicSalary());
+            ChargeRecord chargeRecord = refundGroupUidDateMap.get(settle.getUid());
+            settle.setIssueSalary(this.getIssiueSalary(chargeRecord));
         }
         guildDiamondStatisticsPolicy2SettleService.saveBatch(list);
     }

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/impl/ResourceServiceImpl.java

@@ -6,10 +6,12 @@ import com.accompany.business.dto.resource.ResourceContext;
 import com.accompany.business.enums.resource.ResourceTypeEnum;
 import com.accompany.business.enums.resource.RuleCodeEnum;
 import com.accompany.business.model.UserLevelExperience;
+import com.accompany.business.model.guild.GuildMember;
 import com.accompany.business.model.resource.Resource;
 import com.accompany.business.model.resource.ResourceRule;
 import com.accompany.business.mybatismapper.resource.ResourceMapper;
 import com.accompany.business.service.fillstrategy.strategy.FillFactory;
+import com.accompany.business.service.guild.GuildMemberService;
 import com.accompany.business.service.level.LevelService;
 import com.accompany.business.service.resource.ResourceRuleService;
 import com.accompany.business.service.resource.ResourceService;
@@ -64,6 +66,9 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
     @Autowired
     private HighRechargeUserService highRechargeUserService;
 
+    @Autowired
+    private GuildMemberService guildMemberService;
+
     @Override
     public boolean isOpen(String code) {
         return getResource(code) != null;
@@ -96,6 +101,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
             }
             context.setNotChannels(channel);
             Integer partitionId = null;
+            GuildMember guildMember = null;
             if (uid != null) {
                 UserLevelExperience userExperience = levelService.getUserExper(uid);
                 if (userExperience != null && userExperience.getLevelExperience() != null) {
@@ -109,6 +115,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
                     }
                     partitionId = users.getPartitionId();
                 }
+                guildMember = guildMemberService.getVaildGuildMemberByUid(uid);
                 boolean isHighRechargeUser = highRechargeUserService.isHighRechargeUser(uid);
                 context.setHighRechargeUser(isHighRechargeUser? "大R": "普通");
             }
@@ -156,10 +163,13 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
                 }
                 //动态校验规则
                 JSONObject jsonObject = JSONObject.parseObject(ruleValueJson);
+                boolean limitUserLevel = !(guildMember != null
+                        && jsonObject.containsKey(RuleCodeEnum.USER_LEVEL_LIMIT_ROLE.name())
+                        && "2".equals(jsonObject.getString(RuleCodeEnum.USER_LEVEL_LIMIT_ROLE.name())));
                 for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
                     String key = entry.getKey();
                     Object ruleValue = entry.getValue();
-                    if (CollectionUtil.isEmpty(rules)) {
+                    if (CollectionUtil.isEmpty(rules) || RuleCodeEnum.USER_LEVEL_LIMIT_ROLE.name().equals(key)) {
                         continue;
                     }
                     if (ruleValue == null || StrUtil.isEmpty(ruleValue.toString())) {
@@ -198,11 +208,13 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
                                 isSkip = Integer.parseInt(val1) > Integer.parseInt(val2);
                             }
                         } else if (OperateType.GE.name().equals(kind)) {
-                            //版本号
-                            if (targetValue.toString().contains(StrUtil.DOT) && !targetValue.toString().startsWith(StrUtil.DELIM_START) && !targetValue.toString().startsWith(StrUtil.DELIM_END)){
-                                isSkip = AppVersionUtil.compareVersion(val1, val2) < 0;
-                            } else {
-                                isSkip = Integer.parseInt(val1) < Integer.parseInt(val2);
+                            boolean needLimit = RuleCodeEnum.USER_LEVEL.name().equals(key) && limitUserLevel;
+                            if (needLimit) {
+                                if (targetValue.toString().contains(StrUtil.DOT) && !targetValue.toString().startsWith(StrUtil.DELIM_START) && !targetValue.toString().startsWith(StrUtil.DELIM_END)){
+                                    isSkip = AppVersionUtil.compareVersion(val1, val2) < 0;
+                                } else {
+                                    isSkip = Integer.parseInt(val1) < Integer.parseInt(val2);
+                                }
                             }
                         } else if (OperateType.LEFT_LIKE.name().equals(kind)) {
                             if (StrUtil.isNotEmpty(val1) && StrUtil.isNotEmpty(description) && val2.equals(YES_ZH)) {

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
 import com.accompany.business.constant.RoomBoomConstant;
 import com.accompany.business.dto.room.RoomBoomPrizeMsgDTO;
 import com.accompany.business.message.GiftMessage;
-import com.accompany.business.message.SuperLuckyGiftDiamondIncomeMessage;
 import com.accompany.business.model.room.RoomBoomLevel;
 import com.accompany.business.model.room.RoomBoomLevelAward;
 import com.accompany.business.model.room.RoomBoomSign;
@@ -27,7 +26,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.*;
@@ -44,7 +42,6 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.time.ZonedDateTime;
 import java.util.*;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomSignService.java

@@ -1,8 +1,10 @@
 package com.accompany.business.service.room;
 
 import com.accompany.business.model.room.RoomBoomSign;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -41,5 +43,7 @@ public interface RoomBoomSignService extends IService<RoomBoomSign> {
      * @return 记录
      */
     RoomBoomSign getOneByRecordIdAndLevel(Long recordId, Integer level);
+
+    IPage<RoomBoomSign> list(IPage<RoomBoomSign> page, Long roomUid, Long uid, Integer level, Date startTime, Date endTime, Integer partitionId);
 }
 

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java

@@ -23,6 +23,7 @@ import com.accompany.core.model.Users;
 import com.accompany.core.util.I18NMessageSourceUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RList;
@@ -382,6 +383,11 @@ public class RoomBoomSignServiceImpl extends ServiceImpl<RoomBoomSignMapper, Roo
         return roomBoomSignMapper.getOneByRecordIdAndLevel(recordId, level);
     }
 
+    @Override
+    public IPage<RoomBoomSign> list(IPage<RoomBoomSign> page, Long roomUid, Long uid, Integer level, Date startTime, Date endTime, Integer partitionId) {
+        return baseMapper.list(page, roomUid, uid, level, startTime, endTime, partitionId);
+    }
+
     private void sendAward(RoomBoomLevelAward award, Long uid, Long roomUid) {
         try {
             RewardDto rewardDto = new RewardDto();

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java

@@ -26,7 +26,6 @@ import com.accompany.business.service.headwear.HeadwearService;
 import com.accompany.business.service.level.LevelService;
 import com.accompany.business.service.live.LiveAttestationService;
 import com.accompany.business.service.nameplate.UserNameplateService;
-import com.accompany.business.service.netease.YidunCheckUtil;
 import com.accompany.business.service.purse.UserPurseService;
 import com.accompany.business.service.room.QueryRoomService;
 import com.accompany.business.service.room.RoomService;
@@ -77,7 +76,6 @@ import com.accompany.email.service.EmailService;
 import com.accompany.payment.service.RechargeUserService;
 import com.accompany.sms.service.SmsService;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -845,6 +843,24 @@ public class UsersService extends BaseService {
         return simpleUserVo;
     }
 
+    public  Map<Long, SimpleUserVo> getSimpleUsersByUid(List<Long> uids) {
+        Map<Long, SimpleUserVo> resultMap = new HashMap<>();
+        Map<Long, Users> usersMap = getUsersMapByUids(uids);
+        if (usersMap == null || usersMap.isEmpty()) {
+            return null;
+        }
+        usersMap.forEach((uid, user) -> {
+            SimpleUserVo simpleUserVo = new SimpleUserVo();
+            simpleUserVo.setAvatar(user.getAvatar());
+            simpleUserVo.setErbanNo(user.getErbanNo());
+            simpleUserVo.setGender(user.getGender());
+            simpleUserVo.setNick(user.getNick());
+            simpleUserVo.setUid(user.getUid());
+            resultMap.put(uid, simpleUserVo);
+        });
+        return resultMap;
+    }
+
     public BusiResult isBindPhone(Long uid) {
         BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
         Users users = getUsersByUid(uid);

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsDayMapper.xml

@@ -160,4 +160,24 @@
         </foreach>
         group by gd.guild_id
     </select>
+
+
+    <select id="listRank" resultType="com.accompany.business.vo.guild.SimpleGuildVo">
+        SELECT
+            g.id guildId,
+            g.`name` guildName,
+            g.owner_uid ownerUid,
+            g.member_num_limit memberNumLimit,
+            a.diamond_num weekIncome
+        FROM
+            guild g
+        LEFT JOIN (select guild_id, sum(diamond_num+lucky_diamond_num) diamond_num
+                   from guild_extra_diamond_day
+                   where partition_id = #{partitionId}
+                     and stat_date &gt;= #{startDate}
+                   group by guild_id) a on a.guild_id = g.id
+        where g.partition_id = #{partitionId}
+          and g.`enable` = 1
+        ORDER BY weekIncome desc
+    </select>
 </mapper>

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildDiamondStatisticsPolicy2SettleMapper.xml

@@ -59,4 +59,30 @@
         group by gm.id
         ORDER BY diamondNum desc
     </select>
+
+    <select id="groupByMemberStatDate" resultType="com.accompany.business.model.guildpolicy2.GuildDiamondStatisticsPolicy2Settle">
+        select
+            cycle_date cycleDate,
+            partition_id partitionId,
+            guild_member_id guildMemberId,
+            guild_id guildId,
+            uid uid,
+            diamond_num diamondNum,
+            mic_minutes micMinutes,
+            mic_day micDay,
+            issue_salary issueSalary,
+        anchor_salary anchorSalary,
+        anchor_mic_salary anchorMicSalary,
+        owner_salary ownerSalary
+        from guild_diamond_statistics_policy2_settle
+        where partition_id = #{partitionId}
+          and cycle_date = #{cycleDate}
+            <if test="guildMemberId != null">
+                and guild_member_id = #{guildMemberId}
+            </if>
+            <if test="guildId != null">
+                and guild_id = #{guildId}
+            </if>
+        group by guild_member_id
+    </select>
 </mapper>

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomBoomSignMapper.xml

@@ -33,4 +33,32 @@
         select * from room_boom_sign where record_id = #{recordId} and level = #{level} order by id limit 1
     </select>
 
+    <select id="list" resultType="com.accompany.business.model.room.RoomBoomSign">
+        select r.*
+        from room_boom_sign r
+        left join users u on u.uid = r.room_uid
+        <where>
+            <if test="startTime != null">
+                and r.create_time >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and r.create_time &lt;= #{endTime}
+            </if>
+            <if test="partitionId != null">
+                and u.partition_id = #{partitionId}
+            </if>
+            <if test="level != null">
+                and r.level = #{level}
+            </if>
+            <if test="roomUid != null">
+                and r.room_uid = #{roomUid}
+            </if>
+            <if test="uid != null">
+                and r.uid = #{uid}
+            </if>
+            and r.`status` = 2
+        </where>
+        order by r.id desc
+    </select>
+
 </mapper>

accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildController.java

@@ -14,10 +14,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -111,9 +108,9 @@ public class GuildController {
     @ApiOperation("公会排行列表")
     @Authorization
     @GetMapping("/listRank")
-    public BusiResult<List<SimpleGuildVo>> listGuild(){
+    public BusiResult<List<SimpleGuildVo>> listGuild(@RequestParam(defaultValue = "1") Integer pageNo, @RequestParam(defaultValue = "20") Integer pageSize){
         Long uid = UidContextHolder.get();
-        List<SimpleGuildVo> guildList = guildManagerService.listRank(uid);
+        List<SimpleGuildVo> guildList = guildManagerService.listRank(uid, pageNo, pageSize);
         return BusiResult.success(guildList);
     }
 

accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guildpolicy/GuildPolicy2Controller.java

@@ -4,7 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import com.accompany.business.service.guildpolicy2.GuildPolicy2Service;
 import com.accompany.business.service.room.GuildMemberRoomMicRecordService;
 import com.accompany.business.vo.guild.CycleDateVo;
-import com.accompany.business.vo.guildpolicy.GuildPolicy2Vo;
+import com.accompany.business.vo.guildpolicy.GuildPolicy2AgencyVo;
+import com.accompany.business.vo.guildpolicy.GuildPolicy2MyVo;
 import com.accompany.common.annotation.Authorization;
 import com.accompany.common.result.BusiResult;
 import com.accompany.core.enumeration.PartitionEnum;
@@ -39,10 +40,21 @@ public class GuildPolicy2Controller {
     })
     @Authorization
     @GetMapping("/incomeStat")
-    public BusiResult<GuildPolicy2Vo> getGuildPolicy2(@RequestHeader(PUB_UID) Long uid, String cycleBeginDate) {
+    public BusiResult<GuildPolicy2MyVo> getGuildPolicy2(@RequestHeader(PUB_UID) Long uid, String cycleBeginDate) {
         return guildPolicy2Service.getGuildPolicy2(uid, cycleBeginDate);
     }
 
+    @ApiOperation(value = "公会成员收入统计", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "cycleBeginDate", value = "周期开始日期yyyy-MM-dd", required = true, dataType = "String", paramType = "query")
+    })
+    @Authorization
+    @GetMapping("/memberIncomeStat")
+    public BusiResult<GuildPolicy2AgencyVo> getGuildMemberPolicy2(@RequestHeader(PUB_UID) Long uid, String cycleBeginDate) {
+        return guildPolicy2Service.getGuildMemberPolicy2(uid, cycleBeginDate);
+    }
+
+
     @GetMapping("/cycleDates")
     public BusiResult<List<CycleDateVo>> getCycleDates(@RequestHeader(PUB_UID) Long uid) {
         return guildPolicy2Service.getCycleDates(uid);

accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java

@@ -33,6 +33,7 @@ public class DiamondGiveHistoryController extends BaseController {
     private DiamondGiveHistoryService diamondGiveHistoryService;
 
 
+    @H5Authorization
     @Authorization
     @ApiOperation(value = "用户转赠记录", httpMethod = "GET")
     @GetMapping("/giveRecord")
@@ -49,6 +50,7 @@ public class DiamondGiveHistoryController extends BaseController {
      * @param pageSize
      * @return
      */
+    @H5Authorization
     @Authorization
     @ApiOperation(value = "用户转赠详情记录", httpMethod = "GET")
     @GetMapping("/giveRecordVoByType")
@@ -58,6 +60,7 @@ public class DiamondGiveHistoryController extends BaseController {
     }
 
 
+    @H5Authorization
     @Authorization
     @ApiOperation(value = "用户转赠钻石操作", httpMethod = "POST")
     @PostMapping("/give")
@@ -67,6 +70,7 @@ public class DiamondGiveHistoryController extends BaseController {
         return new BusiResult(BusiStatus.SUCCESS);
     }
 
+    @H5Authorization
     @Authorization
     @ApiOperation(value = "用户转赠礼物操作", httpMethod = "POST")
     @PostMapping("/giveGift")
@@ -89,6 +93,7 @@ public class DiamondGiveHistoryController extends BaseController {
         return new BusiResult<>(diamondGiveHistoryService.searchUser(uid, erbanNo));
     }
 
+    @H5Authorization
     @Authorization
     @ApiOperation(value = "用户转赠历史", httpMethod = "GET")
     @ApiImplicitParams({

accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java

@@ -3,13 +3,13 @@ package com.accompany.oauth2.service.account;
 import com.accompany.common.redis.RedisKey;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.base.SpringContextHolder;
+import com.accompany.core.enumeration.PartitionEnum;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.Users;
 import com.accompany.core.mybatismapper.AccountLoginRecordMapperExpand;
 import com.accompany.core.service.common.JedisService;
 import com.accompany.core.service.user.UsersBaseService;
 import com.accompany.core.util.JwtUtils;
-import com.accompany.core.util.PartitionUtil;
 import com.accompany.oauth2.support.h5.H5TokenGranter;
 import com.accompany.oauth2.token.H5AccessToken;
 import lombok.extern.slf4j.Slf4j;
@@ -61,11 +61,18 @@ public class AccountH5LoginService {
         if (null == u){
             throw new ServiceException(BusiStatus.USERNOTEXISTS);
         }
-        PartitionUtil.checkInPartition(4, u.getPartitionId());
+
+        if (u.getPartitionId() != PartitionEnum.CHINESE.getId()) {
+            Integer userCount = usersBaseService.rechargeUserCount(uid);
+            if (userCount <= 0) {
+                throw new ServiceException(BusiStatus.H5_RECHARGE_USER_NOT_OPEN);
+            }
+        }
 
         String jwtToken = createJwtToken(uid);
         saveH5LoginJwtToken(uid, jwtToken);
         H5AccessToken accessToken = new H5AccessToken();
+        accessToken.setPartitionId(u.getPartitionId());
         accessToken.setAccess_token(jwtToken);
         accessToken.setUid(uid);
         accessToken.setExpires_in(H5_JWT_TOKEN_EX);

accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/token/H5AccessToken.java

@@ -19,6 +19,9 @@ public class H5AccessToken {
     @ApiModelProperty("用户ID")
     private Long uid;
 
+    @ApiModelProperty("分区id")
+    private Integer partitionId;
+
     /**
      * 令牌
      */

accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/MonthRankTask.java

@@ -61,7 +61,7 @@ public class MonthRankTask extends BaseTask {
     public void monthRankTaskGMT8() {
         Date date = new Date();
         Date lastMonthDate = DateUtil.offsetMonth(date, -1);
-        List<PartitionEnum> partitionEnumList = List.of(PartitionEnum.ENGLISH, PartitionEnum.ENGLISH2);
+        List<PartitionEnum> partitionEnumList = List.of(PartitionEnum.ENGLISH, PartitionEnum.ENGLISH2, PartitionEnum.SOVIET);
         for (PartitionEnum partitionEnum : partitionEnumList) {
             try {
                 log.info("=-=monthRankTaskGMT8.krypton_rank=-=:date:{},lastMonthDate:{}", DateUtil.formatDateTime(date), lastMonthDate);