diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java index 603d561c..fc4055c0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java @@ -1,62 +1,47 @@ package com.hzs.member.achieve.controller.api; - -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.enums.EPlaceDept; import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.achieve.controller.vo.CuActiveMemberCensusVO; import com.hzs.member.achieve.service.ICuActiveMemberCensusService; import com.hzs.member.achieve.service.ICuMemberAchieveService; -import com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.Period; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.stream.Collectors; /** - *

* 统计活跃会员 前端控制器 - *

- * - * @author zhangjing - * @since 2023-05-17 */ @RestController @RequestMapping("/api/active-member-census") public class ApiCuActiveMemberCensusController extends BaseController { @Autowired - private ICuActiveMemberCensusService cuActiveMemberCensusService; + private ICuActiveMemberCensusService iCuActiveMemberCensusService; @Autowired - private ICuMemberAchieveService cuMemberAchieveService; + private ICuMemberAchieveService iCuMemberAchieveService; /** - * @description: 查询活跃用户 - * @author: zhang jing - * @date: 2023/5/18 9:57 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 查询活跃用户 **/ @GetMapping("/activeMember") public AjaxResult activeMember(CuActiveMemberCensusVO cvo) { - //查找安置人伞下 + // 查找安置人伞下 Long memberId = SecurityUtils.getUserId(); LocalDate endDate = LocalDate.now(); String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); cvo.setEndDate(endDateStr); - LocalDate startDate = cuMemberAchieveService.getStartDateByType(cvo.getDateType(), null); + LocalDate startDate = iCuMemberAchieveService.getStartDateByType(cvo.getDateType(), null); String startDateStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); cvo.setStartDate(startDateStr); cvo.setPkMember(memberId); @@ -69,8 +54,8 @@ public class ApiCuActiveMemberCensusController extends BaseController { days = 30; } - List list = cuActiveMemberCensusService.queryActiveMember(cvo); - List calist=new ArrayList<>(); + List list = iCuActiveMemberCensusService.queryActiveMember(cvo); + List calist = new ArrayList<>(); if (CollectionUtil.isEmpty(list)) { for (int i = 0; i < days; i++) { CuActiveMemberCensusVO ca = new CuActiveMemberCensusVO(); @@ -79,16 +64,16 @@ public class ApiCuActiveMemberCensusController extends BaseController { } } else { for (int i = 0; i < days; i++) { - Date creationTime = DateUtils.toDate(startDate.plusDays(i)); - String compareTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.toDate(startDate.plusDays(i))); + Date creationTime = DateUtils.toDate(startDate.plusDays(i)); + String compareTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.toDate(startDate.plusDays(i))); CuActiveMemberCensusVO cam = new CuActiveMemberCensusVO(); cam.setCreationTime(creationTime); - for(CuActiveMemberCensusVO ca:list){ - if(compareTime.equals(ca.getCompareTime())){ - if(ca.getPlaceDept().intValue()==EPlaceDept.LEFT_DEPT.getValue()){ + for (CuActiveMemberCensusVO ca : list) { + if (compareTime.equals(ca.getCompareTime())) { + if (ca.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { cam.setLeftCoun(ca.getTotalCount()); } - if(ca.getPlaceDept().intValue()==EPlaceDept.RIGHT_DEPT.getValue()){ + if (ca.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { cam.setRightCount(ca.getTotalCount()); } } @@ -101,5 +86,4 @@ public class ApiCuActiveMemberCensusController extends BaseController { return AjaxResult.success(calist); } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 9194b8d2..84d404a7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -26,7 +26,6 @@ import java.util.List; */ public interface CuMemberMapper extends BaseMapper { - /** * 查询登录会员以及状态 * @@ -62,8 +61,6 @@ public interface CuMemberMapper extends BaseMapper { /* * @description: 根据条件查询会员信息，查询单表 - * @author: sui q - * @date: 2023/5/10 15:07 * @param: null null **/ List queryMemberByCondition(CuMember cuMember); @@ -138,8 +135,6 @@ public interface CuMemberMapper extends BaseMapper { * 获取会员主键 * * @return: Integer - * @Author: sui q - * @Date: 2022/9/30 17:38 */ Long createMemberId(); @@ -152,8 +147,6 @@ public interface CuMemberMapper extends BaseMapper { /* * @description: 查询会员信息，根据条件 - * @author: sui q - * @date: 2023/6/20 11:42 * @param: null null **/ List queryCuMemberByMemberList(@Param("cuMemberVOList") List cuMemberVOList, @@ -336,21 +329,6 @@ public interface CuMemberMapper extends BaseMapper { */ List selectByMemberRealInfo(MemberRealInfoParam memberRealInfoParam); - /** - * 查询所有有推荐订单的用户 - * - * @return - */ - List selectByPkParentList(); - - /** - * 查询直推人数 - * - * @param pkMember - * @return - */ - Long queryCuMemberTreeParentTableCount(Long pkMember); - /** * 注册列表 * @@ -368,16 +346,6 @@ public interface CuMemberMapper extends BaseMapper { */ List findNoPayMember(@Param("memberCodes") List memberCodes, @Param("pkCountry") Integer pkCountry); - /** - * @description: 查询最新会员 - **/ - CuMember queryRecentlyMember(@Param("pkCountry") Integer pkCountry); - - /** - * @description: 查询最新国际编号 - **/ - CuMember queryInternationalMember(); - /** * 查询推荐列表 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java index bc3f2ab3..5d9afe75 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java @@ -1,6 +1,5 @@ package com.hzs.member.base.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.base.CuAwardsControl; import com.hzs.member.base.vo.CuAwardsControlVO; @@ -8,9 +7,7 @@ import com.hzs.member.base.vo.CuAwardsControlVO; import java.util.List; /** - *

* 真实奖衔控制 服务类 - *

* * @author hzs * @since 2023-04-07 @@ -19,8 +16,6 @@ public interface ICuAwardsControlService extends IService { /** * @description: 查询奖衔控制列表 - * @author: zhang jing - * @date: 2023/4/8 11:40 * @param: [controlVO] * @return: java.util.List **/ @@ -28,36 +23,24 @@ public interface ICuAwardsControlService extends IService { /** * @description: 添加真实奖衔控制-发起签呈 - * @author: zhang jing - * @date: 2023/4/8 16:11 * @param: [controlVO] * @return: boolean **/ boolean savePetition(CuAwardsControlVO controlVO); + /** * @description: 添加真实奖衔控制-发起签呈 - * @author: zhang jing - * @date: 2023/4/8 16:11 * @param: [controlVO] * @return: boolean **/ boolean upPetition(CuAwardsControlVO controlVO); + /** * @description: 添加真实奖衔控制-发起签呈 - * @author: zhang jing - * @date: 2023/4/8 16:11 * @param: [controlVO] * @return: boolean **/ boolean delPetition(CuAwardsControlVO controlVO); - /* - * @description: 查询所有的真实奖衔控制会员，用于奖金计算 - * @author: sui q - * @date: 2023/4/11 11:03 - * @param: null null - **/ - List queryAllCuAwardsControl(); - CuAwardsControlVO affirm(CuAwardsControlVO controlVO); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 79f91083..8f35ab21 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -68,9 +68,6 @@ public interface ICuMemberService extends IService { /* * @description: 根据条件查询会员信息，查询单表 - * @author: sui q - * @date: 2023/5/10 15:07 - * @param: null null **/ List queryMemberByCondition(CuMember cuMember); @@ -559,9 +556,6 @@ public interface ICuMemberService extends IService { /* * description: 查询历史网体的最末安置人，左右区一起查出来 - * @author: sui q - * @date: 2023/4/6 17:35 - * @param: **/ List queryCuMemberLastPlaceParent(Long pkMember); @@ -590,11 +584,6 @@ public interface ICuMemberService extends IService { */ List findNoPayMember(List memberCodes, Integer pkCountry); - /** - * @description: 获取最新国家编号和国际编号 - **/ - void generateNumber(CuMember cuMember, Integer pkCountry); - /** * 查询推荐列表 * @@ -836,7 +825,6 @@ public interface ICuMemberService extends IService { */ Long checkMemberParent(Long pkMember, String memberCode); - /** * 更新会员的修改次数 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java index ca3423d3..c2021249 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java @@ -3,7 +3,6 @@ package com.hzs.member.base.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.RabbitMqConstants; @@ -39,9 +38,7 @@ import java.util.Date; import java.util.List; /** - *

* 真实奖衔控制 服务实现类 - *

* * @author hzs * @since 2023-04-07 @@ -60,25 +57,11 @@ public class CuAwardsControlServiceImpl extends ServiceImpl - **/ @Override public List queryAwardsControlList(CuAwardsControlVO controlVO) { return baseMapper.queryAwardsControlList(controlVO); } - /** - * @description: 添加真实奖衔控制-发起签呈 - * @author: zhang jing - * @date: 2023/4/8 16:06 - * @param: [controlVO] - * @return: boolean - **/ @Override @Transactional(rollbackFor = Exception.class) public boolean savePetition(CuAwardsControlVO controlVO) { @@ -90,51 +73,51 @@ public class CuAwardsControlServiceImpl extends ServiceImpl queryAllCuAwardsControl() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - return baseMapper.selectList(queryWrapper); - } - - /** - * @description: 真实奖衔控制 免签 全免 - * @author: zhang jing - * @date: 2023/7/17 19:15 - * @param: [controlVO] - * @return: com.hzs.member.base.vo.CuAwardsControlVO - **/ @Override @Transactional(rollbackFor = Exception.class) public CuAwardsControlVO affirm(CuAwardsControlVO controlVO) { @@ -380,7 +336,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl dtoList = new ArrayList<>(); - for(CuAwardsControlVO ccl:controlVO.getUpdateParentParamList()){ + for (CuAwardsControlVO ccl : controlVO.getUpdateParentParamList()) { // 修改审核状态,累加修改次数 CuMemberServiceLog memberLog = new CuMemberServiceLog(); memberLog.setPkMember(ccl.getPkMember()); @@ -392,10 +348,10 @@ public class CuAwardsControlServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); updateWrapper.set("CREATION_TIME", controlVO.getCreationTime()); updateWrapper.set("PK_CREATOR", controlVO.getPkCreator()); updateWrapper.eq("PK_ID", control.getPkId()); - baseMapper.update(null,updateWrapper); + baseMapper.update(null, updateWrapper); } - if(StringUtils.isNotEmpty(ccl.getRealAwardsKeyVal())){ - content=content+" 真实奖衔： "+ccl.getRealAwardsKeyVal(); + if (StringUtils.isNotEmpty(ccl.getRealAwardsKeyVal())) { + content = content + " 真实奖衔： " + ccl.getRealAwardsKeyVal(); } - if(StringUtils.isNotEmpty(ccl.getMentoringAwardKeyVal())){ - content=content+" 辅导奖衔： "+ccl.getMentoringAwardKeyVal(); + if (StringUtils.isNotEmpty(ccl.getMentoringAwardKeyVal())) { + content = content + " 辅导奖衔： " + ccl.getMentoringAwardKeyVal(); } - if(StringUtils.isNotEmpty(ccl.getDividendAwardKeyVal())){ - content=content+" 分红奖衔： "+ccl.getDividendAwardKeyVal(); + if (StringUtils.isNotEmpty(ccl.getDividendAwardKeyVal())) { + content = content + " 分红奖衔： " + ccl.getDividendAwardKeyVal(); } - if(StringUtils.isNotEmpty(ccl.getExtremeAwardsKeyVal())){ - content=content+" 级差奖衔： "+ccl.getExtremeAwardsKeyVal(); + if (StringUtils.isNotEmpty(ccl.getExtremeAwardsKeyVal())) { + content = content + " 级差奖衔： " + ccl.getExtremeAwardsKeyVal(); } - if(StringUtils.isNotEmpty(ccl.getReplyExamAwardKeyVal())){ - content=content+" 复购考核奖衔： "+ccl.getReplyExamAwardKeyVal(); + if (StringUtils.isNotEmpty(ccl.getReplyExamAwardKeyVal())) { + content = content + " 复购考核奖衔： " + ccl.getReplyExamAwardKeyVal(); } - if(StringUtils.isNotEmpty(ccl.getDivvyExamAwardsKeyVal())){ - content=content+" 分红考核奖衔： "+ccl.getDivvyExamAwardsKeyVal(); + if (StringUtils.isNotEmpty(ccl.getDivvyExamAwardsKeyVal())) { + content = content + " 分红考核奖衔： " + ccl.getDivvyExamAwardsKeyVal(); } //扣钱 - if (controlVO.getProcessType().intValue() == EProcessType.AVOIDSIGNING.getValue()) { + if (controlVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue()) { BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); businessCommissionDTO.setPkCountry(controlVO.getPkCountry()); businessCommissionDTO.setPkAccount(ccl.getPkAccount()); @@ -455,13 +411,13 @@ public class CuAwardsControlServiceImpl extends ServiceImpl implements ICuMemberService { @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @DubboReference - ICountryServiceApi countryServiceApi; + ICountryServiceApi iCountryServiceApi; @DubboReference - IServiceChargeServiceApi serviceChargeServiceApi; + IServiceChargeServiceApi iServiceChargeServiceApi; @DubboReference - IGradeServiceApi gradeServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - IApprovalServiceApi approvalServiceApi; + IApprovalServiceApi iApprovalServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @DubboReference - ISystemConfigServiceApi systemConfigServiceApi; + ISystemConfigServiceApi iSystemConfigServiceApi; @Autowired private ICuMemberRegisterService iCuMemberRegisterService; @@ -308,7 +308,6 @@ public class CuMemberServiceImpl extends ServiceImpl i public CuMember createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun) { cuMember.setMemberCode(createUserNameByPremix(cuMember.getPkSettleCountry(), isHaiFun, MagicNumberConstants.OLD_DIGIT)); cuMember.setPkId(baseMapper.createMemberId()); - generateNumber(cuMember, cuMember.getPkSettleCountry()); // 生成主键 return cuMember; } @@ -384,7 +383,6 @@ public class CuMemberServiceImpl extends ServiceImpl i log.error(e.getMessage()); return null; } - } /** @@ -449,14 +447,12 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.specialBusinessQuery(updateCodeVO); } - /** * @description: 批量修改会员编号 **/ @Override @Transactional(rollbackFor = Exception.class) public UpdateCodeVO updateCode(UpdateCodeVO updateCode) { - //业务单号 String code = CommonUtil.createSerialNumber(EOrderPrefix.SPECIAL_UPDATE_CODE.getValue()); updateCode.setApprovalBusiness(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); @@ -515,7 +511,6 @@ public class CuMemberServiceImpl extends ServiceImpl i //发送MQ到操作日志 rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, dtoList); - return updateCode; } @@ -599,7 +594,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .sendIdList(upESVO.getSendIdList()) .fileList(upESVO.getFileList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); @@ -783,7 +778,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .sendIdList(zeroElementRevokeVO.getSendIdList()) .fileList(zeroElementRevokeVO.getFileList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.ZERO_ELEMENT_REVOKE_PETITION); @@ -813,7 +808,6 @@ public class CuMemberServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public UpdateCodeVO petition(UpdateCodeVO updateCodeVO) { - //业务单号 String code = CommonUtil.createSerialNumber(EOrderPrefix.SPECIAL_UPDATE_CODE.getValue()); // 封装修改会员编号业务日志 @@ -857,7 +851,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .sendIdList(updateCodeVO.getSendIdList()) .fileList(updateCodeVO.getFileList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); @@ -935,7 +929,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .sendIdList(upseCountryVO.getSendIdList()) .fileList(upseCountryVO.getFileList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.UPDATE_SETTLE_PETITION); @@ -1011,7 +1005,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .sendIdList(policyCurrencyVO.getSendIdList()) .fileList(policyCurrencyVO.getFileList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION); @@ -1090,7 +1084,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -1117,7 +1111,6 @@ public class CuMemberServiceImpl extends ServiceImpl i } } } - } updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); @@ -1129,8 +1122,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-修改会员编号-审核通过 - * @author: zhang jing - * @date: 2023/1/6 16:37 * @param: [updateCodeVO] * @return: boolean **/ @@ -1167,8 +1158,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 政策币签呈-审核通过-驳回 - * @author: zhang jing - * @date: 2023/5/10 18:02 * @param: [approvalBusinessResultDTO] * @return: boolean **/ @@ -1194,7 +1183,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -1221,7 +1210,6 @@ public class CuMemberServiceImpl extends ServiceImpl i } } } - } updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); @@ -1232,8 +1220,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 删除政策币业务审核 - * @author: zhang jing - * @date: 2024/4/24 15:19 * @param: [approvalBusinessResultDTO] * @return: boolean **/ @@ -1257,7 +1243,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue()); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -1304,14 +1290,11 @@ public class CuMemberServiceImpl extends ServiceImpl i } else { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_ERROR)); } - return true; } /** * @description: 特殊业务-修改会员编号-审核驳回 - * @author: zhang jing - * @date: 2023/1/7 9:16 * @param: [updateCodeVO] * @return: boolean **/ @@ -1332,7 +1315,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -1372,8 +1355,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-真实奖衔控制-审核通过或驳回 - * @author: zhang jing - * @date: 2023/1/6 16:37 * @param: [updateCodeVO] * @return: boolean **/ @@ -1443,7 +1424,6 @@ public class CuMemberServiceImpl extends ServiceImpl i } } } - } return true; } @@ -1513,7 +1493,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .businessCode(code) .signType(ESignType.getEnumByValue(placeParentParam.getSignType())) .remark(placeParentParam.getRemark()).pkMemberList(memberSet).userIdList(placeParentParam.getUserIdList()).build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PLACE_PARENT); @@ -1539,7 +1519,6 @@ public class CuMemberServiceImpl extends ServiceImpl i throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_PLACE_MONEY)); } } - return null; } @@ -1549,7 +1528,6 @@ public class CuMemberServiceImpl extends ServiceImpl i * @param placeParentParam */ public void sendPlaceParentLog(PlaceParentParam placeParentParam, LoginUser loginUser, Integer businessType, String code) { - for (UpdatePlaceParentParam updatePlaceParentParam : placeParentParam.getUpdatePlaceParentList()) { StringBuilder str = new StringBuilder(); String oldValue = updatePlaceParentParam.getOldValue(); @@ -1583,7 +1561,6 @@ public class CuMemberServiceImpl extends ServiceImpl i .build(); rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, log); } - } /** @@ -1697,64 +1674,6 @@ public class CuMemberServiceImpl extends ServiceImpl i .build(); rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, log); } - - } - - /** - * 修改直推业务 - * - * @param updateParentParamList - * @param approveStatus EApproveStatus枚举 - * @return - */ - @Transactional(rollbackFor = Exception.class) - public String editParentLog(List updateParentParamList, String businessNo, EApproveStatus approveStatus) { - - // 日志列表 - List MemberServiceLogList = new ArrayList<>(); - for (UpdateParentParam updateParentParam : updateParentParamList) { - CuMember cuMember = getMember(updateParentParam.getMemberCode()); - if (cuMember != null) { - Long pkParent = getMember(updateParentParam.getEditNewPlaceMemberCode()).getPkId(); - CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog(); - cuMemberServiceLog.setPkMember(cuMember.getPkId()); - cuMemberServiceLog.setEditType(EApprovalBusiness.CU_MEMBER_PARENT.getValue()); - JSONObject oldJson = new JSONObject(); - oldJson.put("memberCode", cuMember.getMemberCode()); - oldJson.put("pkParent", cuMember.getPkParent()); - cuMemberServiceLog.setOldValue(oldJson.toJSONString()); - JSONObject newJson = new JSONObject(); - newJson.put("memberCode", cuMember.getMemberCode()); - newJson.put("pkParent", pkParent); - cuMemberServiceLog.setNewValue(newJson.toJSONString()); - cuMemberServiceLog.setCreationTime(new Date()); - cuMemberServiceLog.setPkCountry(SecurityUtils.getPkCountry()); - cuMemberServiceLog.setPkCreator(SecurityUtils.getUserId()); - cuMemberServiceLog.setApproveStatus(approveStatus.getValue()); - cuMemberServiceLog.setBusinessNo(businessNo); - Integer maxApproveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(cuMember.getPkId(), - EApprovalBusiness.CU_MEMBER_PARENT.getValue(), EApproveStatus.FINISH.getValue()); - cuMemberServiceLog.setApproveNumber(maxApproveNumber + 1); - MemberServiceLogList.add(cuMemberServiceLog); - cuMember.setPkParent(pkParent); - } - } - iCuMemberServiceLogService.saveBatch(MemberServiceLogList); - return businessNo; - } - - /** - * 修改直推 - * - * @param updateParentParamList - */ - public void editParent(List updateParentParamList) { - for (UpdateParentParam updateParentParam : updateParentParamList) { - CuMember cuMember = getMember(updateParentParam.getMemberCode()); - Long pkParent = getMember(updateParentParam.getEditNewPlaceMemberCode()).getPkId(); - cuMember.setPkParent(pkParent); - updateById(cuMember); - } } /** @@ -1791,8 +1710,6 @@ public class CuMemberServiceImpl extends ServiceImpl i * @param pkCountry 国家 * @Description: 生成会员编号 * @return: String - * @Author: sui q - * @Date: 2022/9/30 17:35 */ @Override public String createUserNameByPremix(Integer pkCountry, Boolean isHaiFun, Integer digit) { @@ -1800,7 +1717,7 @@ public class CuMemberServiceImpl extends ServiceImpl i if (isHaiFun) { prefix = SysConstants.HAI_FUN_PREFIX; } else { - CountryDTO country = countryServiceApi.getCountry(pkCountry).getData(); + CountryDTO country = iCountryServiceApi.getCountry(pkCountry).getData(); prefix = country.getCode(); } if (StringUtils.isEmpty(prefix)) { @@ -1859,7 +1776,7 @@ public class CuMemberServiceImpl extends ServiceImpl i if (isHaiFun) { prefix = SysConstants.HAI_FUN_PREFIX; } else { - CountryDTO country = countryServiceApi.getCountry(pkCountry).getData(); + CountryDTO country = iCountryServiceApi.getCountry(pkCountry).getData(); prefix = country.getCode(); } if (StringUtils.isEmpty(prefix)) { @@ -1931,7 +1848,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.findMemberByMembercodesAndPkcountry(memberCodes, pkCountry); } - @Override public List findMemberByMemberCodeList(List memberCodeList, Integer pkCountry) { return baseMapper.findMemberByMemberCodeList(memberCodeList, pkCountry); @@ -1957,7 +1873,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.batchUpdateMemberByBusinessType(handleBusinessVO); } - /** * 招商列表 * @@ -1978,8 +1893,8 @@ public class CuMemberServiceImpl extends ServiceImpl i */ @Override public List> systemTjSetListTree(List memberSettleExtList, CuMemberSettleExt memberSettleExt, String settleTableName, Boolean isMemberSecord) { - R> allCountryMap = countryServiceApi.getAllCountryMap(); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); // 查询血缘伞下团队业绩和人数 List memberIds = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList()); @@ -2068,7 +1983,7 @@ public class CuMemberServiceImpl extends ServiceImpl i private Map queryGradeDTOMap(List memberSettleExtList) { Set countrySet = memberSettleExtList.stream().distinct().map(CuMemberSettleExt::getPkSettleCountry).collect(Collectors.toSet()); Map gradeDtoMap = new HashMap<>(); - Map> countryMap = gradeServiceApi.queryCountryGradeConfigByCondition(countrySet).getData(); + Map> countryMap = iGradeServiceApi.queryCountryGradeConfigByCondition(countrySet).getData(); countryMap.forEach((pkCountry, gradeList) -> { gradeList.forEach(gradeDTO -> { gradeDtoMap.put(pkCountry.toString() + gradeDTO.getPkId().toString(), gradeDTO); @@ -2139,10 +2054,6 @@ public class CuMemberServiceImpl extends ServiceImpl i if (amount == null) { return BigDecimal.ZERO; } -// if (loginUserCountry.equals(CountryConstants.CHINA_COUNTRY)){ -// return amount.multiply(inExchangeRate); -// } - return amount.multiply(inExchangeRate); } @@ -2189,11 +2100,11 @@ public class CuMemberServiceImpl extends ServiceImpl i */ @Override public List> systemAzSetListTree(List list, CuMemberSettleExt memberSettleExt) { - R> allCountryMap = countryServiceApi.getAllCountryMap(); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - R> awardsDto = awardsServiceApi.queryAwards(memberSettleExt.getPkCountry()); + R> awardsDto = iAwardsServiceApi.queryAwards(memberSettleExt.getPkCountry()); for (BdAwards date : awardsDto.getData()) { if (date.getPkId().equals(memberSettleExt.getPkAwards())) { memberSettleExt.setColor(date.getColor()); @@ -2291,7 +2202,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return build; } - /** * 安置架构五 * @@ -2330,15 +2240,11 @@ public class CuMemberServiceImpl extends ServiceImpl i return num.multiply(inExchangeRate).setScale(2, BigDecimal.ROUND_DOWN); } } - return num; } - /** * @description: 特殊配置 修改结算国列表 - * @author: zhang jing - * @date: 2023/4/28 17:24 * @param: [upseCountryVO] * @return: java.util.List **/ @@ -2349,8 +2255,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 查询修改政策币列表 - * @author: zhang jing - * @date: 2023/5/9 14:25 * @param: [upVO] * @return: java.util.List **/ @@ -2359,11 +2263,8 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.upPolicyCurrencyList(upVO); } - /** * @description: 特殊业务-批量修改结算国 - * @author: zhang jing - * @date: 2023/2/21 16:50 * @param: [upseCountryVO] * @return: com.hzs.member.base.vo.UpdateSettleCountryVO **/ @@ -2407,12 +2308,11 @@ public class CuMemberServiceImpl extends ServiceImpl i member.setModifiedTime(date); //查询修改前结算国等级奖衔value值 - - R gd = gradeServiceApi.getGrade(member.getPkRegisterGrade()); + R gd = iGradeServiceApi.getGrade(member.getPkRegisterGrade()); Integer pkRegisterGrade = gd.getData().getGradeValue(); - gd = gradeServiceApi.getGrade(member.getPkSettleGrade()); + gd = iGradeServiceApi.getGrade(member.getPkSettleGrade()); Integer pkSettleGrade = gd.getData().getGradeValue(); - gd = gradeServiceApi.getGradeByGradeValue(pkRegisterGrade, uc.getNewPkSettleCountry()); + gd = iGradeServiceApi.getGradeByGradeValue(pkRegisterGrade, uc.getNewPkSettleCountry()); if (null == gd.getData()) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } @@ -2420,7 +2320,7 @@ public class CuMemberServiceImpl extends ServiceImpl i throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } member.setPkRegisterGrade(gd.getData().getPkId()); - gd = gradeServiceApi.getGradeByGradeValue(pkSettleGrade, uc.getNewPkSettleCountry()); + gd = iGradeServiceApi.getGradeByGradeValue(pkSettleGrade, uc.getNewPkSettleCountry()); if (null == gd.getData()) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } @@ -2428,8 +2328,8 @@ public class CuMemberServiceImpl extends ServiceImpl i throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } member.setPkSettleGrade(gd.getData().getPkId()); - R aw = awardsServiceApi.getAwardsOne(member.getPkAwards()); - R> awList = awardsServiceApi.queryAwards(uc.getNewPkSettleCountry()); + R aw = iAwardsServiceApi.getAwardsOne(member.getPkAwards()); + R> awList = iAwardsServiceApi.queryAwards(uc.getNewPkSettleCountry()); if (CollectionUtil.isEmpty(awList.getData())) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL)); } @@ -2447,12 +2347,6 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberAccount::getPkCountry, uc.getNewPkSettleCountry()); updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId()); iCuMemberAccountService.update(updateWrapper); -// //修改国家编号 -// CuMember cm = baseMapper.queryRecentlyMember(uc.getNewPkSettleCountry()); -// if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) { -// String countryCode = this.createCountryCode(cm.getCountryCode()); -// member.setCountryCode(countryCode); -// } baseMapper.updateById(member); CuSettleCountryDetailed countryDetailed = new CuSettleCountryDetailed(); countryDetailed.setPkServiceLog(memberLog.getPkId()); @@ -2499,8 +2393,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-修改政策币 - * @author: zhang jing - * @date: 2023/5/9 16:09 * @param: [upseCountryVO] * @return: com.hzs.member.base.vo.UpdateSettleCountryVO **/ @@ -2572,8 +2464,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-删除政策币业务 - * @author: zhang jing - * @date: 2024/4/24 11:52 * @param: [policyCurrencyVO] * @return: com.hzs.member.base.vo.UpPolicyCurrencyVO **/ @@ -2660,7 +2550,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .sendIdList(policyCurrencyVO.getSendIdList()) .fileList(policyCurrencyVO.getFileList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION); @@ -2678,8 +2568,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-修改结算国-审核通过 - * @author: zhang jing - * @date: 2023/2/22 9:34 * @param: [approvalBusinessResultDTO] * @return: boolean **/ @@ -2719,11 +2607,11 @@ public class CuMemberServiceImpl extends ServiceImpl i member.setModifiedTime(date); //查询修改前结算国等级奖衔value值 - R gd = gradeServiceApi.getGrade(member.getPkRegisterGrade()); + R gd = iGradeServiceApi.getGrade(member.getPkRegisterGrade()); Integer pkRegisterGrade = gd.getData().getGradeValue(); - gd = gradeServiceApi.getGrade(member.getPkSettleGrade()); + gd = iGradeServiceApi.getGrade(member.getPkSettleGrade()); Integer pkSettleGrade = gd.getData().getGradeValue(); - gd = gradeServiceApi.getGradeByGradeValue(pkRegisterGrade, Integer.parseInt(uc.getNewSettleCountry())); + gd = iGradeServiceApi.getGradeByGradeValue(pkRegisterGrade, Integer.parseInt(uc.getNewSettleCountry())); if (null == gd.getData()) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } @@ -2731,7 +2619,7 @@ public class CuMemberServiceImpl extends ServiceImpl i throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } member.setPkRegisterGrade(gd.getData().getPkId()); - gd = gradeServiceApi.getGradeByGradeValue(pkSettleGrade, Integer.parseInt(uc.getNewSettleCountry())); + gd = iGradeServiceApi.getGradeByGradeValue(pkSettleGrade, Integer.parseInt(uc.getNewSettleCountry())); if (null == gd.getData()) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } @@ -2739,8 +2627,8 @@ public class CuMemberServiceImpl extends ServiceImpl i throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); } member.setPkSettleGrade(gd.getData().getPkId()); - R aw = awardsServiceApi.getAwardsOne(member.getPkAwards()); - R> awList = awardsServiceApi.queryAwards(Integer.parseInt(uc.getNewSettleCountry())); + R aw = iAwardsServiceApi.getAwardsOne(member.getPkAwards()); + R> awList = iAwardsServiceApi.queryAwards(Integer.parseInt(uc.getNewSettleCountry())); if (CollectionUtil.isEmpty(awList.getData())) { throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL)); } @@ -2758,12 +2646,6 @@ public class CuMemberServiceImpl extends ServiceImpl i updateWrapper.set(CuMemberAccount::getPkCountry, Integer.parseInt(uc.getNewSettleCountry())); updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId()); iCuMemberAccountService.update(updateWrapper); -// //修改国家编号 -// CuMember cm = baseMapper.queryRecentlyMember(Integer.parseInt(uc.getNewSettleCountry())); -// if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) { -// String countryCode = this.createCountryCode(cm.getCountryCode()); -// member.setCountryCode(countryCode); -// } member.setPkSettleCountry(Integer.parseInt(uc.getNewSettleCountry())); baseMapper.updateById(member); } @@ -2773,8 +2655,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 特殊业务-修改结算国-审核驳回 - * @author: zhang jing - * @date: 2023/2/22 9:44 * @param: [approvalBusinessResultDTO] * @return: boolean **/ @@ -2795,7 +2675,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -2835,8 +2715,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 校验会员是否有充值审核 - * @author: zhang jing - * @date: 2023/2/23 10:52 * @param: [pkMember] * @return: java.lang.Integer **/ @@ -2847,8 +2725,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 校验会员是否有提现审核 - * @author: zhang jing - * @date: 2023/2/23 10:52 * @param: [pkMember] * @return: java.lang.Integer **/ @@ -2859,8 +2735,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 校验会员所有账户是否有余额 - * @author: zhang jing - * @date: 2023/2/23 10:53 * @param: [pkMember] * @return: java.lang.Integer **/ @@ -2871,8 +2745,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 查询会员是否存在未完成基础业务办理 - * @author: zhang jing - * @date: 2023/2/23 16:00 * @param: [pkMember] * @return: java.lang.Integer **/ @@ -2883,8 +2755,6 @@ public class CuMemberServiceImpl extends ServiceImpl i /** * @description: 查询会员是否存在未完成注水业绩业务 - * @author: zhang jing - * @date: 2023/2/23 16:35 * @param: [pkMember] * @return: java.lang.Integer **/ @@ -2902,11 +2772,11 @@ public class CuMemberServiceImpl extends ServiceImpl i @Override public List selectCensusSummary(CensusSummaryParam censusSummaryParam, List days) { Integer loginUserCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(loginUserCountry); + R currency = iCurrencyServiceApi.getCurrency(loginUserCountry); // 本国汇率 BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); // 中国汇率 - R chinaCurrency = currencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); + R chinaCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); // 根据类型查询所有人各类型的订单业绩汇总## List censusSummaryList = new ArrayList<>(); @@ -2946,26 +2816,6 @@ public class CuMemberServiceImpl extends ServiceImpl i censusSummaryVo.setRegisterAmountLocality(checkIsDecimalNull(reAmount.add(lxReamount))); censusSummaryVo.setRegisterPvLocality(USDToRMB(loginUserCountry, reAchieve.add(lxReachieve), inExchangeRate)); -// //特殊注册 -// if (memberMeritsSummaryMap.get(EOrderType.SPECIAL_REGISTER_ORDER.getValue()) != null) { -// BigDecimal amount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REGISTER_ORDER.getValue()).getAmount(); -// BigDecimal achieve = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REGISTER_ORDER.getValue()).getAchieve(); -// censusSummaryVo.setSpecialRegisterAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate)); -// censusSummaryVo.setSpecialRegisterPv(computeUSDToRMBRate(achieve, chinaInExchangeRate)); -// censusSummaryVo.setSpecialRegisterAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); -// censusSummaryVo.setSpecialRegisterPvDollar(checkIsDecimalNull(achieve)); -// // 本地币 -// censusSummaryVo.setSpecialRegisterAmountLocality(checkIsDecimalNull(amount)); -// censusSummaryVo.setSpecialRegisterPvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate)); -// } else { -// censusSummaryVo.setSpecialRegisterAmount(BigDecimal.ZERO); -// censusSummaryVo.setSpecialRegisterPv(BigDecimal.ZERO); -// censusSummaryVo.setSpecialRegisterAmountDollar(BigDecimal.ZERO); -// censusSummaryVo.setSpecialRegisterPvDollar(BigDecimal.ZERO); -// // 本地币 -// censusSummaryVo.setSpecialRegisterAmountLocality(BigDecimal.ZERO); -// censusSummaryVo.setSpecialRegisterPvLocality(BigDecimal.ZERO); -// } // 特殊升级 BigDecimal lxamount = BigDecimal.ZERO; BigDecimal lxachieve = BigDecimal.ZERO; @@ -3045,18 +2895,6 @@ public class CuMemberServiceImpl extends ServiceImpl i censusSummaryVo.setTripartitePvLocality(BigDecimal.ZERO); } -// // 嗨粉 -// if (memberMeritsSummaryMap.get(EOrderType.FANS_ORDER.getValue()) != null) { -// BigDecimal amount = memberMeritsSummaryMap.get(EOrderType.FANS_ORDER.getValue()).getAmount(); -// BigDecimal achieve = memberMeritsSummaryMap.get(EOrderType.FANS_ORDER.getValue()).getAchieve(); -// censusSummaryVo.setFansAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate)); -// censusSummaryVo.setHiFunPv(computeUSDToRMBRate(achieve, chinaInExchangeRate)); -// censusSummaryVo.setFansAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); -// censusSummaryVo.setHiFunPvDollar(checkIsDecimalNull(achieve)); -// // 本地币 -// censusSummaryVo.setFansAmountLocality(checkIsDecimalNull(amount)); -// censusSummaryVo.setHiFunPvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate)); -// } else { censusSummaryVo.setFansAmount(BigDecimal.ZERO); censusSummaryVo.setHiFunPv(BigDecimal.ZERO); censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO); @@ -3064,7 +2902,6 @@ public class CuMemberServiceImpl extends ServiceImpl i // 本地币 censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO); censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO); -// } // 复购金额 BigDecimal repurchaseAmount = BigDecimal.ZERO; @@ -3104,42 +2941,6 @@ public class CuMemberServiceImpl extends ServiceImpl i // 复消 repurchaseAmount = repurchaseAmount.add(memberMeritsSummaryMap.get(EOrderType.CONSUME_ORDER.getValue()).getAmount()); } -// // 专供订单算复购业绩 -// if (memberMeritsSummaryMap.get(EOrderType.WHOLESALE_AREA.getValue()) != null) { -// // 专供 -// repurchaseAmount = repurchaseAmount.add(memberMeritsSummaryMap.get(EOrderType.WHOLESALE_AREA.getValue()).getAmount()); -// repurchaseAchieve = repurchaseAchieve.add(memberMeritsSummaryMap.get(EOrderType.WHOLESALE_AREA.getValue()).getAchieve()); -// } -// if (memberMeritsSummaryMap.get(EOrderType.FANS_ORDER.getValue()) != null) { -// // 海粉 -// fansAmount = memberMeritsSummaryMap.get(EOrderType.FANS_ORDER.getValue()).getAmount(); -// fansAchieve = memberMeritsSummaryMap.get(EOrderType.FANS_ORDER.getValue()).getAchieve(); -// } -// if (memberMeritsSummaryMap.get(EOrderType.HAI_FUN_UPGRADE_ORDER.getValue()) != null) { -// // 海粉升级 -// haiFunUpgradeAmount = memberMeritsSummaryMap.get(EOrderType.HAI_FUN_UPGRADE_ORDER.getValue()).getAmount(); -// haiFunUpgradeAchieve = memberMeritsSummaryMap.get(EOrderType.HAI_FUN_UPGRADE_ORDER.getValue()).getAchieve(); -// } -// if (memberMeritsSummaryMap.get(EOrderType.CLOUD_COLLEGE_ORDER.getValue()) != null) { -// // 云学院订单 -// cloudCollegeAmount = memberMeritsSummaryMap.get(EOrderType.CLOUD_COLLEGE_ORDER.getValue()).getAmount(); -// cloudCollegeAchieve = memberMeritsSummaryMap.get(EOrderType.CLOUD_COLLEGE_ORDER.getValue()).getAchieve(); -// } -// if (memberMeritsSummaryMap.get(EOrderType.MALL_ORDER.getValue()) != null) { -// // 直播订单 -// mallOrderAmount = memberMeritsSummaryMap.get(EOrderType.MALL_ORDER.getValue()).getAmount(); -// mallOrderAchieve = memberMeritsSummaryMap.get(EOrderType.MALL_ORDER.getValue()).getAchieve(); -// } -// if (memberMeritsSummaryMap.get(EOrderType.EMPOWERMENT_GIFT.getValue()) != null) { -// // 赋能礼包 -// empowermentAmount = memberMeritsSummaryMap.get(EOrderType.EMPOWERMENT_GIFT.getValue()).getAmount(); -// empowermentAchieve = memberMeritsSummaryMap.get(EOrderType.EMPOWERMENT_GIFT.getValue()).getAchieve(); -// } -// if (memberMeritsSummaryMap.get(EOrderType.COOPERATE_ORDER.getValue()) != null) { -// // 合作订单 -// cooperateAmount = memberMeritsSummaryMap.get(EOrderType.COOPERATE_ORDER.getValue()).getAmount(); -// cooperateAchieve = memberMeritsSummaryMap.get(EOrderType.COOPERATE_ORDER.getValue()).getAchieve(); -// } if (memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()) != null) { // 特殊复购 specialRepurchaseAmount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAmount(); @@ -3200,7 +3001,7 @@ public class CuMemberServiceImpl extends ServiceImpl i */ @Override public Integer getGradeTranslateValue(Integer pkId) { - R grade = gradeServiceApi.getGrade(pkId); + R grade = iGradeServiceApi.getGrade(pkId); return grade.getData().getPkTransaction(); } @@ -3213,7 +3014,7 @@ public class CuMemberServiceImpl extends ServiceImpl i */ @Override public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) { - R awards = awardsServiceApi.getAwardsOne(pkId); + R awards = iAwardsServiceApi.getAwardsOne(pkId); return awards.getData().getPkTransaction(); } @@ -3248,10 +3049,9 @@ public class CuMemberServiceImpl extends ServiceImpl i memberCode = createUserNameByPremix(parentMember.getPkSettleCountry(), Boolean.TRUE, MagicNumberConstants.DIGIT); } cuMember.setPkId(baseMapper.createMemberId()); - generateNumber(cuMember, cuMember.getPkSettleCountry()); memberParam.setMemberCode(memberCode); // 处理等级 - GradeDTO gradeDTO = gradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), parentMember.getPkSettleCountry()).getData(); + GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), parentMember.getPkSettleCountry()).getData(); if (gradeDTO == null) { return null; } @@ -3270,8 +3070,6 @@ public class CuMemberServiceImpl extends ServiceImpl i * @param memberParam 参数 * @Description: 生成用户 * @return: void - * @Author: sui q - * @Date: 2022/9/8 16:03 */ CuMember packageSaveUser(MemberParam memberParam, CuMember parentMember) { // 获取新的订单编号 @@ -3375,46 +3173,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectByMemberRealInfo(memberRealInfoParam); } - /** - * @description: 获取最新国家编号和国际编号 - * @author: zhang jing - * @date: 2023/5/24 16:47 - * @param: [] - * @return: com.hzs.common.domain.member.base.CuMember - **/ - @Override - public void generateNumber(CuMember cuMember, Integer pkCountry) { -// CuMember cm = baseMapper.queryRecentlyMember(pkCountry); -// CuMember cm1 = baseMapper.queryInternationalMember(); -// //全球编号 -// String globalCode = ""; -// //国家编号 -// String countryCode = ""; -// if (StringUtils.isNotNull(cm1) && StringUtils.isNotEmpty(cm1.getGlobalCode())) { -// globalCode = RandomNumberGenerator.getNextNumber(Integer.parseInt(cm1.getGlobalCode())); -// } -// if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) { -// countryCode = this.createCountryCode(cm.getCountryCode()); -// } -// cuMember.setGlobalCode(globalCode); -// cuMember.setCountryCode(countryCode); - } - -// /** -// * 创建国家最新唯一编号 -// * -// * @param countryCode -// * @return -// */ -// private String createCountryCode(String countryCode) { -// countryCode = RandomNumberGenerator.getNextNumber(countryCode, 3); -// -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(CuMember::getCountryCode, countryCode); -// // 校验是否已经存在，不存在则返回 -// return baseMapper.selectCount(queryWrapper) == 0 ? countryCode : this.createCountryCode(countryCode); -// } - /** * 查询推荐列表 * @@ -3442,46 +3200,11 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectRegList(marketNewsParam); } - - /** - * 计算昨天到支付时间之间的时间差距 - */ - private BigDecimal getDaysTime(Date time, Long recommendedOrderNumber) { - // 昨天时间 - DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); - if (time == null) { - return BigDecimal.ZERO; - } - // 支付时间 - DateTime payTime = DateUtil.date(time); - - // 计算日期相差天数 - long daysNumber = DateUtil.betweenDay(payTime, dateTime, false); - if (recommendedOrderNumber != null) { - if (recommendedOrderNumber > 0) { - return new BigDecimal(daysNumber).divide(new BigDecimal(recommendedOrderNumber), 2, BigDecimal.ROUND_HALF_UP); - } else { - return BigDecimal.ZERO; - } - } else { - return BigDecimal.ZERO; - } - - - } - @Override public List findNoPayMember(List memberCodes, Integer pkCountry) { return baseMapper.findNoPayMember(memberCodes, pkCountry); } - /** - * 计算公司用时 - */ - public String getCompanyTime() { - return RandomUtil.randomDouble(100, 200) + ""; - } - /** * 计算明星用时 */ @@ -3609,8 +3332,6 @@ public class CuMemberServiceImpl extends ServiceImpl i // 安置禁止 isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); } - // } - } resultMap.put(showWaresDTO.getPkWares(), isShowWares); } @@ -3734,7 +3455,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .userIdList(updateParentPetitionParam.getUserIdList()) .sendIdList(updateParentPetitionParam.getSendIdList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); @@ -3752,7 +3473,6 @@ public class CuMemberServiceImpl extends ServiceImpl i throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); } } - return updateParentPetitionParam; } @@ -3763,7 +3483,6 @@ public class CuMemberServiceImpl extends ServiceImpl i */ @Override public UpdatePlaceParentPetitionParam petitionUpdatePlaceParent(UpdatePlaceParentPetitionParam updatePlaceParentPetitionParam) { - Integer pkCountry = SecurityUtils.getPkCountry(); //业务单号 String code = CommonUtil.createSerialNumber(EOrderPrefix.UPDATE_PLACE_PARENT.getValue()); @@ -3829,7 +3548,7 @@ public class CuMemberServiceImpl extends ServiceImpl i .userIdList(updatePlaceParentPetitionParam.getUserIdList()) .sendIdList(updatePlaceParentPetitionParam.getSendIdList()) .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); @@ -3873,7 +3592,6 @@ public class CuMemberServiceImpl extends ServiceImpl i // 修改直推 baseMapper.updateParentById(memberServiceLog.getPkMember(), newParentMember.getPkId(), directPushNumber); memberServiceLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - // memberServiceLog.setApproveNumber(memberServiceLog.getApproveNumber() + 1); iCuMemberServiceLogService.updateById(memberServiceLog); } } @@ -3896,7 +3614,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PARENT.getValue()); serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry()); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -3975,7 +3693,7 @@ public class CuMemberServiceImpl extends ServiceImpl i ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry()); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); + R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); if (null == serviceChargeDTOR.getData() || null == serviceChargeDTOR.getData().getPkAccount()) { throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); @@ -4262,6 +3980,6 @@ public class CuMemberServiceImpl extends ServiceImpl i } private String querySystemConfigByKey(Integer pkCountry, String key) { - return systemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData(); + return iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData(); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index 9f80569f..6b3dfba0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -142,7 +142,7 @@ public class MemberStructureController extends BaseController { // 查询秒结 表 如果 秒结表 没有则去 历史表 Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { - List cuMemberSettleExts = null; + List cuMemberSettleExts; // 查询今日会员表是否有值 Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); if (treeMemberCount > 0) { @@ -299,16 +299,18 @@ public class MemberStructureController extends BaseController { } } else { List> children = stringTree.getChildren(); - List> sortChildren = new ArrayList<>(); - int pd = Integer.parseInt(children.get(0).get("placeDept").toString()); - if (pd == 1) { - sortChildren.add(children.get(0)); - sortChildren.add(children.get(1)); - } else { - sortChildren.add(children.get(1)); - sortChildren.add(children.get(0)); - } - stringTree.setChildren(sortChildren); + // 按照安置部门进行排序 + children.sort(Comparator.comparing(o -> o.get("placeDept").toString())); +// List> sortChildren = new ArrayList<>(); +// int pd = Integer.parseInt(children.get(0).get("placeDept").toString()); +// if (pd == 1) { +// sortChildren.add(children.get(0)); +// sortChildren.add(children.get(1)); +// } else { +// sortChildren.add(children.get(1)); +// sortChildren.add(children.get(0)); +// } + stringTree.setChildren(children); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); } } else { diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 2efcde27..c13c4e67 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -1866,27 +1866,6 @@ order by cm.CREATION_TIME desc - - - - - - - - - - -