From fa3f1c8886d4ae963a235df5555084e1e86a3187 Mon Sep 17 00:00:00 2001 From: lwoo <2629910752@qq.com> Date: Tue, 20 Aug 2024 14:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E9=95=BF=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../AgencyWithdrawExamineController.java | 99 +++++++++++++++++++ .../accompany/common/utils/DateTimeUtil.java | 17 +++- .../business/param/BasePageParams.java | 2 +- .../vo/guild/AgencyWithdrawExamineVo.java | 21 ++++ .../mybatismapper/guild/GuildMapper.java | 3 + .../GuildMemberDiamondStatisticsMapper.java | 4 +- .../guild/GuildUsdWithdrawRecordMapper.java | 5 +- .../guild/AgencyMonthSettleService.java | 13 ++- .../business/service/guild/GuildService.java | 20 ++++ .../guild/GuildUsdWithdrawRecordService.java | 28 ++++++ .../service/purse/UserPurseService.java | 16 ++- .../business/util/GuildTimeUtil.java | 20 ++++ .../accompany/sqlmappers/GuildMapper.xml | 17 ++++ .../GuildMemberDiamondStatisticsMapper.xml | 8 ++ .../GuildUsdWithdrawRecordMapper.xml | 23 +++++ 16 files changed, 285 insertions(+), 14 deletions(-) create mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java create mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java diff --git a/.gitignore b/.gitignore index 906094093..8ade01768 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ target/ **/.DS_Store **/rebel.xml -**/.rebel.xml.bak \ No newline at end of file +**/.rebel.xml.bak +/tmpI18n/ diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java new file mode 100644 index 000000000..e5952a626 --- /dev/null +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java @@ -0,0 +1,99 @@ +package com.accompany.admin.controller.guild; + +import com.accompany.admin.controller.BaseController; +import com.accompany.admin.service.system.AdminUserService; +import com.accompany.business.param.BasePageParams; +import com.accompany.business.service.guild.GuildUsdWithdrawRecordService; +import com.accompany.business.vo.guild.AgencyWithdrawExamineVo; +import com.accompany.common.status.BusiStatus; +import com.accompany.common.utils.DateTimeUtil; +import com.accompany.core.vo.BaseResponseVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/agencyWithdrawExamine") +public class AgencyWithdrawExamineController extends BaseController { + @Autowired + private GuildUsdWithdrawRecordService guildUsdWithdrawRecordService; + @Autowired + private AdminUserService adminUserService; + + @ApiOperation("列表") + @GetMapping("/list") + public BaseResponseVO> list(BasePageParams basePageParams, Long agencyOwnerErbanNo, Integer status) throws Exception { + Page iPage = guildUsdWithdrawRecordService.listPage(basePageParams,agencyOwnerErbanNo,status); + return new BaseResponseVO<>(iPage); + } + @ApiOperation("批量结算") + @PostMapping("/batchSettle") + public BaseResponseVO batchSettle(Integer[] ids){ + String adminName = adminUserService.getAdminName(getAdminId()); + guildUsdWithdrawRecordService.batchSettle(ids, adminName); + return new BaseResponseVO<>(BusiStatus.SUCCESS); + } + @ApiOperation("结算") + @PostMapping("/settle") + public BaseResponseVO settle(Integer id){ + String adminName = adminUserService.getAdminName(getAdminId()); + guildUsdWithdrawRecordService.settle(id, adminName, new Date()); + return new BaseResponseVO<>(BusiStatus.SUCCESS); + } + + @ApiOperation("导出") + @PostMapping("/export") + public BaseResponseVO export(HttpServletResponse response,BasePageParams basePageParams, Long agencyOwnerErbanNo, Integer status) throws IOException { + basePageParams.setPageSize(5000); + Page iPage = guildUsdWithdrawRecordService.listPage(basePageParams,agencyOwnerErbanNo,status); + List agencyMonthSettleDetailVos = iPage.getRecords(); + HSSFWorkbook workbook = this.buildWithdrawExcel(agencyMonthSettleDetailVos); + // 设置下载时客户端Excel的名称 + String filename = "agency_withdraw.xls"; + response.setContentType("application/vnd.ms-excel"); + response.setHeader("Content-disposition", "attachment;filename=" + filename); + response.setCharacterEncoding("UTF-8"); + OutputStream ouputStream = response.getOutputStream(); + workbook.write(ouputStream); + ouputStream.flush(); + ouputStream.close(); + return new BaseResponseVO(BusiStatus.SUCCESS); + } + + private HSSFWorkbook buildWithdrawExcel(List agencyWithdrawExamineVos) { + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet sheet = workbook.createSheet("公会钻石流水统计"); + + String[] headers = {"公会ID","公会长ID","公会长昵称", "提现薪资", "创建时间", "状态", "操作时间","操作人"}; + HSSFRow header = sheet.createRow(0); + for (int i = 0; i < headers.length; i++) { + header.createCell(i).setCellValue(headers[i]); + } + int rowNum = 1; + for (AgencyWithdrawExamineVo item : agencyWithdrawExamineVos) { + HSSFRow row = sheet.createRow(rowNum++); + row.createCell(0).setCellValue(item.getAgencyId()); + row.createCell(1).setCellValue(item.getErbanNo()); + row.createCell(2).setCellValue(item.getNick()); + row.createCell(3).setCellValue(item.getGuildUsdNum().doubleValue()); + row.createCell(4).setCellValue(DateTimeUtil.convertDate(item.getCreateTime())); + row.createCell(5).setCellValue(item.getStatus() == 0 ? "未结算":"已结算"); + row.createCell(6).setCellValue(DateTimeUtil.convertDate(item.getUpdateTime())); + row.createCell(7).setCellValue(item.getOperator()); + } + return workbook; + } +} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java index 279e089ad..d89e6bb7e 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java @@ -236,7 +236,7 @@ public class DateTimeUtil { * @param date 日期 * @return */ - public static String convertDate(Date date) { + public static String convertDateTime(Date date) { try { SimpleDateFormat sdf = new SimpleDateFormat(DEFAULT_DATETIME_PATTERN); return sdf.format(date); @@ -245,6 +245,21 @@ public class DateTimeUtil { } return null; } + /** + * 把日期转换成另一种格式 + * + * @param date 日期 + * @return + */ + public static String convertDate(Date date) { + try { + SimpleDateFormat sdf = new SimpleDateFormat(DEFAULT_DATE_PATTERN); + return sdf.format(date); + } catch (Exception e) { + logger.warn("convertDate fail, date is " + date, e); + } + return null; + } /** * 把日期转换成另一种格式 diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java index af02f449b..43309ec0a 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java @@ -13,7 +13,7 @@ public class BasePageParams { @ApiModelProperty("页大小") private Integer pageSize = 10; @ApiModelProperty("区域") - private Byte region ; + private Integer partitionId; @ApiModelProperty("公会周期时间") private String dateCycle ; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java new file mode 100644 index 000000000..45856c997 --- /dev/null +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java @@ -0,0 +1,21 @@ +package com.accompany.business.vo.guild; + +import com.accompany.business.model.guild.GuildUsdWithdrawRecord; +import lombok.Data; + +/** + *

