后台-公会钻石薪资流水-增加公会长地区

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildUsdBillRecordAdminService.java

@@ -20,8 +20,10 @@ import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.core.exception.AdminServiceException;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.PartitionInfo;
+import com.accompany.core.model.RegionInfo;
 import com.accompany.core.model.Users;
 import com.accompany.core.service.partition.PartitionInfoService;
+import com.accompany.core.service.region.RegionInfoService;
 import com.accompany.core.vo.BaseResponseVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
@@ -60,6 +62,8 @@ public class GuildUsdBillRecordAdminService {
     private GuildMemberDiamondStatisticsService guildMemberDiamondStatisticsService;
     @Autowired
     private PartitionInfoService partitionInfoService;
+    @Autowired
+    private RegionInfoService regionInfoService;
 
 
     public Page<AnchorSalaryBillAdminVo> chargeAgentList(BasePageParams basePageParams, Long chargeAgentErbanNo, Long erbanNo) {
@@ -188,12 +192,14 @@ public class GuildUsdBillRecordAdminService {
     private void fillAgencyInfo(List<AnchorSalaryBillAdminVo> records) {
         Set<Integer> hallIds = records.stream().map(AnchorSalaryBillAdminVo::getHallId).collect(Collectors.toSet());
         Map<Integer, AgencyOwnerVo> agencyOwnerMapByHallIds = guildService.getAgencyOwnerMapByHallIds(hallIds);
+        Map<Integer, String> regionNameMap = regionInfoService.getRegionName();
 
         for (AnchorSalaryBillAdminVo record : records) {
             AgencyOwnerVo agencyOwnerVo = agencyOwnerMapByHallIds.get(record.getHallId());
             if (agencyOwnerVo != null){
                 record.setAgencyOwnerErbanNo(agencyOwnerVo.getErbanNo());
-                record.setAgencyId(agencyOwnerVo.getAgencyId());;
+                record.setAgencyId(agencyOwnerVo.getAgencyId());
+                record.setAgencyOwnerRegionDesc(regionNameMap.get(agencyOwnerVo.getRegionId()));
             }
         }
     }

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

@@ -14,5 +14,6 @@ public class AgencyOwnerVo {
     private Integer guildId;
     private String guildName;
     private Integer partitionId;
+    private Integer regionId;
     private Integer memberNum;
 }

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

@@ -81,6 +81,10 @@ public class AnchorSalaryBillAdminVo {
      */
     @ExcelIgnore
     private Long agencyOwnerErbanNo;
+
+    @ExcelIgnore
+    private String agencyOwnerRegionDesc;
+
     /**
      * 钻石兑换薪资
      */

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

@@ -34,7 +34,8 @@
         u.erban_no erbanNo,
         u.uid onwerUid,
         u.avatar avatar,
-        u.partition_id partitionId
+        u.partition_id partitionId,
+        u.region_id regionId
         from guild h
         left join users u  on h.owner_uid = u.uid
         where 1 = 1