From d54db9baa2a1af108cf5aecf660f8536108a0375 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 8 May 2025 10:06:41 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=A5=96=E8=A1=94=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8E=BB=E6=8E=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiHomePageController.java | 144 ------------------ .../member/base/dto/MemberYearAwardsDTO.java | 61 -------- .../member/base/mapper/CuMemberMapper.java | 11 -- .../member/base/service/ICuMemberService.java | 10 -- .../service/impl/CuMemberServiceImpl.java | 30 ---- .../mapper/member/base/CuMemberMapper.xml | 26 ---- 6 files changed, 282 deletions(-) delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java index 881b6098..3ef9ed4e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java @@ -1,20 +1,12 @@ package com.hzs.member.base.controller.api; import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.config.BdConfig; -import com.hzs.common.core.enums.EAwards; -import com.hzs.common.core.enums.EEnv; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.achieve.service.ICuMemberAchieveService; import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO; import com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO; import com.hzs.member.achieve.vo.MemberAwardsNewVO; -import com.hzs.member.base.dto.MemberYearAwardsDTO; -import com.hzs.member.base.service.ICuMemberService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,10 +25,6 @@ public class ApiHomePageController { @Autowired private ICuMemberAchieveService cuMemberAchieveService; - @Autowired - private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberAchieveService iCuMemberAchieveService; /** * 新增业绩 @@ -73,136 +61,4 @@ public class ApiHomePageController { return AjaxResult.success(BeanUtil.copyProperties(resultVO, MemberAwardsNewVO.class)); } - /** - * 年奖衔列表 - * - * @return - */ - @GetMapping("/year-awards-list") - public AjaxResult yearAwardsList() { - // 返回结果列表 - List resultList = new ArrayList<>(); - - // 所属国家 - Integer pkCountry = SecurityUtils.getPkCountry(); - // 会员ID - Long pkMember = SecurityUtils.getUserId(); - - // 等于当前月，查询实时数据 - CuMemberAwardsUnderVO cuMemberAwardsUnderVO = iCuMemberAchieveService.getPkAwardBySmallAchieve(pkMember, pkCountry, false); - // 会员奖衔 - BdAwards memberAwards = new BdAwards(); - // 奖衔列表 - List awardsList = cuMemberAwardsUnderVO.getAwardsList(); - Map awardsMap = new HashMap<>(); - for (BdAwards bdAwards : awardsList) { - awardsMap.put(bdAwards.getPkId(), bdAwards); - if (bdAwards.getAwardsValue().equals(EAwards.MEMBER.getValue())) { - // 会员奖衔 - memberAwards = bdAwards; - } - } - - // 当前时间 - Date nowDate = new Date(); - // 当前年 - String dateYear = DateUtils.parseDateToFormat(DateUtils.YYYY, nowDate); - // 当前月 - String dateMonth = DateUtils.parseDateToFormat(DateUtils.MM, nowDate); - // 当前年月 - String dateYearMonth = dateYear + dateMonth; - - // 年月数据List - List yearMonthList = this.getYearMonthList(dateYear); - - // 开始年月 - String startDate = dateYear + "01"; - // 2024.09.10 确认需求，25年12月之前显示24年9月到25年12月，26年开始正常显示 - if (dateYear.compareTo("2026") < 0) { - // 2026年以前，开始时间是2024年9月，结束时间为当年12月 - startDate = "2024-09"; - } - - // 查询当年历史奖衔 - List dtoList = iCuMemberService.listYearAwards(pkMember, startDate); - - for (String key : yearMonthList) { - // 是否需要添加 - boolean addFlag = true; - for (MemberYearAwardsDTO memberYearAwardsDTO : dtoList) { - if (key.equals(memberYearAwardsDTO.getDateStr())) { - // 年月与当前数据相同，则直接使用 - if (dateYearMonth.equals(memberYearAwardsDTO.getDateStr())) { - memberYearAwardsDTO.setNowFlag(EYesNo.YES.getIntValue()); - } - resultList.add(memberYearAwardsDTO); - addFlag = false; - } - } - if (addFlag) { - if (key.compareTo(dateYearMonth) == 0) { - // 等于当前月，走实时数据 - BdAwards tmpAwards = awardsMap.get(cuMemberAwardsUnderVO.getPkAwards()); - resultList.add(MemberYearAwardsDTO.builder() - .dateYear(dateYear) - .dateMonth(dateMonth) - .pkAwards(tmpAwards.getPkId()) - .awardsName(tmpAwards.getAwardsName()) - .image(tmpAwards.getImage()) - .nowFlag(EYesNo.YES.getIntValue()) - .build()); - } else if (key.compareTo(dateYearMonth) >= 0) { - // 大于当前月，直接为空 - resultList.add(MemberYearAwardsDTO.builder() - .dateYear(key.substring(0, 4)) - .dateMonth(key.substring(4, 6)) - .build()); - } else { - // 小于当前月，按会员处理 - resultList.add(MemberYearAwardsDTO.builder() - .dateYear(key.substring(0, 4)) - .dateMonth(key.substring(4, 6)) - .pkAwards(memberAwards.getPkId()) - .awardsName(memberAwards.getAwardsName()) - .image(memberAwards.getImage()) - .build()); - } - } - } - return AjaxResult.success(resultList); - } - - /** - * 获取年月列表 - * - * @param dateYear 年字符串 - * @return - */ - private List getYearMonthList(String dateYear) { - List yearMonthList = new ArrayList<>(); - - if ("2024".equals(dateYear) || "2025".equals(dateYear)) { - if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { - // 测试环境，按 2024-06 开始时间 - yearMonthList.add("202406"); - yearMonthList.add("202407"); - yearMonthList.add("202408"); - } - yearMonthList.add("202409"); - yearMonthList.add("202410"); - yearMonthList.add("202411"); - yearMonthList.add("202412"); - } - if (dateYear.compareTo("2025") > 0) { - for (int i = 1; i <= 12; i++) { - if (i < 10) { - yearMonthList.add(dateYear + "0" + i); - } else { - yearMonthList.add(dateYear + i); - } - } - } - return yearMonthList; - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java deleted file mode 100644 index 71f3c036..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/dto/MemberYearAwardsDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.member.base.dto; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: 会员年奖衔DTO - * @Author: jiang chao - * @Time: 2024/9/6 16:23 - * @Classname: MemberYearAwardsDTO - * @PackageName: com.hzs.member.base.dto - */ -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Data -public class MemberYearAwardsDTO implements Serializable { - - /** - * 年 - */ - private String dateYear; - - /** - * 月 - */ - private String dateMonth; - - /** - * 年月 - */ - @JsonIgnore - private String dateStr; - - /** - * 奖衔ID - */ - @JsonIgnore - private Integer pkAwards; - - /** - * 奖衔名称 - */ - private String awardsName; - - /** - * 奖衔图标 - */ - private String image; - - /** - * 当前时间标记 - */ - private Integer nowFlag; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 84d404a7..bc3bda9a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.member.base.dto.MemberCountDTO; -import com.hzs.member.base.dto.MemberYearAwardsDTO; import com.hzs.member.base.param.*; import com.hzs.member.base.vo.*; import com.hzs.member.census.param.CensusSummaryParam; @@ -795,16 +794,6 @@ public interface CuMemberMapper extends BaseMapper { */ CuMember getParentMember(@Param("memberCode") String memberCode); - - /** - * 查询会员当前各月奖衔 - * - * @param pkMember 会员ID - * @param startDate 开始日期 - * @return - */ - List listYearAwards(@Param("pkMember") Long pkMember, @Param("startDate") String startDate); - /** * 查询会员奖衔列表 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 8f35ab21..ffa47b59 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -6,7 +6,6 @@ import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.member.base.param.UpdatePlaceParentPetitionParam; -import com.hzs.member.base.dto.MemberYearAwardsDTO; import com.hzs.member.base.dto.ShowWaresDTO; import com.hzs.member.base.dto.ZeroElementRevokeDTO; import com.hzs.member.base.param.*; @@ -1017,15 +1016,6 @@ public interface ICuMemberService extends IService { */ CuMember getParentMember(String memberCode); - /** - * 查询会员当前各月奖衔 - * - * @param pkMember 会员ID - * @param startDate 开始日期 - * @return - */ - List listYearAwards(Long pkMember, String startDate); - /** * 会员奖衔查询列表 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index e2a8ce41..df1b9fc5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3910,33 +3910,16 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.getMenuMember(pkMember); } - /** - * 查询会员服务编号列表 - * - * @param memberServiceCodeParam - * @return - */ @Override public List queryMemberServiceCodeList(MemberServiceCodeParam memberServiceCodeParam) { return baseMapper.queryMemberServiceCodeList(memberServiceCodeParam); } - /** - * 根据会员编号置空服务编号 - * - * @param memberCode - */ @Override public void updateMemberCodeByServiceCodeBlack(String memberCode) { baseMapper.updateMemberCodeByServiceCodeBlack(memberCode); } - /** - * 查询最大服务编码 - * - * @param pkCountry - * @return - */ @Override public String getMaxServiceCode(Integer pkCountry) { return baseMapper.getMaxServiceCode(pkCountry); @@ -3947,19 +3930,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.getParentMember(memberCode); } - - @Override - public List listYearAwards(Long pkMember, String startDate) { - return baseMapper.listYearAwards(pkMember, startDate); - } - - /** - * 查询会员奖衔 - * - * @param param 查询参数 - * @param pkCountry 所属国家 - * @return - */ @Override public List listMemberAwards(MemberAwardsQueryParam param, Integer pkCountry) { return baseMapper.listMemberAwards(param, pkCountry); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index c13c4e67..21c624ee 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -3307,32 +3307,6 @@ where cm.member_code = #{memberCode} - - -