diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index a7506a4c..03236b4b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -121,7 +121,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { boxNum += saOrderItems.getWaresQuantity(); - break; } } saOrderExt.setBoxNum(boxNum); @@ -259,7 +258,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { boxNum += saOrderItems.getWaresQuantity(); - break; } } saOrderExt.setBoxNum(boxNum); @@ -486,7 +484,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { boxNum += saOrderItems.getWaresQuantity(); - break; } } // 个人累计消费pv diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 86d04ef3..87055001 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -248,11 +248,16 @@ public class ApiMemberController extends BaseController { if (CollectionUtil.isEmpty(cuMemberList)) { return AjaxResult.error("会员联系方式不存在"); } - if (cuMemberList.size() > 1) { - // 2025.02.19 添加需求，如果一个手机号查询出两个会员编号，需要提示联系客户进行修改 - return AjaxResult.error("请联系客服进行操作"); + + CuMemberExt cuMemberExt = null; + for (CuMemberExt tmpMember : cuMemberList) { + if (tmpMember.getMemberCode().equals(param.getMemberCode())) { + cuMemberExt = tmpMember; + } + } + if (null == cuMemberExt) { + return AjaxResult.error("会员信息不存在"); } - CuMemberExt cuMemberExt = cuMemberList.get(0); Long memberId = cuMemberExt.getPkId(); // 校验短信验证码是否有效 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java index 34972a68..8e09a4a0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java @@ -7,15 +7,17 @@ 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; + /** * 联系方式 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java index 36441b51..60064152 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java @@ -1,6 +1,5 @@ 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; @@ -14,11 +13,7 @@ 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; @@ -26,30 +21,16 @@ 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") @@ -57,25 +38,16 @@ import java.util.stream.Collectors; public class ApiDomicileChangeController extends BaseController { @Autowired - private ICuMemberAuthenticationService cuMemberAuthenticationService; - + private ICuMemberAuthenticationService iCuMemberAuthenticationService; @Autowired - private ICuMemberService cuMemberService; - + private ICuMemberService iCuMemberService; @Autowired private ApiSmsServiceImpl apiSmsService; - @Autowired - private ICuMemberTradeService cuMemberTradeService; - - @Autowired - private ICuSelfServiceLogService serviceLogService; + private ICuSelfServiceLogService iCuSelfServiceLogService; @DubboReference - IServiceChargeServiceApi serviceChargeServiceApi; - - @DubboReference - IApprovalServiceApi iApprovalServiceApi; + IServiceChargeServiceApi iServiceChargeServiceApi; /** * 查询可申请信息 @@ -85,7 +57,7 @@ public class ApiDomicileChangeController extends BaseController { @GetMapping("/application-info-list") public AjaxResult applicationInformation() { Long pkMember = SecurityUtils.getUserId(); - CuMemberExt member = cuMemberService.getMemberById(pkMember); + CuMemberExt member = iCuMemberService.getMemberById(pkMember); DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode()) .memberName(member.getMemberName()).phone(member.getPhone()) .changeNum(MagicNumberConstants.CHANGE_NUM).build(); @@ -95,7 +67,7 @@ public class ApiDomicileChangeController extends BaseController { @GetMapping("/application-info-detail") public AjaxResult applicationInformationDetail() { - return AjaxResult.success(serviceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry())); + return AjaxResult.success(iCuSelfServiceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry())); } /** @@ -107,7 +79,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 domicileChangeVOList = (List) serviceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; + List domicileChangeVOList = (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; return AjaxResult.success(domicileChangeVOList); } @@ -119,7 +91,7 @@ public class ApiDomicileChangeController extends BaseController { */ @GetMapping("/show-index-domicile") public AjaxResult showIndexDomicile() { - return AjaxResult.success(serviceLogService.showIndexDomicile(SecurityUtils.getPkCountry(), SecurityUtils.getUserId())); + return AjaxResult.success(iCuSelfServiceLogService.showIndexDomicile(SecurityUtils.getPkCountry(), SecurityUtils.getUserId())); } @@ -159,21 +131,15 @@ 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(serviceLogService.saveChangeDomicile(domicileChangeVO)); + return toAjax(iCuSelfServiceLogService.saveChangeDomicile(domicileChangeVO)); } - /** * 显示户籍变更信息 * @@ -185,10 +151,10 @@ public class ApiDomicileChangeController extends BaseController { String idFront = null; Long pkMember = SecurityUtils.getUserId(); Integer pkCountry = SecurityUtils.getPkCountry(); - CuMemberExt member = cuMemberService.getMemberById(pkMember); + CuMemberExt member = iCuMemberService.getMemberById(pkMember); //查询实名认证信息原证件图 CuMemberAuthenticationVO authenticationVO = CuMemberAuthenticationVO.builder().pkCountry(pkCountry).pkMember(pkMember).build(); - CuMemberAuthenticationVO cuMemberAuthenticationVO = cuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO); + CuMemberAuthenticationVO cuMemberAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO); if (null != cuMemberAuthenticationVO) { idBack = cuMemberAuthenticationVO.getIdBack(); idFront = cuMemberAuthenticationVO.getIdFront(); @@ -212,7 +178,7 @@ public class ApiDomicileChangeController extends BaseController { cuSelfServiceLog.setPkCountry(domicileChangeVO.getPkCountry()); cuSelfServiceLog.setEditType(EApprovalBusiness.DOMICILE_CHANGE.getValue()); cuSelfServiceLog.setPkMember(domicileChangeVO.getPkMember()); - Integer check = serviceLogService.checkSelfService(cuSelfServiceLog); + Integer check = iCuSelfServiceLogService.checkSelfService(cuSelfServiceLog); if (check > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); } @@ -231,43 +197,7 @@ public class ApiDomicileChangeController extends BaseController { serviceChargeDTO.setType(EApprovalBusiness.DOMICILE_CHANGE.getValue()); serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setQuantity(MagicNumberConstants.CHANGE_NUM); - return serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO).getData(); - } - - /** - * 查询余额是否充足 - * - * @param domicileChangeVO 户籍变更信息 - * @return AjaxResult - */ - private AjaxResult isAccountBalance(DomicileChangeVO domicileChangeVO) { - List 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 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 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 userList = approvalInfo.getItemList().stream().map(ApprovalItemInfoDTO::getPkUser).collect(Collectors.toList()); - domicileChangeVO.setUserIdList(userList); - return AjaxResult.success(); + return iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO).getData(); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java index ed122260..647ecfd5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java @@ -43,22 +43,17 @@ public class ApiSmsController extends BaseController { /** * 忘记密码验证码 * - * @param phone 手机号码 + * @param memberCode 会员编号 + * @param phone 手机号码 * @return */ @RepeatSubmitSimple @GetMapping("/forget-verification") - public AjaxResult forgetVerification(@RequestParam String phone) { - // 2024.12.25 一个手机号只能注册一个会员编号，找回密码只需要手机号（9035） + public AjaxResult forgetVerification(@RequestParam String memberCode, @RequestParam String phone) { List 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)); } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java index 7dd205e1..3ccb2f69 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java @@ -8,12 +8,14 @@ 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; @@ -41,14 +43,6 @@ 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 { @@ -58,23 +52,19 @@ public class MemberReportController extends BaseController { @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired - private IMemberService memberService; + private IMemberService iMemberService; @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; @DubboReference - IAreaServiceApi areaServiceApi; + IAreaServiceApi iAreaServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; /** - * @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") @@ -105,8 +95,14 @@ public class MemberReportController extends BaseController { Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime); dpo.setZonpayTime(zonpayTime); dpo.setEndPayTime(endPayTime); - int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + + CuMemberSettlePeriod startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr); + if (null == startPeriod) { + throw new ServiceException("查询开始时间不存在数据"); + } + int periodSta = startPeriod.getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + dpo.setPkCountry(pkCountry); //查询最新期数 dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodSta); @@ -124,7 +120,7 @@ public class MemberReportController extends BaseController { if (CollectionUtil.isEmpty(memberList)) { return getDataTable(new ArrayList<>()); } - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //伞下直推新增业绩 List achieList = memberReportService.directPushNewAchieUpList(dpo, Collections.singletonList(memberList.get(0).getPkMember())); //查询大小区业绩 @@ -150,11 +146,7 @@ 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") @@ -184,11 +176,7 @@ 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") @@ -223,15 +211,15 @@ public class MemberReportController extends BaseController { Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime()); dpo.setZonpayTime(zonpayTime); //查询最新期数 - int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); dpo.setPkCountry(pkCountry); dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodSta); dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd); //伞下直推新增业绩 List memberList = memberReportService.directPushNewList(dpo.getMemberCodeList(), pkCountry, startPayTime, endPayTime); List pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList()); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List achieList = memberReportService.directPushNewAchieUpList(dpo, pkMemberList); if (CollectionUtil.isNotEmpty(memberList)) { @@ -260,11 +248,7 @@ 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") @@ -275,9 +259,9 @@ public class MemberReportController extends BaseController { if (StringUtils.isNull(dpo.getMemberCode())) { return getDataTable(new ArrayList<>()); } - R memberDto = memberServiceApi.getMember(dpo.getMemberCode()); + R memberDto = iMemberServiceApi.getMember(dpo.getMemberCode()); CuMember member = memberDto.getData(); - if(member==null){ + if (member == null) { return getDataTable(new ArrayList<>()); } dpo.setPkMember(member.getPkId()); @@ -297,8 +281,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 = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); dpo.setPkCountry(pkCountry); //查询最新期数 dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta); @@ -314,18 +298,18 @@ public class MemberReportController extends BaseController { return getDataTable(new ArrayList<>()); } List pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList()); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //伞下直推新增业绩 List 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()); @@ -334,36 +318,32 @@ public class MemberReportController extends BaseController { } }); } - List dpdVoList=new ArrayList<>(); + List 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 memberDto = memberServiceApi.getMember(dpo.getMemberCode()); + R memberDto = iMemberServiceApi.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); @@ -376,8 +356,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 = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); dpo.setPkCountry(pkCountry); //查询最新期数 dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta); @@ -385,25 +365,25 @@ public class MemberReportController extends BaseController { if (memberReportService.selectExistTable(dpo.getAchieveTableNameSta()) == 0 || memberReportService.selectExistTable(dpo.getAchieveTableNameEnd()) == 0 ) { - return ; + return; } //查询会员 List memberList = memberReportService.querDirectPushDetails(dpo); if (CollectionUtil.isEmpty(memberList)) { - return ; + return; } - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //伞下直推新增业绩 List 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()); @@ -412,18 +392,14 @@ public class MemberReportController extends BaseController { } }); } - List dpdVoList=new ArrayList<>(); + List dpdVoList = new ArrayList<>(); memberList.forEach(itm -> dpdVoList.add(BeanUtil.copyProperties(itm, DirectPushNewDetailsVo.class))); ExcelUtil 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") @@ -449,14 +425,19 @@ 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 + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); + String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); + dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); } Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime); dpo.setZonpayTime(zonpayTime); dpo.setEndPayTime(endPayTime); - int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + + CuMemberSettlePeriod startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr); + if (null == startPeriod) { + throw new ServiceException("查询开始时间不存在数据"); + } + int periodSta = startPeriod.getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); dpo.setPkCountry(pkCountry); //查询最新期数 dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta); @@ -474,31 +455,31 @@ public class MemberReportController extends BaseController { if (CollectionUtil.isEmpty(memberList)) { return getDataTable(new ArrayList<>()); } - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //伞下直推新增业绩 List 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 (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)) { + 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()); + } //中国业绩转为人民币 itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getData().getInExchangeRate())); itm.setRegAchieve(itm.getRegAchieve().multiply(currency.getData().getInExchangeRate())); @@ -512,13 +493,8 @@ 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") @@ -549,21 +525,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 + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); + String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); + dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); } Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime()); dpo.setZonpayTime(zonpayTime); //查询最新期数 - int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); dpo.setPkCountry(pkCountry); dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta); dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodEnd); //伞下直推新增业绩 List memberList = memberReportService.directPushNewList(dpo.getMemberCodeList(), pkCountry, startPayTime, endPayTime); List pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList()); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List achieList = memberReportService.directPushNewAchieList(dpo, pkMemberList); if (CollectionUtil.isNotEmpty(memberList)) { @@ -606,11 +582,7 @@ 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") @@ -643,15 +615,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 + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); + String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); + dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); } dpo.setEndPayTime(endPayTime); dpo.setStartPayTime(startPayTime); - int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); + int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); dpo.setPkCountry(pkCountry); //查询最新期数 dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta); @@ -659,7 +631,7 @@ public class MemberReportController extends BaseController { dpo.setMemberRetailTable(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd); if (StringUtils.isNotEmpty(dpo.getPayTime())) { //查询会员是否激活 - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId(); dpo.setMemberRetailSTable(TableNameConstants.CU_MEMBER_RETAIL_S + period); } @@ -701,11 +673,7 @@ 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") @@ -742,19 +710,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 + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); + String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); + dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId()); } - int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); - int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId(); + int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId(); + int periodEnd = iCuMemberSettlePeriodService.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 = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId(); dpo.setMemberRetailSTable(TableNameConstants.CU_MEMBER_RETAIL_S + period); } @@ -771,7 +739,7 @@ public class MemberReportController extends BaseController { List pkMemberList = new ArrayList<>(); pkMemberList.addAll(memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList())); //查询会员是否激活 - List enableStatusList = memberReportService.selectMemberActiveState(dpo,pkMemberList); + List enableStatusList = memberReportService.selectMemberActiveState(dpo, pkMemberList); List boxVoList = new ArrayList<>(); memberList.forEach(item -> boxVoList.add(BeanUtil.copyProperties(item, DirectPushBoxVo.class))); //伞下直推新增盒数 @@ -831,7 +799,7 @@ public class MemberReportController extends BaseController { if (endPayTime != null) { endPayTime = DateUtils.getEndTime(endPayTime); } - R memberDto = memberServiceApi.getMember(memberCode); + R memberDto = iMemberServiceApi.getMember(memberCode); CuMember member = memberDto.getData(); Integer pkCountry = null; if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { @@ -841,7 +809,7 @@ public class MemberReportController extends BaseController { if (member == null) { return getDataTable(new ArrayList<>()); } - R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); CurrencyDTO currency = currencyDto.getData(); List orderTypeList = EOrderBusiness.getOrderTypeList(orderType); @@ -889,11 +857,7 @@ 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") @@ -925,22 +889,22 @@ public class MemberReportController extends BaseController { if (StringUtils.isEmpty(memberCode)) { return getDataTable(new ArrayList<>()); } - R memberDto = memberServiceApi.getMemberByCode(memberCode); + R memberDto = iMemberServiceApi.getMemberByCode(memberCode); CuMember member = memberDto.getData(); if (member == null) { return getDataTable(new ArrayList<>()); } Integer pkCountry = SecurityUtils.getPkCountry(); - R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); CurrencyDTO currency = currencyDto.getData(); List memberResettleAchieveList = new ArrayList<>(); BigDecimal inExchangeRate = currency.getInExchangeRate(); //查询最新期数 - int staPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(startDateStr)).getPkId(); - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(endDateStr)).getPkId(); String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); @@ -972,11 +936,7 @@ 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") @@ -1008,7 +968,7 @@ public class MemberReportController extends BaseController { if (StringUtils.isEmpty(memberCode)) { return; } - R memberDto = memberServiceApi.getMemberByCode(memberCode); + R memberDto = iMemberServiceApi.getMemberByCode(memberCode); CuMember member = memberDto.getData(); Integer pkCountry = null; if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { @@ -1018,14 +978,14 @@ public class MemberReportController extends BaseController { if (member == null) { return; } - R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); CurrencyDTO currency = currencyDto.getData(); List memberResettleAchieveList = new ArrayList<>(); BigDecimal inExchangeRate = currency.getInExchangeRate(); //查询最新期数 - int staPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(startDateStr)).getPkId(); - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(endDateStr)).getPkId(); String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); @@ -1069,7 +1029,7 @@ public class MemberReportController extends BaseController { if (memberResettleAchieveParam.getEndPayTime() != null) { memberResettleAchieveParam.setEndPayTime(DateUtils.getEndTime(memberResettleAchieveParam.getEndPayTime())); } - R memberDto = memberServiceApi.getMember(memberResettleAchieveParam.getMemberCode()); + R memberDto = iMemberServiceApi.getMember(memberResettleAchieveParam.getMemberCode()); CuMember member = memberDto.getData(); if (member == null) { ExcelUtil util = new ExcelUtil<>(MemberResettleAchieveVo.class); @@ -1086,7 +1046,7 @@ public class MemberReportController extends BaseController { if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { pkCountry = SecurityUtils.getPkCountry(); } - R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); CurrencyDTO currency = currencyDto.getData(); List orderTypeList = EOrderBusiness.getOrderTypeList(memberResettleAchieveParam.getOrderType()); @@ -1135,9 +1095,6 @@ public class MemberReportController extends BaseController { /** * 订单币种查询 - * - * @param - * @return */ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_CURRENCY_LIST, method = EOperationMethod.SELECT) @GetMapping("/order-currency-list") @@ -1203,9 +1160,6 @@ public class MemberReportController extends BaseController { /** * 订单分布统计 - * - * @param - * @return */ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.GET_ORDER_DISTRIBUTION, method = EOperationMethod.SELECT) @GetMapping("/get-order-distribution") @@ -1233,9 +1187,6 @@ 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") @@ -1360,7 +1311,7 @@ public class MemberReportController extends BaseController { // 补全23:59:59 reportSummaryVo.setEndCreateTime(DateUtils.getEndTime(reportSummaryVo.getEndCreateTime())); } - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); reportSummaryVo.setPkCountry(SecurityUtils.getPkCountry()); List reportSummaryList = memberReportService.reportSummaryList(reportSummaryVo); @@ -1390,7 +1341,7 @@ public class MemberReportController extends BaseController { // 补全23:59:59 reportSummaryVo.setEndCreateTime(DateUtils.getEndTime(reportSummaryVo.getEndCreateTime())); } - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); reportSummaryVo.setPkCountry(SecurityUtils.getPkCountry()); List reportSummaryList = memberReportService.reportSummaryList(reportSummaryVo); for (ReportSummaryVo summaryVo : reportSummaryList) { @@ -1409,10 +1360,7 @@ 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") @@ -1420,7 +1368,7 @@ public class MemberReportController extends BaseController { List cuMemberPushAchieveVOList = new ArrayList<>(); if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) { startPage(); - List cuMemberAchieveExtList = memberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); + List cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); cuMemberPushAchieveVOList.add(vo); @@ -1433,11 +1381,7 @@ 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") @@ -1445,7 +1389,7 @@ public class MemberReportController extends BaseController { List cuMemberPushAchieveVOList = new ArrayList<>(); if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) { - List cuMemberAchieveExtList = memberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); + List cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) { // 获取需要翻译的枚举翻译 Map transactionMap = iTransactionCommonService.exportEnumTransaction(ECategory.values()); @@ -1471,7 +1415,7 @@ public class MemberReportController extends BaseController { @GetMapping("/product-detail-query-list") public TableDataInfo productDetailQuery(ProductDetailQueryParam productDetailQueryParam) { // if (StringUtils.isNotBlank(productDetailQueryParam.getMemberCode())) { -// R memberDto = memberServiceApi.getMember(productDetailQueryParam.getMemberCode()); +// R memberDto = iMemberServiceApi.getMember(productDetailQueryParam.getMemberCode()); // CuMember member = memberDto.getData(); // if (member != null) { // productDetailQueryParam.setMemberCode(null); @@ -1486,7 +1430,7 @@ public class MemberReportController extends BaseController { productDetailQueryParam.setEndPayTime(DateUtils.getEndTime(productDetailQueryParam.getEndPayTime())); } - R> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()); + R> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()); Map map = areaMap.getData(); startPage(); List orderTypeList = EOrderBusiness.getOrderTypeList(productDetailQueryParam.getOrderType()); @@ -1537,7 +1481,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> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()); + R> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()); Map map = areaMap.getData(); if (productDetailQueryParam.getStartPayTime() != null) { productDetailQueryParam.setStartPayTime(DateUtils.getStartTime(productDetailQueryParam.getStartPayTime())); @@ -1603,11 +1547,7 @@ 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) { @@ -1616,11 +1556,7 @@ 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) { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java index 7839bbfc..bc6cc52f 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** * 会员结算期间 Mapper 接口 - * - * @author hzs - * @since 2022-10-26 */ public interface CuMemberSettlePeriodMapper extends BaseMapper { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java index 1fc61ff7..509cf624 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** * 会员结算期间 服务类 - * - * @author hzs - * @since 2022-10-26 */ public interface ICuMemberSettlePeriodService extends IService { @@ -15,9 +12,6 @@ public interface ICuMemberSettlePeriodService extends IService implements ICuMemberSettlePeriodService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java index d1550472..33361086 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java @@ -541,6 +541,7 @@ public class BdWaresController extends BaseController { waresParams.setPkSpecialCurrency(waresExtend.getPkSpecialCurrency()); waresParams.setSortStatus(wares.getSortStatus()); waresParams.setSystemType(waresExtend.getSystemType()); + waresParams.setAreaIncome(wares.getAreaIncome()); if (waresExtend.getMakerIncome() != null) { R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate())); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java index a174c808..810cb34e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java @@ -9,13 +9,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/9 14:14 - * @Classname: WaresParams - * @PackageName: com.hzs.sale.wares.controller.manage.params - */ @Data public class WaresParams implements Serializable { /** @@ -416,4 +409,9 @@ public class WaresParams implements Serializable { */ private Integer waresStatus; + /** + * 复购区域分红 + */ + private BigDecimal areaIncome; + } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index da3e9700..64158386 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -46,9 +46,9 @@ - + diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java index c7882dd9..dd038016 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java @@ -216,4 +216,10 @@ public class BdWares extends BaseEntity { @TableField("SYSTEM_TYPE") private Integer systemType; + /** + * 复购区域分红 + */ + @TableField("AREA_INCOME") + private BigDecimal areaIncome; + }