bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java

@@ -248,16 +248,11 @@ public class ApiMemberController extends BaseController {
         if (CollectionUtil.isEmpty(cuMemberList)) {
             return AjaxResult.error("会员联系方式不存在");
         }
-
-        CuMemberExt cuMemberExt = null;
-        for (CuMemberExt tmpMember : cuMemberList) {
-            if (tmpMember.getMemberCode().equals(param.getMemberCode())) {
-                cuMemberExt = tmpMember;
-            }
-        }
-        if (null == cuMemberExt) {
-            return AjaxResult.error("会员信息不存在");
+        if (cuMemberList.size() > 1) {
+            // 2025.02.19 添加需求，如果一个手机号查询出两个会员编号，需要提示联系客户进行修改
+            return AjaxResult.error("请联系客服进行操作");
         }
+        CuMemberExt cuMemberExt = cuMemberList.get(0);
         Long memberId = cuMemberExt.getPkId();
 
         // 校验短信验证码是否有效

bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java

@@ -7,17 +7,15 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
- * 忘记密码保存入参
+ * @Description: 忘记密码保存入参
+ * @Author: jiang chao
+ * @Time: 2024/12/25 14:33
+ * @Classname: ForgetPasswordParam
+ * @PackageName: com.hzs.member.base.param
  */
 @Data
 public class ForgetPasswordParam implements Serializable {
 
-    /**
-     * 会员编号
-     */
-    @NotEmpty(message = "会员编号不能为空")
-    private String memberCode;
-
     /**
      * 联系方式
      */

bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java

@@ -1,5 +1,6 @@
 package com.hzs.member.self.controller.api;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.hzs.common.core.annotation.RepeatSubmitSimple;
 import com.hzs.common.core.constant.MagicNumberConstants;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
@@ -13,7 +14,11 @@ import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.common.domain.member.self.CuSelfServiceLog;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.util.TransactionUtils;
+import com.hzs.member.account.dto.BusinessCommissionDTO;
+import com.hzs.member.account.dto.MemberAmountDTO;
+import com.hzs.member.account.dto.MemberBalanceDTO;
 import com.hzs.member.account.service.ICuMemberAuthenticationService;
+import com.hzs.member.account.service.ICuMemberTradeService;
 import com.hzs.member.account.vo.CuMemberAuthenticationVO;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.self.service.ICuSelfServiceLogService;
@@ -21,16 +26,30 @@ import com.hzs.member.self.vo.DomicileChangeVO;
 import com.hzs.member.sms.service.impl.ApiSmsServiceImpl;
 import com.hzs.system.config.IServiceChargeServiceApi;
 import com.hzs.system.config.dto.ServiceChargeDTO;
+import com.hzs.system.sys.IApprovalServiceApi;
+import com.hzs.system.sys.dto.ApprovalInfoDTO;
+import com.hzs.system.sys.dto.ApprovalItemInfoDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * 变理户籍
+ *
+ * @Description:
+ * @Author: ljc
+ * @Time: 2023/4/18 10:07
+ * @Classname: ApiDomicileChangeController
+ * @Package_name: com.hzs.member.self.controller.api
  */
 @Slf4j
 @RequestMapping("/api/change-domicile")
@@ -38,16 +57,25 @@ import java.util.List;
 public class ApiDomicileChangeController extends BaseController {
 
     @Autowired
-    private ICuMemberAuthenticationService iCuMemberAuthenticationService;
+    private ICuMemberAuthenticationService cuMemberAuthenticationService;
+
     @Autowired
-    private ICuMemberService iCuMemberService;
+    private ICuMemberService cuMemberService;
+
     @Autowired
     private ApiSmsServiceImpl apiSmsService;
+
     @Autowired
-    private ICuSelfServiceLogService iCuSelfServiceLogService;
+    private ICuMemberTradeService cuMemberTradeService;
+
+    @Autowired
+    private ICuSelfServiceLogService serviceLogService;
 
     @DubboReference
-    IServiceChargeServiceApi iServiceChargeServiceApi;
+    IServiceChargeServiceApi serviceChargeServiceApi;
+
+    @DubboReference
+    IApprovalServiceApi iApprovalServiceApi;
 
     /**
      * 查询可申请信息
@@ -57,7 +85,7 @@ public class ApiDomicileChangeController extends BaseController {
     @GetMapping("/application-info-list")
     public AjaxResult applicationInformation() {
         Long pkMember = SecurityUtils.getUserId();
-        CuMemberExt member = iCuMemberService.getMemberById(pkMember);
+        CuMemberExt member = cuMemberService.getMemberById(pkMember);
         DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode())
                 .memberName(member.getMemberName()).phone(member.getPhone())
                 .changeNum(MagicNumberConstants.CHANGE_NUM).build();
@@ -67,7 +95,7 @@ public class ApiDomicileChangeController extends BaseController {
 
     @GetMapping("/application-info-detail")
     public AjaxResult applicationInformationDetail() {
-        return AjaxResult.success(iCuSelfServiceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry()));
+        return AjaxResult.success(serviceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry()));
     }
 
     /**
@@ -79,7 +107,7 @@ public class ApiDomicileChangeController extends BaseController {
     public AjaxResult appliedInformation() {
         DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().pkMember(SecurityUtils.getUserId())
                 .pkCountry(SecurityUtils.getPkCountry()).editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()).build();
-        List<DomicileChangeVO> domicileChangeVOList = (List<DomicileChangeVO>) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1];
+        List<DomicileChangeVO> domicileChangeVOList = (List<DomicileChangeVO>) serviceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1];
         return AjaxResult.success(domicileChangeVOList);
     }
 
@@ -91,7 +119,7 @@ public class ApiDomicileChangeController extends BaseController {
      */
     @GetMapping("/show-index-domicile")
     public AjaxResult showIndexDomicile() {
-        return AjaxResult.success(iCuSelfServiceLogService.showIndexDomicile(SecurityUtils.getPkCountry(), SecurityUtils.getUserId()));
+        return AjaxResult.success(serviceLogService.showIndexDomicile(SecurityUtils.getPkCountry(), SecurityUtils.getUserId()));
     }
 
 
@@ -131,15 +159,21 @@ public class ApiDomicileChangeController extends BaseController {
         if (!existApprovalData.equals(AjaxResult.success())) {
             return existApprovalData;
         }
+        //余额是否充足
+        AjaxResult accountBalance = isAccountBalance(domicileChangeVO);
+        if (!accountBalance.equals(AjaxResult.success())) {
+            return accountBalance;
+        }
         //验证码校验
         String key = ESmsTemplate.VERIFICATION.getCache() + pkMember;
         String message = apiSmsService.checkSms(key, domicileChangeVO.getVerificationCode());
         if (null != message) {
             return AjaxResult.error(message);
         }
-        return toAjax(iCuSelfServiceLogService.saveChangeDomicile(domicileChangeVO));
+        return toAjax(serviceLogService.saveChangeDomicile(domicileChangeVO));
     }
 
+
     /**
      * 显示户籍变更信息
      *
@@ -151,10 +185,10 @@ public class ApiDomicileChangeController extends BaseController {
         String idFront = null;
         Long pkMember = SecurityUtils.getUserId();
         Integer pkCountry = SecurityUtils.getPkCountry();
-        CuMemberExt member = iCuMemberService.getMemberById(pkMember);
+        CuMemberExt member = cuMemberService.getMemberById(pkMember);
         //查询实名认证信息原证件图
         CuMemberAuthenticationVO authenticationVO = CuMemberAuthenticationVO.builder().pkCountry(pkCountry).pkMember(pkMember).build();
-        CuMemberAuthenticationVO cuMemberAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO);
+        CuMemberAuthenticationVO cuMemberAuthenticationVO = cuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO);
         if (null != cuMemberAuthenticationVO) {
             idBack = cuMemberAuthenticationVO.getIdBack();
             idFront = cuMemberAuthenticationVO.getIdFront();
@@ -178,7 +212,7 @@ public class ApiDomicileChangeController extends BaseController {
         cuSelfServiceLog.setPkCountry(domicileChangeVO.getPkCountry());
         cuSelfServiceLog.setEditType(EApprovalBusiness.DOMICILE_CHANGE.getValue());
         cuSelfServiceLog.setPkMember(domicileChangeVO.getPkMember());
-        Integer check = iCuSelfServiceLogService.checkSelfService(cuSelfServiceLog);
+        Integer check = serviceLogService.checkSelfService(cuSelfServiceLog);
         if (check > 0) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
         }
@@ -197,7 +231,43 @@ public class ApiDomicileChangeController extends BaseController {
         serviceChargeDTO.setType(EApprovalBusiness.DOMICILE_CHANGE.getValue());
         serviceChargeDTO.setPkCountry(pkCountry);
         serviceChargeDTO.setQuantity(MagicNumberConstants.CHANGE_NUM);
-        return iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO).getData();
+        return serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO).getData();
+    }
+
+    /**
+     * 查询余额是否充足
+     *
+     * @param domicileChangeVO 户籍变更信息
+     * @return AjaxResult
+     */
+    private AjaxResult isAccountBalance(DomicileChangeVO domicileChangeVO) {
+        List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
+        memberAmountDTOList.add(MemberAmountDTO.builder().pkMember(domicileChangeVO.getPkMember()).tradeAmount(domicileChangeVO.getAmount()).build());
+        BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().pkAccount(domicileChangeVO.getPkAccount()).memberAmountDTOList(memberAmountDTOList).build();
+        List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
+        if (CollectionUtil.isNotEmpty(memberBalanceList)) {
+            return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT));
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 是否配置审批人信息
+     *
+     * @param pkCountry 国家ID
+     * @return AjaxResult
+     */
+    private AjaxResult isConfigApprovalInfo(Integer pkCountry, DomicileChangeVO domicileChangeVO) {
+        Map<Integer, ApprovalInfoDTO> approvalInfoMap = iApprovalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.DOMICILE_CHANGE.getValue()), pkCountry).getData();
+        // 根据审批业务类型判断是否配置审批流程
+        ApprovalInfoDTO approvalInfo = approvalInfoMap.get(EApprovalBusiness.DOMICILE_CHANGE.getValue());
+        if (null == approvalInfo || CollectionUtil.isEmpty(approvalInfo.getItemList())) {
+            log.error("{} 提交认证失败，未配置审批流程", EApprovalBusiness.DOMICILE_CHANGE.getLabel());
+            return AjaxResult.error("提交认证失败，请联系客服");
+        }
+        List<Long> userList = approvalInfo.getItemList().stream().map(ApprovalItemInfoDTO::getPkUser).collect(Collectors.toList());
+        domicileChangeVO.setUserIdList(userList);
+        return AjaxResult.success();
     }
 
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java

@@ -43,17 +43,22 @@ public class ApiSmsController extends BaseController {
     /**
      * 忘记密码验证码
      *
-     * @param memberCode 会员编号
-     * @param phone      手机号码
+     * @param phone 手机号码
      * @return
      */
     @RepeatSubmitSimple
     @GetMapping("/forget-verification")
-    public AjaxResult forgetVerification(@RequestParam String memberCode, @RequestParam String phone) {
+    public AjaxResult forgetVerification(@RequestParam String phone) {
+        // 2024.12.25 一个手机号只能注册一个会员编号，找回密码只需要手机号（9035）
         List<CuMemberExt> cuMemberList = iCuMemberService.listMemberByPhone(phone);
         if (CollectionUtil.isEmpty(cuMemberList)) {
             return AjaxResult.error("会员联系方式不存在");
         }
+        if (cuMemberList.size() > 1) {
+            // 2025.02.19 添加需求，如果一个手机号查询出两个会员编号，需要提示联系客户进行修改
+            return AjaxResult.error("请联系客服进行操作");
+        }
+
         return toAjax(iApiCodeService.sendRecoverCode(phone));
     }
 

bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java

@@ -8,14 +8,12 @@ import com.hzs.common.core.constant.EnumsPrefixConstants;
 import com.hzs.common.core.constant.TableNameConstants;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
-import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.utils.DateUtils;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.poi.ExcelUtil;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
-import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.ext.CuMemberExt;
@@ -43,6 +41,14 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+/**
+ * @BelongsProject: hzs_cloud
+ * @BelongsPackage: com.hzs.report.member.controller
+ * @Author: yh
+ * @CreateTime: 2023-08-26  09:40
+ * @Description:
+ * @Version: 1.0
+ */
 @RequestMapping("/manager/member-report")
 @RestController
 public class MemberReportController extends BaseController {
@@ -52,19 +58,23 @@ public class MemberReportController extends BaseController {
     @Autowired
     private ITransactionCommonService iTransactionCommonService;
     @Autowired
-    private IMemberService iMemberService;
+    private IMemberService memberService;
     @Autowired
-    private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
+    private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
 
     @DubboReference
-    IMemberServiceApi iMemberServiceApi;
+    IMemberServiceApi memberServiceApi;
     @DubboReference
-    IAreaServiceApi iAreaServiceApi;
+    IAreaServiceApi areaServiceApi;
     @DubboReference
-    ICurrencyServiceApi iCurrencyServiceApi;
+    ICurrencyServiceApi currencyServiceApi;
 
     /**
-     * 伞下直推新增业绩
+     * @description: 伞下直推新增业绩
+     * @author: zhang jing
+     * @date: 2023/10/10 9:53
+     * @param: [memberCode, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex, orderType]
+     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT)
     @GetMapping("/direct-push-new")
@@ -95,14 +105,8 @@ public class MemberReportController extends BaseController {
         Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime);
         dpo.setZonpayTime(zonpayTime);
         dpo.setEndPayTime(endPayTime);
-
-        CuMemberSettlePeriod startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr);
-        if (null == startPeriod) {
-            throw new ServiceException("查询开始时间不存在数据");
-        }
-        int periodSta = startPeriod.getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
-
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         //查询最新期数
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodSta);
@@ -120,7 +124,7 @@ public class MemberReportController extends BaseController {
         if (CollectionUtil.isEmpty(memberList)) {
             return getDataTable(new ArrayList<>());
         }
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         //伞下直推新增业绩
         List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieUpList(dpo, Collections.singletonList(memberList.get(0).getPkMember()));
         //查询大小区业绩
@@ -146,7 +150,11 @@ public class MemberReportController extends BaseController {
 
 
     /**
-     * 导入批量查询会员信息
+     * @description: 导入批量查询会员信息
+     * @author: zhang jing
+     * @date: 2025/2/11 10:01
+     * @param: [file]
+     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.IMPORT)
     @PostMapping("/batch-importData")
@@ -176,7 +184,11 @@ public class MemberReportController extends BaseController {
 
 
     /**
-     * 导出伞下直推新增业绩
+     * @description: 导出伞下直推新增业绩
+     * @author: zhang jing
+     * @date: 2023/10/10 9:53
+     * @param: [memberCode, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex, response, orderType]
+     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT)
     @PostMapping("/export-direct-push-new")
@@ -211,15 +223,15 @@ public class MemberReportController extends BaseController {
         Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime());
         dpo.setZonpayTime(zonpayTime);
         //查询最新期数
-        int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodSta);
         dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd);
         //伞下直推新增业绩
         List<DirectPushNewVo> memberList = memberReportService.directPushNewList(dpo.getMemberCodeList(), pkCountry, startPayTime, endPayTime);
         List<Long> pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList());
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieUpList(dpo, pkMemberList);
 
         if (CollectionUtil.isNotEmpty(memberList)) {
@@ -248,7 +260,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 伞下直推新增业金额绩大小区金额业绩详情
+     * @description: 伞下直推新增业金额绩大小区金额业绩详情
+     * @author: zhang jing
+     * @date: 2025/2/17 16:05
+     * @param: [dpo]
+     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW_DETAILS, method = EOperationMethod.SELECT)
     @GetMapping("/directPush-up-details")
@@ -259,9 +275,9 @@ public class MemberReportController extends BaseController {
         if (StringUtils.isNull(dpo.getMemberCode())) {
             return getDataTable(new ArrayList<>());
         }
-        R<CuMember> memberDto = iMemberServiceApi.getMember(dpo.getMemberCode());
+        R<CuMember> memberDto = memberServiceApi.getMember(dpo.getMemberCode());
         CuMember member = memberDto.getData();
-        if (member == null) {
+        if(member==null){
             return getDataTable(new ArrayList<>());
         }
         dpo.setPkMember(member.getPkId());
@@ -281,8 +297,8 @@ public class MemberReportController extends BaseController {
             endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
         }
         dpo.setEndPayTime(dpo.getEndPayTime());
-        int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         //查询最新期数
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@@ -298,18 +314,18 @@ public class MemberReportController extends BaseController {
             return getDataTable(new ArrayList<>());
         }
         List<Long> pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList());
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         //伞下直推新增业绩
         List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, pkMemberList);
         if (CollectionUtil.isNotEmpty(memberList)) {
             memberList.forEach(itm -> {
                 if (CollectionUtil.isNotEmpty(achieList)) {
-                    achieList.forEach(itmm -> {
-                        if (itm.getPkMember().equals(itmm.getPkMember())) {
+                    achieList.forEach(itmm->{
+                        if(itm.getPkMember().equals(itmm.getPkMember())){
                             if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
                                 //中国业绩转为人民币
                                 itm.setOrderAchieve(itmm.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
-                            } else {
+                            }else{
                                 itm.setOrderAchieve(itmm.getOrderAchieve());
                             }
                             itm.setOrderAmount(itmm.getOrderAmount());
@@ -318,32 +334,36 @@ public class MemberReportController extends BaseController {
                 }
             });
         }
-        List<DirectPushNewDetailsVo> dpdVoList = new ArrayList<>();
+        List<DirectPushNewDetailsVo> dpdVoList=new ArrayList<>();
         memberList.forEach(itm -> dpdVoList.add(BeanUtil.copyProperties(itm, DirectPushNewDetailsVo.class)));
         return getDataTable(dpdVoList);
     }
 
     /**
-     * 导出伞下直推新增业金额绩大小区金额业绩详情
+     * @description: 导出伞下直推新增业金额绩大小区金额业绩详情
+     * @author: zhang jing
+     * @date: 2025/2/17 16:46
+     * @param: [response, dpo]
+     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW_DETAILS, method = EOperationMethod.EXPORT)
     @PostMapping("/export-directPush-up-details")
-    public void exportDirectPushUpDetails(HttpServletResponse response, DirectPushNewVo dpo) {
+    public void exportDirectPushUpDetails(HttpServletResponse response,DirectPushNewVo dpo) {
         if (StringUtils.isNull(dpo.getStartPayTime()) || StringUtils.isNull(dpo.getEndPayTime())) {
-            return;
+            return ;
         }
         if (StringUtils.isNull(dpo.getMemberCode())) {
-            return;
+            return ;
         }
         Integer pkCountry = SecurityUtils.getPkCountry();
         Date date = DateUtils.currentDate();
         if (DateUtils.compareDate(dpo.getStartPayTime(), date) > 0 || DateUtils.compareDate(dpo.getEndPayTime(), date) > 0) {
-            return;
+            return ;
         }
-        R<CuMember> memberDto = iMemberServiceApi.getMember(dpo.getMemberCode());
+        R<CuMember> memberDto = memberServiceApi.getMember(dpo.getMemberCode());
         CuMember member = memberDto.getData();
-        if (member == null) {
-            return;
+        if(member==null){
+            return ;
         }
         dpo.setPkMember(member.getPkId());
         String date1 = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
@@ -356,8 +376,8 @@ public class MemberReportController extends BaseController {
             endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
         }
         dpo.setEndPayTime(dpo.getEndPayTime());
-        int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         //查询最新期数
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@@ -365,25 +385,25 @@ public class MemberReportController extends BaseController {
         if (memberReportService.selectExistTable(dpo.getAchieveTableNameSta()) == 0 ||
                 memberReportService.selectExistTable(dpo.getAchieveTableNameEnd()) == 0
         ) {
-            return;
+            return ;
         }
         //查询会员
         List<DirectPushNewVo> memberList = memberReportService.querDirectPushDetails(dpo);
         if (CollectionUtil.isEmpty(memberList)) {
-            return;
+            return ;
         }
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         //伞下直推新增业绩
         List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, Arrays.asList(memberList.get(0).getPkMember()));
         if (CollectionUtil.isNotEmpty(memberList)) {
             memberList.forEach(itm -> {
                 if (CollectionUtil.isNotEmpty(achieList)) {
-                    achieList.forEach(itmm -> {
-                        if (itm.getPkMember().equals(itmm.getPkMember())) {
+                    achieList.forEach(itmm->{
+                        if(itm.getPkMember().equals(itmm.getPkMember())){
                             if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
                                 //中国业绩转为人民币
                                 itm.setOrderAchieve(itmm.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
-                            } else {
+                            }else{
                                 itm.setOrderAchieve(itmm.getOrderAchieve());
                             }
                             itm.setOrderAmount(itmm.getOrderAmount());
@@ -392,14 +412,18 @@ public class MemberReportController extends BaseController {
                 }
             });
         }
-        List<DirectPushNewDetailsVo> dpdVoList = new ArrayList<>();
+        List<DirectPushNewDetailsVo> dpdVoList=new ArrayList<>();
         memberList.forEach(itm -> dpdVoList.add(BeanUtil.copyProperties(itm, DirectPushNewDetailsVo.class)));
         ExcelUtil<DirectPushNewDetailsVo> util = new ExcelUtil<>(DirectPushNewDetailsVo.class);
         util.exportExcel(response, dpdVoList, "伞下直推新增业绩详情导出");
     }
 
     /**
-     * 伞下直推新增业金额绩大小区金额业绩(新)
+     * @description: 伞下直推新增业金额绩大小区金额业绩(新)
+     * @author: zhang jing
+     * @date: 2025/2/21 9:52
+     * @param: [memberCode, pkCountry, startPayTime, endPayTime]
+     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT)
     @GetMapping("/direct-push-new-up")
@@ -425,19 +449,14 @@ public class MemberReportController extends BaseController {
         if (date1.equals(date2) || (DateUtils.compareDate(endPayTime, date) >= 0)) {
             dpo.setPayTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date));
             endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
-            String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
-            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
+            String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
+            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
         }
         Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime);
         dpo.setZonpayTime(zonpayTime);
         dpo.setEndPayTime(endPayTime);
-
-        CuMemberSettlePeriod startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr);
-        if (null == startPeriod) {
-            throw new ServiceException("查询开始时间不存在数据");
-        }
-        int periodSta = startPeriod.getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         //查询最新期数
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@@ -455,31 +474,31 @@ public class MemberReportController extends BaseController {
         if (CollectionUtil.isEmpty(memberList)) {
             return getDataTable(new ArrayList<>());
         }
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         //伞下直推新增业绩
         List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, Collections.singletonList(memberList.get(0).getPkMember()));
         //查询大小区业绩
         DirectPushNewVo sizeZoneAchie = memberReportService.sizeZoneAchieAmount(dpo, memberList.get(0).getPkMember(), currency.getData().getInExchangeRate());
         if (CollectionUtil.isNotEmpty(memberList)) {
             memberList.forEach(itm -> {
-                if (CollectionUtil.isNotEmpty(achieList)) {
-                    if (null != achieList.get(0)) {
-                        itm.setOrderAchieve(achieList.get(0).getOrderAchieve());
-                        itm.setOrderAmount(achieList.get(0).getOrderAmount());
-                        itm.setRegAmount(achieList.get(0).getRegAmount());
-                        itm.setRegAchieve(achieList.get(0).getRegAchieve());
-                        itm.setUpgAmount(achieList.get(0).getUpgAmount());
-                        itm.setUpgAchieve(achieList.get(0).getUpgAchieve());
-                        itm.setRepAmount(achieList.get(0).getRepAmount());
-                        itm.setRepAchieve(achieList.get(0).getRepAchieve());
-                        itm.setConAmount(achieList.get(0).getConAmount());
-                        itm.setConAchieve(achieList.get(0).getConAchieve());
-                        if (sizeZoneAchie != null) {
-                            itm.setSmallAreaPv(sizeZoneAchie.getSmallAreaPv());
-                            itm.setBigArealPv(sizeZoneAchie.getBigArealPv());
-                            itm.setSmallAreaAm(sizeZoneAchie.getSmallAreaAm());
-                            itm.setBigArealAm(sizeZoneAchie.getBigArealAm());
-                        }
+                if (null != achieList.get(0)) {
+                    itm.setOrderAchieve(achieList.get(0).getOrderAchieve());
+                    itm.setOrderAmount(achieList.get(0).getOrderAmount());
+                    itm.setRegAmount(achieList.get(0).getRegAmount());
+                    itm.setRegAchieve(achieList.get(0).getRegAchieve());
+                    itm.setUpgAmount(achieList.get(0).getUpgAmount());
+                    itm.setUpgAchieve(achieList.get(0).getUpgAchieve());
+                    itm.setRepAmount(achieList.get(0).getRepAmount());
+                    itm.setRepAchieve(achieList.get(0).getRepAchieve());
+                    itm.setConAmount(achieList.get(0).getConAmount());
+                    itm.setConAchieve(achieList.get(0).getConAchieve());
+                    if (sizeZoneAchie != null) {
+                        itm.setSmallAreaPv(sizeZoneAchie.getSmallAreaPv());
+                        itm.setBigArealPv(sizeZoneAchie.getBigArealPv());
+                        itm.setSmallAreaAm(sizeZoneAchie.getSmallAreaAm());
+                        itm.setBigArealAm(sizeZoneAchie.getBigArealAm());
+                    }
+                    if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
                         //中国业绩转为人民币
                         itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
                         itm.setRegAchieve(itm.getRegAchieve().multiply(currency.getData().getInExchangeRate()));
@@ -493,8 +512,13 @@ public class MemberReportController extends BaseController {
         return getDataTable(memberList);
     }
 
+
     /**
-     * 导出伞下直推新增业金额绩大小区金额业绩(新)
+     * @description: 导出伞下直推新增业金额绩大小区金额业绩(新)
+     * @author: zhang jing
+     * @date: 2024/3/19 10:57
+     * @param: [directPushNewVo, response]
+     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT)
     @PostMapping("/export-direct-push-new-up")
@@ -525,21 +549,21 @@ public class MemberReportController extends BaseController {
         if (date1.equals(date2) || (DateUtils.compareDate(endPayTime, date) >= 0)) {
             dpo.setPayTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date));
             endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
-            String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
-            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
+            String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
+            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
         }
         Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime());
         dpo.setZonpayTime(zonpayTime);
         //查询最新期数
-        int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
         dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodEnd);
         //伞下直推新增业绩
         List<DirectPushNewVo> memberList = memberReportService.directPushNewList(dpo.getMemberCodeList(), pkCountry, startPayTime, endPayTime);
         List<Long> pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList());
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, pkMemberList);
 
         if (CollectionUtil.isNotEmpty(memberList)) {
@@ -582,7 +606,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 伞下直推新增盒数大小区盒数
+     * @description: 伞下直推新增盒数大小区盒数
+     * @author: zhang jing
+     * @date: 2025/2/14 9:53
+     * @param: [memberCode, pkCountry, startPayTime, endPayTime]
+     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_BOX, method = EOperationMethod.SELECT)
     @GetMapping("/direct-push-box")
@@ -615,15 +643,15 @@ public class MemberReportController extends BaseController {
             Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime);
             dpo.setZonpayTime(zonpayTime);
             endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
-            String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
-            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
+            String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
+            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
         }
         dpo.setEndPayTime(endPayTime);
         dpo.setStartPayTime(startPayTime);
 
 
-        int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         dpo.setPkCountry(pkCountry);
         //查询最新期数
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@@ -631,7 +659,7 @@ public class MemberReportController extends BaseController {
         dpo.setMemberRetailTable(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd);
         if (StringUtils.isNotEmpty(dpo.getPayTime())) {
             //查询会员是否激活
-            int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
+            int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
             dpo.setMemberRetailSTable(TableNameConstants.CU_MEMBER_RETAIL_S + period);
         }
 
@@ -673,7 +701,11 @@ public class MemberReportController extends BaseController {
 
 
     /**
-     * 导出伞下直推新增盒数大小区盒数
+     * @description: 导出伞下直推新增盒数大小区盒数
+     * @author: zhang jing
+     * @date: 2025/2/17 9:58
+     * @param: [response, dpo]
+     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_BOX, method = EOperationMethod.EXPORT)
     @PostMapping("export-direct-push-box")
@@ -710,19 +742,19 @@ public class MemberReportController extends BaseController {
             endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
             Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime());
             dpo.setZonpayTime(zonpayTime);
-            String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
-            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
+            String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
+            dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
         }
 
-        int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
-        int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
+        int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
+        int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
         //查询最新期数
         dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
         dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodEnd);
         dpo.setMemberRetailTable(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd);
         if (StringUtils.isNotEmpty(dpo.getPayTime())) {
             //查询会员是否激活
-            int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
+            int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
             dpo.setMemberRetailSTable(TableNameConstants.CU_MEMBER_RETAIL_S + period);
         }
 
@@ -739,7 +771,7 @@ public class MemberReportController extends BaseController {
         List<Long> pkMemberList = new ArrayList<>();
         pkMemberList.addAll(memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList()));
         //查询会员是否激活
-        List<DirectPushBoxVo> enableStatusList = memberReportService.selectMemberActiveState(dpo, pkMemberList);
+        List<DirectPushBoxVo> enableStatusList = memberReportService.selectMemberActiveState(dpo,pkMemberList);
         List<DirectPushBoxVo> boxVoList = new ArrayList<>();
         memberList.forEach(item -> boxVoList.add(BeanUtil.copyProperties(item, DirectPushBoxVo.class)));
         //伞下直推新增盒数
@@ -799,7 +831,7 @@ public class MemberReportController extends BaseController {
         if (endPayTime != null) {
             endPayTime = DateUtils.getEndTime(endPayTime);
         }
-        R<CuMember> memberDto = iMemberServiceApi.getMember(memberCode);
+        R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
         CuMember member = memberDto.getData();
         Integer pkCountry = null;
         if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
@@ -809,7 +841,7 @@ public class MemberReportController extends BaseController {
         if (member == null) {
             return getDataTable(new ArrayList<>());
         }
-        R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         CurrencyDTO currency = currencyDto.getData();
         List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(orderType);
 
@@ -857,7 +889,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 伞下新增安置业绩列表（历史）
+     * @description: 伞下新增安置业绩列表（历史）
+     * @author: zhang jing
+     * @date: 2024/3/12 15:15
+     * @param: [memberCode, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, orderType, pkAwards]
+     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.SELECT)
     @GetMapping("/member-resettle-achieve_up")
@@ -889,22 +925,22 @@ public class MemberReportController extends BaseController {
         if (StringUtils.isEmpty(memberCode)) {
             return getDataTable(new ArrayList<>());
         }
-        R<CuMemberExt> memberDto = iMemberServiceApi.getMemberByCode(memberCode);
+        R<CuMemberExt> memberDto = memberServiceApi.getMemberByCode(memberCode);
         CuMember member = memberDto.getData();
         if (member == null) {
             return getDataTable(new ArrayList<>());
         }
         Integer pkCountry = SecurityUtils.getPkCountry();
 
-        R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         CurrencyDTO currency = currencyDto.getData();
 
         List<MemberResettleAchieveVo> memberResettleAchieveList = new ArrayList<>();
         BigDecimal inExchangeRate = currency.getInExchangeRate();
         //查询最新期数
-        int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        int staPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(startDateStr)).getPkId();
-        int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(endDateStr)).getPkId();
         String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr);
         String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr);
@@ -936,7 +972,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 导出伞下新增安置业绩列表
+     * @description: 导出伞下新增安置业绩列表
+     * @author: zhang jing
+     * @date: 2024/3/15 14:19
+     * @param: [response, memberCode, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, orderType, pkAwards]
+     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.EXPORT)
     @PostMapping("/member-resettle-achieve_up_export")
@@ -968,7 +1008,7 @@ public class MemberReportController extends BaseController {
         if (StringUtils.isEmpty(memberCode)) {
             return;
         }
-        R<CuMemberExt> memberDto = iMemberServiceApi.getMemberByCode(memberCode);
+        R<CuMemberExt> memberDto = memberServiceApi.getMemberByCode(memberCode);
         CuMember member = memberDto.getData();
         Integer pkCountry = null;
         if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
@@ -978,14 +1018,14 @@ public class MemberReportController extends BaseController {
         if (member == null) {
             return;
         }
-        R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         CurrencyDTO currency = currencyDto.getData();
         List<MemberResettleAchieveVo> memberResettleAchieveList = new ArrayList<>();
         BigDecimal inExchangeRate = currency.getInExchangeRate();
         //查询最新期数
-        int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        int staPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(startDateStr)).getPkId();
-        int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(endDateStr)).getPkId();
         String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr);
 
@@ -1029,7 +1069,7 @@ public class MemberReportController extends BaseController {
         if (memberResettleAchieveParam.getEndPayTime() != null) {
             memberResettleAchieveParam.setEndPayTime(DateUtils.getEndTime(memberResettleAchieveParam.getEndPayTime()));
         }
-        R<CuMember> memberDto = iMemberServiceApi.getMember(memberResettleAchieveParam.getMemberCode());
+        R<CuMember> memberDto = memberServiceApi.getMember(memberResettleAchieveParam.getMemberCode());
         CuMember member = memberDto.getData();
         if (member == null) {
             ExcelUtil<MemberResettleAchieveVo> util = new ExcelUtil<>(MemberResettleAchieveVo.class);
@@ -1046,7 +1086,7 @@ public class MemberReportController extends BaseController {
             if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
                 pkCountry = SecurityUtils.getPkCountry();
             }
-            R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             CurrencyDTO currency = currencyDto.getData();
             List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(memberResettleAchieveParam.getOrderType());
 
@@ -1095,6 +1135,9 @@ public class MemberReportController extends BaseController {
 
     /**
      * 订单币种查询
+     *
+     * @param
+     * @return
      */
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_CURRENCY_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/order-currency-list")
@@ -1160,6 +1203,9 @@ public class MemberReportController extends BaseController {
 
     /**
      * 订单分布统计
+     *
+     * @param
+     * @return
      */
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.GET_ORDER_DISTRIBUTION, method = EOperationMethod.SELECT)
     @GetMapping("/get-order-distribution")
@@ -1187,6 +1233,9 @@ public class MemberReportController extends BaseController {
 
     /**
      * 出货明细汇总统计
+     *
+     * @param
+     * @return
      */
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PRODUCT_SHIPPING_DETAILS_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/product-shipping-details-list")
@@ -1311,7 +1360,7 @@ public class MemberReportController extends BaseController {
             // 补全23:59:59
             reportSummaryVo.setEndCreateTime(DateUtils.getEndTime(reportSummaryVo.getEndCreateTime()));
         }
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         startPage();
         reportSummaryVo.setPkCountry(SecurityUtils.getPkCountry());
         List<ReportSummaryVo> reportSummaryList = memberReportService.reportSummaryList(reportSummaryVo);
@@ -1341,7 +1390,7 @@ public class MemberReportController extends BaseController {
             // 补全23:59:59
             reportSummaryVo.setEndCreateTime(DateUtils.getEndTime(reportSummaryVo.getEndCreateTime()));
         }
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         reportSummaryVo.setPkCountry(SecurityUtils.getPkCountry());
         List<ReportSummaryVo> reportSummaryList = memberReportService.reportSummaryList(reportSummaryVo);
         for (ReportSummaryVo summaryVo : reportSummaryList) {
@@ -1360,7 +1409,10 @@ public class MemberReportController extends BaseController {
     }
 
     /*
-     *  推荐反查
+     * @description: 推荐反查
+     * @author: sui q
+     * @date: 2023/8/28 10:07
+     * @param: null null
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.SELECT)
     @PostMapping("/parent-peg")
@@ -1368,7 +1420,7 @@ public class MemberReportController extends BaseController {
         List<CuMemberPushAchieveVO> cuMemberPushAchieveVOList = new ArrayList<>();
         if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) {
             startPage();
-            List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
+            List<CuMemberAchieveExt> cuMemberAchieveExtList = memberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
             for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
                 CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
                 cuMemberPushAchieveVOList.add(vo);
@@ -1381,7 +1433,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 导出推荐反查
+     * @description: 导出推荐反查
+     * @author: zhang jing zj
+     * @date: 2023/9/12 10:04
+     * @param: [response, cuMemberUmbrellaParam]
+     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.EXPORT)
     @PostMapping("/export-parent-peg")
@@ -1389,7 +1445,7 @@ public class MemberReportController extends BaseController {
         List<CuMemberPushAchieveVO> cuMemberPushAchieveVOList = new ArrayList<>();
 
         if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) {
-            List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
+            List<CuMemberAchieveExt> cuMemberAchieveExtList = memberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
             if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) {
                 // 获取需要翻译的枚举翻译
                 Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ECategory.values());
@@ -1415,7 +1471,7 @@ public class MemberReportController extends BaseController {
     @GetMapping("/product-detail-query-list")
     public TableDataInfo productDetailQuery(ProductDetailQueryParam productDetailQueryParam) {
 //        if (StringUtils.isNotBlank(productDetailQueryParam.getMemberCode())) {
-//            R<CuMember> memberDto = iMemberServiceApi.getMember(productDetailQueryParam.getMemberCode());
+//            R<CuMember> memberDto = memberServiceApi.getMember(productDetailQueryParam.getMemberCode());
 //            CuMember member = memberDto.getData();
 //            if (member != null) {
 //                productDetailQueryParam.setMemberCode(null);
@@ -1430,7 +1486,7 @@ public class MemberReportController extends BaseController {
             productDetailQueryParam.setEndPayTime(DateUtils.getEndTime(productDetailQueryParam.getEndPayTime()));
         }
 
-        R<Map<Integer, String>> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
+        R<Map<Integer, String>> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
         Map<Integer, String> map = areaMap.getData();
         startPage();
         List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(productDetailQueryParam.getOrderType());
@@ -1481,7 +1537,7 @@ public class MemberReportController extends BaseController {
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PRODUCT_DETAIL_QUERY_LIST, method = EOperationMethod.EXPORT)
     @PostMapping("/product-detail-query-list-export")
     public void productDetailQueryExport(ProductDetailQueryParam productDetailQueryParam, HttpServletResponse response) {
-        R<Map<Integer, String>> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
+        R<Map<Integer, String>> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
         Map<Integer, String> map = areaMap.getData();
         if (productDetailQueryParam.getStartPayTime() != null) {
             productDetailQueryParam.setStartPayTime(DateUtils.getStartTime(productDetailQueryParam.getStartPayTime()));
@@ -1547,7 +1603,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 手动统计会员直推金额业绩盒数数据
+     * @description: 手动统计会员直推金额业绩盒数数据
+     * @author: zhang jing
+     * @date: 2025/2/12 16:15
+     * @param: [staDate, endDate]
+     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/staAmountBox")
     public AjaxResult staAmountBox(String staDate, String endDate) {
@@ -1556,7 +1616,11 @@ public class MemberReportController extends BaseController {
     }
 
     /**
-     * 初始化数据会员直推金额业绩盒数数据
+     * @description: 初始化数据会员直推金额业绩盒数数据
+     * @author: zhang jing
+     * @date: 2025/2/12 17:32
+     * @param: [staDate, endDate]
+     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/initial")
     public AjaxResult initial(String staDate, String endDate) {

bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java

@@ -5,6 +5,9 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 
 /**
  * 会员结算期间 Mapper 接口
+ *
+ * @author hzs
+ * @since 2022-10-26
  */
 public interface CuMemberSettlePeriodMapper extends BaseMapper<CuMemberSettlePeriod> {
 

bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java

@@ -5,6 +5,9 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 
 /**
  * 会员结算期间 服务类
+ *
+ * @author hzs
+ * @since 2022-10-26
  */
 public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePeriod> {
 
@@ -12,6 +15,9 @@ public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePer
      * 根据日期获得日期对应的期间
      *
      * @param date 日期 2023-02-02
+     * @return: CuMemberSettlePeriod
+     * @Author: sui q
+     * @Date: 2022/11/2 13:32
      */
     CuMemberSettlePeriod getCuMemberSettlePeriodByDate(String date);
 

bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/impl/CuMemberSettlePeriodServiceImpl.java

@@ -14,6 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员结算期间 服务实现类
+ *
+ * @author hzs
+ * @since 2022-10-26
  */
 @Service
 public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettlePeriodMapper, CuMemberSettlePeriod> implements ICuMemberSettlePeriodService {