+ * 主播提现表 + *

+ * + * @author wxf + * @since 2024-08-01 + */ +@Data +public class AgencyWithdrawExamineVo extends GuildUsdWithdrawRecord { + + private Long agencyId; + private Long erbanNo; + private String nick; + private String abbr; +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMapper.java index 27c91f30e..a63a2180a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMapper.java @@ -1,11 +1,13 @@ package com.accompany.business.mybatismapper.guild; import com.accompany.business.model.guild.Guild; +import com.accompany.business.vo.guild.AgencyOwnerVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; public interface GuildMapper extends BaseMapper { @@ -16,4 +18,5 @@ public interface GuildMapper extends BaseMapper { @Param("partitionId") Integer partitionId, @Param("guildName") String familyName); + List getAgencyOwnerByguildIds(@Param("guildIds") Set guildIds); } \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberDiamondStatisticsMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberDiamondStatisticsMapper.java index 1a89c52c6..7f54a6011 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberDiamondStatisticsMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberDiamondStatisticsMapper.java @@ -16,10 +16,10 @@ public interface GuildMemberDiamondStatisticsMapper extends BaseMapper agencySettle(@Param("ppartitionId") Integer ppartitionId, + List agencySettle(@Param("partitionId") Integer partitionId, @Param("cycleDate") Date cycleDate, @Param("guildId") Long guildId); - List agencySettleDetail(@Param("ppartitionId") Integer ppartitionId, + List agencySettleDetail(@Param("partitionId") Integer partitionId, @Param("cycleDate") Date cycleDate, @Param("guildId") Long guildId, @Param("uid") Long uid); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildUsdWithdrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildUsdWithdrawRecordMapper.java index 8f8b6ffe3..38a641478 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildUsdWithdrawRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildUsdWithdrawRecordMapper.java @@ -1,8 +1,11 @@ package com.accompany.business.mybatismapper.guild; import com.accompany.business.model.guild.GuildUsdWithdrawRecord; +import com.accompany.business.vo.guild.AgencyWithdrawExamineVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; public interface GuildUsdWithdrawRecordMapper extends BaseMapper { - + Page listPage(@Param("page") Page page, @Param("agencyOwnerErbanNo") Long agencyOwnerErbanNo, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("region") Byte region, @Param("status") Integer status); } \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java index d8fb13a4e..6559e8c45 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java @@ -1,19 +1,18 @@ package com.accompany.business.service.guild; -import cn.hutool.core.date.DateUtil; import com.accompany.business.model.guild.AgencyMonthSettleDetail; import com.accompany.business.model.guild.AgencyUserMonthSettleDetail; -import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.guild.UserHallEnergyLevelDataVo; -import com.accompany.core.service.common.JedisService; +import com.accompany.core.enumeration.PartitionEnum; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import static com.accompany.business.constant.guild.GuildUsdOperateTypeEnum.GUILD_USD_SETTLEMENT; @@ -39,7 +38,7 @@ public class AgencyMonthSettleService { public void monthRankTaskAll(Date beginDate, Date endDate) { - Integer partitionId = null; + Integer partitionId = PartitionEnum.ARAB.getId(); try { List userHallEnergyLevelDataVos = guildMemberDiamondStatisticsService.agencySettle(partitionId, beginDate, null); if (CollectionUtils.isEmpty(userHallEnergyLevelDataVos)) { @@ -66,7 +65,7 @@ public class AgencyMonthSettleService { } public void monthRankTaskDetail(Date beginDate, Date endDate) { - Integer partitionId = null; + Integer partitionId = PartitionEnum.ARAB.getId(); try { List userHallEnergyLevelDataVos = guildMemberDiamondStatisticsService.agencySettleDetail(partitionId, beginDate, null, null); if (CollectionUtils.isEmpty(userHallEnergyLevelDataVos)) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java index e85b5af8b..8c9fe2e1f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java @@ -2,12 +2,17 @@ package com.accompany.business.service.guild; import com.accompany.business.model.guild.Guild; import com.accompany.business.mybatismapper.guild.GuildMapper; +import com.accompany.business.vo.guild.AgencyOwnerVo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import io.swagger.models.auth.In; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; @Service @@ -45,4 +50,19 @@ public class GuildService extends ServiceImpl { return this.baseMapper.listVaildGuildByPartitionId(partitionId); } + public List listAllEnable() { + return this.lambdaQuery() + .eq(Guild::getEnable, Boolean.TRUE).list(); + } + + public Map getAgencyOwnerMapByHallIds(Set hallIds) { + List agencyOwnerVos = baseMapper.getAgencyOwnerByguildIds(hallIds); + + if (CollectionUtils.isEmpty(agencyOwnerVos)){ + return new HashMap<>(); + } + + return agencyOwnerVos.stream().collect(Collectors.toMap(AgencyOwnerVo::getGuildId, Function.identity())); + } + } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java index e15807084..8d450a154 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java @@ -2,7 +2,12 @@ package com.accompany.business.service.guild; import com.accompany.business.model.guild.GuildUsdWithdrawRecord; import com.accompany.business.mybatismapper.guild.GuildUsdWithdrawRecordMapper; +import com.accompany.business.param.BasePageParams; +import com.accompany.business.vo.guild.AgencyWithdrawExamineVo; import com.accompany.common.constant.Constant; +import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -27,4 +32,27 @@ public class GuildUsdWithdrawRecordService extends ServiceImpl listPage(BasePageParams basePageParams, Long agencyOwnerErbanNo, Integer status) { + if (agencyOwnerErbanNo == null){ + throw new ServiceException(BusiStatus.SERVERERROR, "请输入公会长ID"); + } + Page page = new Page<>(basePageParams.getPageNo(),basePageParams.getPageSize()); + Page agencyWithdrawExamineVoPage = this.baseMapper.listPage(page, agencyOwnerErbanNo, basePageParams.getStartTime(), basePageParams.getEndTime(), basePageParams.getRegion(), status); + return agencyWithdrawExamineVoPage; + } + + public void batchSettle(Integer[] ids, String operator) { + Date date = new Date(); + for (Integer id : ids) { + this.settle(id,operator,date); + } + } + + public void settle(Integer id, String operator, Date date) { + GuildUsdWithdrawRecord guildUsdWithdrawRecord = this.getById(id); + guildUsdWithdrawRecord.setUpdateTime(date); + guildUsdWithdrawRecord.setOperator(operator); + guildUsdWithdrawRecord.setStatus((byte)1); + this.updateById(guildUsdWithdrawRecord); + } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java index 8bdcd03a1..4fa84094a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java @@ -1,6 +1,7 @@ package com.accompany.business.service.purse; import com.accompany.business.model.UserPurse; +import com.accompany.business.model.UserPurseExample; import com.accompany.business.model.clan.Clan; import com.accompany.business.mybatismapper.UserPurseMapper; import com.accompany.business.param.neteasepush.NeteasePushParam; @@ -25,6 +26,7 @@ import com.accompany.core.enumeration.ExchangeTypeEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.util.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.google.gson.Gson; @@ -36,13 +38,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.lang.reflect.Method; import java.math.BigDecimal; -import java.util.Date; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Function; +import java.util.stream.Collectors; /** * Created by liuguofu on 2017/7/2. @@ -494,4 +498,14 @@ public class UserPurseService extends ServiceImpl { return vo; } + public Map getAgencyPurseMap(Set uids) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(UserPurse::getUid, uids); + List purseInUids = baseMapper.selectList(wrapper); + if (CollectionUtils.isEmpty(purseInUids)){ + return new HashMap<>(); + } + return purseInUids.stream().collect(Collectors.toMap(UserPurse::getUid,Function.identity())); + } + } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/GuildTimeUtil.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/GuildTimeUtil.java index db91eb1b9..88f27f74d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/GuildTimeUtil.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/GuildTimeUtil.java @@ -1,5 +1,6 @@ package com.accompany.business.util; +import cn.hutool.core.date.DateUtil; import com.accompany.common.utils.DateTimeUtil; import java.time.ZonedDateTime; @@ -28,6 +29,25 @@ public class GuildTimeUtil { return zdt.with(TemporalAdjusters.firstDayOfMonth()).format(dateFormatter); } + public static Date getAgencyCycleBeginDate(Date now) { + Date beginOfMonth = cn.hutool.core.date.DateUtil.beginOfMonth(now); + Date offsetDay = DateUtil.offsetDay(beginOfMonth, 15); + if (now.after(offsetDay)) { + return offsetDay; + } + return beginOfMonth; + } + + public static Date getAgencyCycleEndDate(Date now) { + Date beginOfMonth = cn.hutool.core.date.DateUtil.beginOfMonth(now); + Date offsetDay = DateUtil.offsetDay(beginOfMonth, 15); + if (now.before(offsetDay)) { + return offsetDay; + } + return DateTimeUtil.addMonth(beginOfMonth,1); + } + + public static void main(String[] args) { System.out.println(getCurCycleDateByZoneId("Asia/Riyadh")); } diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMapper.xml index a6dd31bb7..13821f595 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMapper.xml @@ -27,4 +27,21 @@ order by f.enable, f.id desc + \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml index 5ebc3abd5..16c99389d 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildMemberDiamondStatisticsMapper.xml @@ -26,7 +26,11 @@ and hm.guild_id = ed.guild_id and ed.cycle_date >=#{cycleDate} left join guild h on hm.guild_id = h.id + left join users u on hm.uid = u.uid where hm.`enable` = 1 + + and u.partition_id = #{partitionId} + and hm.guild_id = #{guildId} @@ -43,7 +47,11 @@ and hm.guild_id = ed.guild_id and ed.cycle_date >=#{cycleDate} left join guild h on hm.guild_id = h.id + left join users u on hm.uid = u.uid where hm.`enable` = 1 + + and u.partition_id = #{partitionId} + and hm.guild_id = #{guildId} diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildUsdWithdrawRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildUsdWithdrawRecordMapper.xml index 4efd35511..a2e8cc963 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildUsdWithdrawRecordMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildUsdWithdrawRecordMapper.xml @@ -2,4 +2,27 @@ + \ No newline at end of file