diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java index d46e9193..00225836 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java @@ -24,13 +24,6 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.util.*; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.member.base.controller.api - * @Author: yh - * @CreateTime: 2023-03-30 10:45 - * @Version: 1.0 - */ @RestController @RequestMapping("/api/member-footmark") public class MemberFootmarkController { @@ -118,10 +111,6 @@ public class MemberFootmarkController { String thisAvatarUrl = ""; // 色值 String color = ""; - // 国际编号 - String globalCode = member.getGlobalCode(); - // 国家编号 - String countryCode = member.getCountryCode(); R currencyDate = currencyServiceApi.getCurrency(pkCountry); CurrencyDTO currency = currencyDate.getData(); R gradeDto = gradeServiceApi.getGrade(grade); @@ -141,10 +130,6 @@ public class MemberFootmarkController { } Map resultMap = new HashMap<>(); - // 国际编号 - resultMap.put("globalCode", globalCode); - // 国家编号 - resultMap.put("countryCode", countryCode); // 颜色 resultMap.put("color", color); // 等级 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index 197391c8..db16e999 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -677,118 +677,6 @@ public class CuMemberController extends BaseController { return AjaxResult.success(resultList); } - /** - * 会员端直推排行 首页弹窗显示直推排行 - */ - @GetMapping("/get-member-direct-push") - public AjaxResult getMemberDirectPush(MemberDirectPushParam memberDirectPushParam) { - //查询时间 - Date startDate; - Date endDate; - if (memberDirectPushParam.getPayDate() != null) { - startDate = DateUtils.currentMonthFirstDate(memberDirectPushParam.getPayDate()); - endDate = DateUtils.getEndTime(DateUtils.currentMonthLastDate(memberDirectPushParam.getPayDate())); - } else { - return AjaxResult.success(new ArrayList<>()); - } - - String loginMemberCode = SecurityUtils.getMemberCode(); - // 排名前三十人 - Integer number = 30; - // 满足pv 条件 - BigDecimal conditionPv = new BigDecimal(100000); - Integer pkCountry = SecurityUtils.getPkCountry(); - //计算美金pv - R currency = iCurrencyServiceApi.getCurrency(pkCountry); - BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - BigDecimal usdPv = conditionPv.divide(inExchangeRate, 2, BigDecimal.ROUND_HALF_UP); - - // 中国汇率 - R chinaCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); - BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); - //会员直推排行 前三十 - List memberDirectPushVOList = cuMemberService.getMemberDirectPush(startDate, endDate, number, usdPv, pkCountry, memberDirectPushParam.getMemberCode()); - - // 数据脱敏 - int num = 0; - for (MemberDirectPushVO a : memberDirectPushVOList) { - num += 1; - a.setRanking(num); - a.setMemberName(a.getMemberName()); - a.setOrderAchieve(a.getOrderAchieve().multiply(chinaInExchangeRate).setScale(2, BigDecimal.ROUND_HALF_UP)); - a.setOrderAchieveStr(a.getOrderAchieve().multiply(chinaInExchangeRate).divide(new BigDecimal(10000), 0, BigDecimal.ROUND_FLOOR) + "+"); - if (StringUtils.isNotBlank(a.getMemberCode())) { - // 查询是否登录会员 - if (a.getMemberCode().equals(loginMemberCode)) { - a.setIsLoginMember(EYesNo.YES.getIntValue()); - } else { - a.setIsLoginMember(EYesNo.NO.getIntValue()); - } - } else { - a.setIsLoginMember(EYesNo.NO.getIntValue()); - } - } - return AjaxResult.success(memberDirectPushVOList); - } - - /** - * 会员端直推排行 导出 - */ - @PostMapping("/get-member-direct-push-export") - public void getMemberDirectPushExport(MemberDirectPushParam memberDirectPushParam, HttpServletResponse response) { - //查询时间 - Date startDate = null; - Date endDate = null; - if (memberDirectPushParam.getPayDate() != null) { - startDate = DateUtils.currentMonthFirstDate(memberDirectPushParam.getPayDate()); - endDate = DateUtils.currentMonthLastDate(memberDirectPushParam.getPayDate()); - } else { - ExcelUtil util = new ExcelUtil<>(MemberDirectPushVO.class); - util.exportExcel(response, new ArrayList<>(), "排名信息"); - } - - String loginMemberCode = SecurityUtils.getMemberCode(); - // 排名前三十人 - Integer number = 30; - // 满足pv 条件 - BigDecimal conditionPv = new BigDecimal(100000); - Integer pkCountry = SecurityUtils.getPkCountry(); - //计算美金pv - R currency = iCurrencyServiceApi.getCurrency(pkCountry); - BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - BigDecimal usdPv = conditionPv.divide(inExchangeRate, 2, BigDecimal.ROUND_HALF_UP); - - // 中国汇率 - R chinaCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); - BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); - //会员直推排行 前三十 - - List memberDirectPushVOList = cuMemberService.getMemberDirectPush(startDate, endDate, number, usdPv, pkCountry, memberDirectPushParam.getMemberCode()); - int ranking = 0; - // 数据脱敏 - for (MemberDirectPushVO a : memberDirectPushVOList) { - a.setMemberName(a.getMemberName()); - - a.setOrderAchieve(a.getOrderAchieve().multiply(chinaInExchangeRate).setScale(2, BigDecimal.ROUND_HALF_UP)); - a.setOrderAchieveStr(a.getOrderAchieve().multiply(chinaInExchangeRate).divide(new BigDecimal(10000), 0, BigDecimal.ROUND_FLOOR) + "+"); - if (StringUtils.isNotBlank(a.getMemberCode())) { - // 查询是否登录会员 - if (a.getMemberCode().equals(loginMemberCode)) { - a.setIsLoginMember(EYesNo.YES.getIntValue()); - } else { - a.setIsLoginMember(EYesNo.NO.getIntValue()); - } - } else { - a.setIsLoginMember(EYesNo.NO.getIntValue()); - } - ranking += 1; - a.setRanking(ranking); - } - - ExcelUtil util = new ExcelUtil<>(MemberDirectPushVO.class); - util.exportExcel(response, memberDirectPushVOList, "排名信息"); - } - /** * 用户消费统计 */ 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 7effa2d0..717e0a56 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 @@ -611,19 +611,6 @@ public interface CuMemberMapper extends BaseMapper { */ CuMemberExt queryParentTeam(@Param("pkMember") Long pkMember); - /** - * 会员端直推排行 首页弹窗显示直推排行 - * - * @param startDate 查询开始时间 - * @param endDate 查询结束时间 - * @param number 查询人数 - * @param usdPv 查询条件pv（美金） - * @param pkCountry 所属国家 - * @param memberCode 会员编号 - * @return - */ - List getMemberDirectPush(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("number") Integer number, @Param("usdPv") BigDecimal usdPv, @Param("pkCountry") Integer pkCountry, @Param("memberCode") String memberCode); - /** * 用户消费统计 * 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 ef10f8ea..72f6e68c 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 @@ -727,19 +727,6 @@ public interface ICuMemberService extends IService { */ CuMemberExt queryParentTeam(Long pkMember); - /** - * 会员端直推排行 首页弹窗显示直推排行 - * - * @param startDate 查询开始时间 - * @param endDate 查询结束时间 - * @param number 查询人数 - * @param usdPv 查询条件pv（美金） - * @param pkCountry 所属国家 - * @param memberCode 会员编号 - * @return - */ - List getMemberDirectPush(Date startDate, Date endDate, Integer number, BigDecimal usdPv, Integer pkCountry, String memberCode); - /** * 用户消费统计 * 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 7e644467..2bb265c4 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 @@ -2493,13 +2493,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectRegList(marketNewsParam); } - /** - * 计算明星用时 - */ - public String getStarTime() { - return RandomUtil.randomDouble(5, 10) + ""; - } - @Override public int checkParent(String topCode, Long pkMember) { return baseMapper.checkParent(topCode, pkMember); @@ -3053,22 +3046,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.queryParentTeam(pkMember); } - /** - * 会员端直推排行 首页弹窗显示直推排行 - * - * @param startDate 查询开始时间 - * @param endDate 查询结束时间 - * @param number 查询人数 - * @param usdPv 查询条件pv（美金） - * @param pkCountry 所属国家 - * @param memberCode 会员编号 - * @return - */ - @Override - public List getMemberDirectPush(Date startDate, Date endDate, Integer number, BigDecimal usdPv, Integer pkCountry, String memberCode) { - return baseMapper.getMemberDirectPush(startDate, endDate, number, usdPv, pkCountry, memberCode); - } - /** * 用户消费统计 * 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 28e14fd9..bd0333d8 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 @@ -2020,51 +2020,6 @@ where rownum = 1 - -