土耳其新政策有效天数bug

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

@@ -23,6 +23,7 @@ public class GuildPolicy2PersonalVo {
     private BigDecimal diamondNum;
     @ApiModelProperty("上麦分钟")
     private Integer micMinute;
+    private Integer micDay;
     @ApiModelProperty("有效天数达标")
     private Boolean validMicDay = false;
 }

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

@@ -33,6 +33,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.stream.Collectors;
 
 import static com.accompany.common.constant.Constant.ClanMode.GUILD_POLICY2;
 
@@ -78,6 +79,10 @@ public class GuildPolicy2Service {
 
         List<GuildPolicy2PersonalVo> myData = guildDiamondStatisticsPolicy2Service.listPersonalData(cycleBeginDate, guildMemberId);
 
+        if (CollectionUtils.isNotEmpty(myData)) {
+            guildPolicy2Vo.setMicDay(myData.stream().collect(Collectors.summingInt(GuildPolicy2PersonalVo::getMicDay)));
+        }
+
         fillAllDayOfMonth(guildPolicy2Vo, myData, cycleBeginDate, partitionEnum);
 
         if (guildAuthService.hasAuthByRoleType(partitionEnum.getClanMode(), guildMember.getRoleType(), GuildConstant.AuthCode.GUILD_POLICY2_MEMBER)) {

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

@@ -50,6 +50,7 @@
             gdsp.stat_date as statDate,
             ifnull(gdsp.diamond_num, 0) as diamondNum,
             ifnull(gmp.mic_minutes, 0) as micMinute,
+            if(gmp.mic_minutes >= 120, 1, 0) micDay,
             if(gmp.mic_minutes >= 120, 1, 0) as validMicDay
         from `guild_diamond_statistics_policy2` gdsp
         left join guild_mic_statistics_policy2 gmp on gmp.guild_member_id = gdsp.guild_member_id and gmp.stat_date = gdsp.stat_date and gmp.cycle_date = #{cycleDate}