angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 后台安置架构如果多部门，全部展示；

This commit is contained in:
cabbage 2025-05-06 17:07:13 +08:00
parent 64c7fad604
commit 2ec8545bed
9 changed files with 177 additions and 619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/api/ApiCuActiveMemberCensusController.java
View File

@ -1,62 +1,47 @@
package com.hzs.member.achieve.controller.api; package com.hzs.member.achieve.controller.api;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.enums.EPlaceDept; import com.hzs.common.core.enums.EPlaceDept;
import com.hzs.common.core.utils.DateUtils; 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.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.achieve.controller.vo.CuActiveMemberCensusVO; import com.hzs.member.achieve.controller.vo.CuActiveMemberCensusVO;
import com.hzs.member.achieve.service.ICuActiveMemberCensusService; import com.hzs.member.achieve.service.ICuActiveMemberCensusService;
import com.hzs.member.achieve.service.ICuMemberAchieveService; import com.hzs.member.achieve.service.ICuMemberAchieveService;
import com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.Period; import java.time.Period;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* <p>
* 统计活跃会员 前端控制器 * 统计活跃会员 前端控制器
* </p>
*
* @author zhangjing
* @since 2023-05-17
*/ */
@RestController @RestController
@RequestMapping("/api/active-member-census") @RequestMapping("/api/active-member-census")
public class ApiCuActiveMemberCensusController extends BaseController { public class ApiCuActiveMemberCensusController extends BaseController {
@Autowired @Autowired
private ICuActiveMemberCensusService cuActiveMemberCensusService; private ICuActiveMemberCensusService iCuActiveMemberCensusService;
@Autowired @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") @GetMapping("/activeMember")
public AjaxResult activeMember(CuActiveMemberCensusVO cvo) { public AjaxResult activeMember(CuActiveMemberCensusVO cvo) {
//查找安置人伞下 // 查找安置人伞下
Long memberId = SecurityUtils.getUserId(); Long memberId = SecurityUtils.getUserId();
LocalDate endDate = LocalDate.now(); LocalDate endDate = LocalDate.now();
String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
cvo.setEndDate(endDateStr); 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")); String startDateStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
cvo.setStartDate(startDateStr); cvo.setStartDate(startDateStr);
cvo.setPkMember(memberId); cvo.setPkMember(memberId);
@ -69,8 +54,8 @@ public class ApiCuActiveMemberCensusController extends BaseController {
days = 30; days = 30;
} }
List<CuActiveMemberCensusVO> list = cuActiveMemberCensusService.queryActiveMember(cvo); List<CuActiveMemberCensusVO> list = iCuActiveMemberCensusService.queryActiveMember(cvo);
List<CuActiveMemberCensusVO> calist=new ArrayList<>(); List<CuActiveMemberCensusVO> calist = new ArrayList<>();
if (CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) {
for (int i = 0; i < days; i++) { for (int i = 0; i < days; i++) {
CuActiveMemberCensusVO ca = new CuActiveMemberCensusVO(); CuActiveMemberCensusVO ca = new CuActiveMemberCensusVO();
@ -79,16 +64,16 @@ public class ApiCuActiveMemberCensusController extends BaseController {
} }
} else { } else {
for (int i = 0; i < days; i++) { for (int i = 0; i < days; i++) {
Date creationTime = 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))); String compareTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.toDate(startDate.plusDays(i)));
CuActiveMemberCensusVO cam = new CuActiveMemberCensusVO(); CuActiveMemberCensusVO cam = new CuActiveMemberCensusVO();
cam.setCreationTime(creationTime); cam.setCreationTime(creationTime);
for(CuActiveMemberCensusVO ca:list){ for (CuActiveMemberCensusVO ca : list) {
if(compareTime.equals(ca.getCompareTime())){ if (compareTime.equals(ca.getCompareTime())) {
if(ca.getPlaceDept().intValue()==EPlaceDept.LEFT_DEPT.getValue()){ if (ca.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
cam.setLeftCoun(ca.getTotalCount()); cam.setLeftCoun(ca.getTotalCount());
} }
if(ca.getPlaceDept().intValue()==EPlaceDept.RIGHT_DEPT.getValue()){ if (ca.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
cam.setRightCount(ca.getTotalCount()); cam.setRightCount(ca.getTotalCount());
} }
} }
@ -101,5 +86,4 @@ public class ApiCuActiveMemberCensusController extends BaseController {
return AjaxResult.success(calist); return AjaxResult.success(calist);
} }
} }

32
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java
View File

@ -26,7 +26,6 @@ import java.util.List;
*/ */
public interface CuMemberMapper extends BaseMapper<CuMember> { public interface CuMemberMapper extends BaseMapper<CuMember> {
/** /**
* 查询登录会员以及状态 * 查询登录会员以及状态
* *
@ -62,8 +61,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
/* /*
* @description: 根据条件查询会员信息，查询单表 * @description: 根据条件查询会员信息，查询单表
* @author: sui q
* @date: 2023/5/10 15:07
* @param: null null * @param: null null
**/ **/
List<CuMemberExt> queryMemberByCondition(CuMember cuMember); List<CuMemberExt> queryMemberByCondition(CuMember cuMember);
@ -138,8 +135,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 获取会员主键 * 获取会员主键
* *
* @return: Integer * @return: Integer
* @Author: sui q
* @Date: 2022/9/30 17:38
*/ */
Long createMemberId(); Long createMemberId();
@ -152,8 +147,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
/* /*
* @description: 查询会员信息，根据条件 * @description: 查询会员信息，根据条件
* @author: sui q
* @date: 2023/6/20 11:42
* @param: null null * @param: null null
**/ **/
List<CuMemberVO> queryCuMemberByMemberList(@Param("cuMemberVOList") List<CuMemberVO> cuMemberVOList, List<CuMemberVO> queryCuMemberByMemberList(@Param("cuMemberVOList") List<CuMemberVO> cuMemberVOList,
@ -336,21 +329,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*/ */
List<MemberRealInfoVO> selectByMemberRealInfo(MemberRealInfoParam memberRealInfoParam); List<MemberRealInfoVO> selectByMemberRealInfo(MemberRealInfoParam memberRealInfoParam);
/**
* 查询所有有推荐订单的用户
*
* @return
*/
List<CuMemberExt> selectByPkParentList();
/**
* 查询直推人数
*
* @param pkMember
* @return
*/
Long queryCuMemberTreeParentTableCount(Long pkMember);
/** /**
* 注册列表 * 注册列表
* *
@ -368,16 +346,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*/ */
List<String> findNoPayMember(@Param("memberCodes") List<String> memberCodes, @Param("pkCountry") Integer pkCountry); List<String> findNoPayMember(@Param("memberCodes") List<String> memberCodes, @Param("pkCountry") Integer pkCountry);
/**
* @description: 查询最新会员
**/
CuMember queryRecentlyMember(@Param("pkCountry") Integer pkCountry);
/**
* @description: 查询最新国际编号
**/
CuMember queryInternationalMember();
/** /**
* 查询推荐列表 * 查询推荐列表
* *

21
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuAwardsControlService.java
View File

@ -1,6 +1,5 @@
package com.hzs.member.base.service; package com.hzs.member.base.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.base.CuAwardsControl; import com.hzs.common.domain.member.base.CuAwardsControl;
import com.hzs.member.base.vo.CuAwardsControlVO; import com.hzs.member.base.vo.CuAwardsControlVO;
@ -8,9 +7,7 @@ import com.hzs.member.base.vo.CuAwardsControlVO;
import java.util.List; import java.util.List;
/** /**
* <p>
* 真实奖衔控制 服务类 * 真实奖衔控制 服务类
* </p>
* *
* @author hzs * @author hzs
* @since 2023-04-07 * @since 2023-04-07
@ -19,8 +16,6 @@ public interface ICuAwardsControlService extends IService<CuAwardsControl> {
/** /**
* @description: 查询奖衔控制列表 * @description: 查询奖衔控制列表
* @author: zhang jing
* @date: 2023/4/8 11:40
* @param: [controlVO] * @param: [controlVO]
* @return: java.util.List<com.hzs.member.base.vo.CuAwardsControlVO> * @return: java.util.List<com.hzs.member.base.vo.CuAwardsControlVO>
**/ **/
@ -28,36 +23,24 @@ public interface ICuAwardsControlService extends IService<CuAwardsControl> {
/** /**
* @description: 添加真实奖衔控制-发起签呈 * @description: 添加真实奖衔控制-发起签呈
* @author: zhang jing
* @date: 2023/4/8 16:11
* @param: [controlVO] * @param: [controlVO]
* @return: boolean * @return: boolean
**/ **/
boolean savePetition(CuAwardsControlVO controlVO); boolean savePetition(CuAwardsControlVO controlVO);
/** /**
* @description: 添加真实奖衔控制-发起签呈 * @description: 添加真实奖衔控制-发起签呈
* @author: zhang jing
* @date: 2023/4/8 16:11
* @param: [controlVO] * @param: [controlVO]
* @return: boolean * @return: boolean
**/ **/
boolean upPetition(CuAwardsControlVO controlVO); boolean upPetition(CuAwardsControlVO controlVO);
/** /**
* @description: 添加真实奖衔控制-发起签呈 * @description: 添加真实奖衔控制-发起签呈
* @author: zhang jing
* @date: 2023/4/8 16:11
* @param: [controlVO] * @param: [controlVO]
* @return: boolean * @return: boolean
**/ **/
boolean delPetition(CuAwardsControlVO controlVO); boolean delPetition(CuAwardsControlVO controlVO);
/*
* @description: 查询所有的真实奖衔控制会员，用于奖金计算
* @author: sui q
* @date: 2023/4/11 11:03
* @param: null null
**/
List<CuAwardsControl> queryAllCuAwardsControl();
CuAwardsControlVO affirm(CuAwardsControlVO controlVO); CuAwardsControlVO affirm(CuAwardsControlVO controlVO);
} }

12
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -68,9 +68,6 @@ public interface ICuMemberService extends IService<CuMember> {
/* /*
* @description: 根据条件查询会员信息，查询单表 * @description: 根据条件查询会员信息，查询单表
* @author: sui q
* @date: 2023/5/10 15:07
* @param: null null
**/ **/
List<CuMemberExt> queryMemberByCondition(CuMember cuMember); List<CuMemberExt> queryMemberByCondition(CuMember cuMember);
@ -559,9 +556,6 @@ public interface ICuMemberService extends IService<CuMember> {
/* /*
* description: 查询历史网体的最末安置人，左右区一起查出来 * description: 查询历史网体的最末安置人，左右区一起查出来
* @author: sui q
* @date: 2023/4/6 17:35
* @param:
**/ **/
List<CuMemberExt> queryCuMemberLastPlaceParent(Long pkMember); List<CuMemberExt> queryCuMemberLastPlaceParent(Long pkMember);
@ -590,11 +584,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/ */
List<String> findNoPayMember(List<String> memberCodes, Integer pkCountry); List<String> findNoPayMember(List<String> memberCodes, Integer pkCountry);
/**
* @description: 获取最新国家编号和国际编号
**/
void generateNumber(CuMember cuMember, Integer pkCountry);
/** /**
* 查询推荐列表 * 查询推荐列表
* *
@ -836,7 +825,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/ */
Long checkMemberParent(Long pkMember, String memberCode); Long checkMemberParent(Long pkMember, String memberCode);
/** /**
* 更新会员的修改次数 * 更新会员的修改次数
* *

242
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuAwardsControlServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.hzs.member.base.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject; 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.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.RabbitMqConstants; import com.hzs.common.core.constant.RabbitMqConstants;
@ -39,9 +38,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* <p>
* 真实奖衔控制 服务实现类 * 真实奖衔控制 服务实现类
* </p>
* *
* @author hzs * @author hzs
* @since 2023-04-07 * @since 2023-04-07
@ -60,25 +57,11 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
@Autowired @Autowired
private RabbitTemplate rabbitTemplate; private RabbitTemplate rabbitTemplate;
/**
* @description: 查询奖衔控制列表
* @author: zhang jing
* @date: 2023/4/8 11:40
* @param: [controlVO]
* @return: java.util.List<com.hzs.member.base.vo.CuAwardsControlVO>
**/
@Override @Override
public List<CuAwardsControlVO> queryAwardsControlList(CuAwardsControlVO controlVO) { public List<CuAwardsControlVO> queryAwardsControlList(CuAwardsControlVO controlVO) {
return baseMapper.queryAwardsControlList(controlVO); return baseMapper.queryAwardsControlList(controlVO);
} }
/**
* @description: 添加真实奖衔控制-发起签呈
* @author: zhang jing
* @date: 2023/4/8 16:06
* @param: [controlVO]
* @return: boolean
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean savePetition(CuAwardsControlVO controlVO) { public boolean savePetition(CuAwardsControlVO controlVO) {
@ -90,51 +73,51 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
Date date = new Date(); Date date = new Date();
Long userID = SecurityUtils.getUserId(); Long userID = SecurityUtils.getUserId();
LoginUser loginUser = userTokenService.getLoginUser(); LoginUser loginUser = userTokenService.getLoginUser();
for(CuAwardsControlVO ca:controlVO.getUpdateParentParamList()){ for (CuAwardsControlVO ca : controlVO.getUpdateParentParamList()) {
//审核通过 修改审核状态,累加修改次数 //审核通过 修改审核状态,累加修改次数
CuMemberServiceLog memberLog = new CuMemberServiceLog(); CuMemberServiceLog memberLog = new CuMemberServiceLog();
memberLog.setPkMember(ca.getPkMember()); memberLog.setPkMember(ca.getPkMember());
memberLog.setPkCreator(userID); memberLog.setPkCreator(userID);
memberLog.setCreationTime(date); memberLog.setCreationTime(date);
memberLog.setPkCountry(pkCountry); memberLog.setPkCountry(pkCountry);
memberLog.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue()); memberLog.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue());
memberLog.setBusinessNo(code); memberLog.setBusinessNo(code);
memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()); memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue());
memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()); memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue());
memberLog.setNewValue(JSONObject.toJSONString(ca)); memberLog.setNewValue(JSONObject.toJSONString(ca));
memberLog.setApproveNumber(ca.getChangeNumber()); memberLog.setApproveNumber(ca.getChangeNumber());
memberLog.setSingleAmount(new BigDecimal(0)); memberLog.setSingleAmount(new BigDecimal(0));
memberServiceLogService.save(memberLog); memberServiceLogService.save(memberLog);
String content=EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel(); String content = EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel();
if(StringUtils.isNotEmpty(ca.getRealAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getRealAwardsKeyVal())) {
content=content+" 真实奖衔： "+ca.getRealAwardsKeyVal(); content = content + " 真实奖衔： " + ca.getRealAwardsKeyVal();
}
if(StringUtils.isNotEmpty(ca.getMentoringAwardKeyVal())){
content=content+" 辅导奖衔： "+ca.getMentoringAwardKeyVal();
}
if(StringUtils.isNotEmpty(ca.getDividendAwardKeyVal())){
content=content+" 分红奖衔： "+ca.getDividendAwardKeyVal();
}
if(StringUtils.isNotEmpty(ca.getExtremeAwardsKeyVal())){
content=content+" 级差奖衔： "+ca.getExtremeAwardsKeyVal();
}
if(StringUtils.isNotEmpty(ca.getReplyExamAwardKeyVal())){
content=content+" 复购考核奖衔： "+ca.getReplyExamAwardKeyVal();
}
if(StringUtils.isNotEmpty(ca.getDivvyExamAwardsKeyVal())){
content=content+" 分红考核奖衔： "+ca.getDivvyExamAwardsKeyVal();
}
//组装日志数据
BusinessLogDTO businessLog = BusinessLogDTO.builder()
.businessType(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue())
.businessCode(code)
.pkMember(ca.getPkMember())
.content(content)
.pkCreator(userID)
.pkCountry(pkCountry)
.freeSignFlag(false).build();
dtoList.add(businessLog);
} }
if (StringUtils.isNotEmpty(ca.getMentoringAwardKeyVal())) {
content = content + " 辅导奖衔： " + ca.getMentoringAwardKeyVal();
}
if (StringUtils.isNotEmpty(ca.getDividendAwardKeyVal())) {
content = content + " 分红奖衔： " + ca.getDividendAwardKeyVal();
}
if (StringUtils.isNotEmpty(ca.getExtremeAwardsKeyVal())) {
content = content + " 级差奖衔： " + ca.getExtremeAwardsKeyVal();
}
if (StringUtils.isNotEmpty(ca.getReplyExamAwardKeyVal())) {
content = content + " 复购考核奖衔： " + ca.getReplyExamAwardKeyVal();
}
if (StringUtils.isNotEmpty(ca.getDivvyExamAwardsKeyVal())) {
content = content + " 分红考核奖衔： " + ca.getDivvyExamAwardsKeyVal();
}
//组装日志数据
BusinessLogDTO businessLog = BusinessLogDTO.builder()
.businessType(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue())
.businessCode(code)
.pkMember(ca.getPkMember())
.content(content)
.pkCreator(userID)
.pkCountry(pkCountry)
.freeSignFlag(false).build();
dtoList.add(businessLog);
}
//生成签呈 //生成签呈
ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(EApprovalBusiness.AWARDS_CONTROL_SAVE) ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(EApprovalBusiness.AWARDS_CONTROL_SAVE)
.businessCode(code) .businessCode(code)
@ -151,7 +134,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
throw new RuntimeException(ConfigMsgConstants.AWARDS_CONTROL_SAVE_PETITION); throw new RuntimeException(ConfigMsgConstants.AWARDS_CONTROL_SAVE_PETITION);
} }
//扣钱 //扣钱
if (controlVO.getProcessType().intValue() == EProcessType.DOUBLEPAY.getValue()) { if (controlVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(pkCountry); businessCommissionDTO.setPkCountry(pkCountry);
businessCommissionDTO.setPkAccount(controlVO.getPkAccount()); businessCommissionDTO.setPkAccount(controlVO.getPkAccount());
@ -168,13 +151,6 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
return true; return true;
} }
/**
* @description: 修改真实奖衔控制-发起签呈
* @author: zhang jing
* @date: 2023/4/8 16:12
* @param: [controlVO]
* @return: boolean
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean upPetition(CuAwardsControlVO controlVO) { public boolean upPetition(CuAwardsControlVO controlVO) {
@ -186,7 +162,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
Date date = new Date(); Date date = new Date();
Long userID = SecurityUtils.getUserId(); Long userID = SecurityUtils.getUserId();
LoginUser loginUser = userTokenService.getLoginUser(); LoginUser loginUser = userTokenService.getLoginUser();
for(CuAwardsControlVO ca:controlVO.getUpdateParentParamList()){ for (CuAwardsControlVO ca : controlVO.getUpdateParentParamList()) {
//审核通过 修改审核状态,累加修改次数 //审核通过 修改审核状态,累加修改次数
CuMemberServiceLog memberLog = new CuMemberServiceLog(); CuMemberServiceLog memberLog = new CuMemberServiceLog();
memberLog.setPkMember(ca.getPkMember()); memberLog.setPkMember(ca.getPkMember());
@ -201,24 +177,24 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
memberLog.setApproveNumber(ca.getChangeNumber()); memberLog.setApproveNumber(ca.getChangeNumber());
memberLog.setSingleAmount(new BigDecimal(0)); memberLog.setSingleAmount(new BigDecimal(0));
memberServiceLogService.save(memberLog); memberServiceLogService.save(memberLog);
String content=EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel(); String content = EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel();
if(StringUtils.isNotEmpty(ca.getRealAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getRealAwardsKeyVal())) {
content=content+" 真实奖衔： "+ca.getRealAwardsKeyVal(); content = content + " 真实奖衔： " + ca.getRealAwardsKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getMentoringAwardKeyVal())){ if (StringUtils.isNotEmpty(ca.getMentoringAwardKeyVal())) {
content=content+" 辅导奖衔： "+ca.getMentoringAwardKeyVal(); content = content + " 辅导奖衔： " + ca.getMentoringAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getDividendAwardKeyVal())){ if (StringUtils.isNotEmpty(ca.getDividendAwardKeyVal())) {
content=content+" 分红奖衔： "+ca.getDividendAwardKeyVal(); content = content + " 分红奖衔： " + ca.getDividendAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getExtremeAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getExtremeAwardsKeyVal())) {
content=content+" 级差奖衔： "+ca.getExtremeAwardsKeyVal(); content = content + " 级差奖衔： " + ca.getExtremeAwardsKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getReplyExamAwardKeyVal())){ if (StringUtils.isNotEmpty(ca.getReplyExamAwardKeyVal())) {
content=content+" 复购考核奖衔： "+ca.getReplyExamAwardKeyVal(); content = content + " 复购考核奖衔： " + ca.getReplyExamAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getDivvyExamAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getDivvyExamAwardsKeyVal())) {
content=content+" 分红考核奖衔： "+ca.getDivvyExamAwardsKeyVal(); content = content + " 分红考核奖衔： " + ca.getDivvyExamAwardsKeyVal();
} }
//组装日志数据 //组装日志数据
BusinessLogDTO businessLog = BusinessLogDTO.builder() BusinessLogDTO businessLog = BusinessLogDTO.builder()
@ -246,7 +222,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
throw new RuntimeException(ConfigMsgConstants.AWARDS_CONTROL_MODIFY_PETITION); throw new RuntimeException(ConfigMsgConstants.AWARDS_CONTROL_MODIFY_PETITION);
} }
//扣钱 //扣钱
if (controlVO.getProcessType().intValue() == EProcessType.DOUBLEPAY.getValue()) { if (controlVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(controlVO.getPkCountry()); businessCommissionDTO.setPkCountry(controlVO.getPkCountry());
businessCommissionDTO.setPkAccount(controlVO.getPkAccount()); businessCommissionDTO.setPkAccount(controlVO.getPkAccount());
@ -264,13 +240,6 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
return true; return true;
} }
/**
* @description: 删除真实奖衔控制-发起签呈
* @author: zhang jing
* @date: 2023/4/8 16:12
* @param: [controlVO]
* @return: boolean
**/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean delPetition(CuAwardsControlVO controlVO) { public boolean delPetition(CuAwardsControlVO controlVO) {
@ -282,7 +251,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
Date date = new Date(); Date date = new Date();
Long userID = SecurityUtils.getUserId(); Long userID = SecurityUtils.getUserId();
LoginUser loginUser = userTokenService.getLoginUser(); LoginUser loginUser = userTokenService.getLoginUser();
for(CuAwardsControlVO ca:controlVO.getUpdateParentParamList()){ for (CuAwardsControlVO ca : controlVO.getUpdateParentParamList()) {
//审核通过 修改审核状态,累加修改次数 //审核通过 修改审核状态,累加修改次数
CuMemberServiceLog memberLog = new CuMemberServiceLog(); CuMemberServiceLog memberLog = new CuMemberServiceLog();
memberLog.setPkMember(ca.getPkMember()); memberLog.setPkMember(ca.getPkMember());
@ -297,24 +266,24 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
memberLog.setApproveNumber(ca.getChangeNumber()); memberLog.setApproveNumber(ca.getChangeNumber());
memberLog.setSingleAmount(new BigDecimal(0)); memberLog.setSingleAmount(new BigDecimal(0));
memberServiceLogService.save(memberLog); memberServiceLogService.save(memberLog);
String content=EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel(); String content = EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel();
if(StringUtils.isNotEmpty(ca.getRealAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getRealAwardsKeyVal())) {
content=content+" 真实奖衔： "+ca.getRealAwardsKeyVal(); content = content + " 真实奖衔： " + ca.getRealAwardsKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getMentoringAwardKeyVal())){ if (StringUtils.isNotEmpty(ca.getMentoringAwardKeyVal())) {
content=content+" 辅导奖衔： "+ca.getMentoringAwardKeyVal(); content = content + " 辅导奖衔： " + ca.getMentoringAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getDividendAwardKeyVal())){ if (StringUtils.isNotEmpty(ca.getDividendAwardKeyVal())) {
content=content+" 分红奖衔： "+ca.getDividendAwardKeyVal(); content = content + " 分红奖衔： " + ca.getDividendAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getExtremeAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getExtremeAwardsKeyVal())) {
content=content+" 级差奖衔： "+ca.getExtremeAwardsKeyVal(); content = content + " 级差奖衔： " + ca.getExtremeAwardsKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getReplyExamAwardKeyVal())){ if (StringUtils.isNotEmpty(ca.getReplyExamAwardKeyVal())) {
content=content+" 复购考核奖衔： "+ca.getReplyExamAwardKeyVal(); content = content + " 复购考核奖衔： " + ca.getReplyExamAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ca.getDivvyExamAwardsKeyVal())){ if (StringUtils.isNotEmpty(ca.getDivvyExamAwardsKeyVal())) {
content=content+" 分红考核奖衔： "+ca.getDivvyExamAwardsKeyVal(); content = content + " 分红考核奖衔： " + ca.getDivvyExamAwardsKeyVal();
} }
//组装日志数据 //组装日志数据
BusinessLogDTO businessLog = BusinessLogDTO.builder() BusinessLogDTO businessLog = BusinessLogDTO.builder()
@ -342,7 +311,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
throw new RuntimeException(ConfigMsgConstants.AWARDS_CONTROL_DELETE_PETITION); throw new RuntimeException(ConfigMsgConstants.AWARDS_CONTROL_DELETE_PETITION);
} }
//扣钱 //扣钱
if (controlVO.getProcessType().intValue() == EProcessType.DOUBLEPAY.getValue()) { if (controlVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(controlVO.getPkCountry()); businessCommissionDTO.setPkCountry(controlVO.getPkCountry());
businessCommissionDTO.setPkAccount(controlVO.getPkAccount()); businessCommissionDTO.setPkAccount(controlVO.getPkAccount());
@ -360,19 +329,6 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
return true; return true;
} }
@Override
public List<CuAwardsControl> queryAllCuAwardsControl() {
QueryWrapper<CuAwardsControl> 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 @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public CuAwardsControlVO affirm(CuAwardsControlVO controlVO) { public CuAwardsControlVO affirm(CuAwardsControlVO controlVO) {
@ -380,7 +336,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
String code = CommonUtil.createSerialNumber(EOrderPrefix.HANDLE_BUSINESS.getValue()); String code = CommonUtil.createSerialNumber(EOrderPrefix.HANDLE_BUSINESS.getValue());
// 封装修改会员编号业务日志 // 封装修改会员编号业务日志
List<BusinessLogDTO> dtoList = new ArrayList<>(); List<BusinessLogDTO> dtoList = new ArrayList<>();
for(CuAwardsControlVO ccl:controlVO.getUpdateParentParamList()){ for (CuAwardsControlVO ccl : controlVO.getUpdateParentParamList()) {
// 修改审核状态,累加修改次数 // 修改审核状态,累加修改次数
CuMemberServiceLog memberLog = new CuMemberServiceLog(); CuMemberServiceLog memberLog = new CuMemberServiceLog();
memberLog.setPkMember(ccl.getPkMember()); memberLog.setPkMember(ccl.getPkMember());
@ -392,10 +348,10 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
memberLog.setNewValue(JSONObject.toJSONString(ccl)); memberLog.setNewValue(JSONObject.toJSONString(ccl));
memberLog.setApproveNumber(ccl.getChangeNumber()); memberLog.setApproveNumber(ccl.getChangeNumber());
memberLog.setSingleAmount(new BigDecimal(0)); memberLog.setSingleAmount(new BigDecimal(0));
String content=""; String content = "";
CuAwardsControl control = BeanUtil.copyProperties(ccl, CuAwardsControl.class); CuAwardsControl control = BeanUtil.copyProperties(ccl, CuAwardsControl.class);
if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()) { if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()) {
content=EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel(); content = EApprovalBusiness.AWARDS_CONTROL_SAVE.getLabel();
memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()); memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue());
memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()); memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue());
//新增真实奖衔控制 //新增真实奖衔控制
@ -406,7 +362,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
baseMapper.insert(control); baseMapper.insert(control);
} }
if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()) { if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()) {
content=EApprovalBusiness.AWARDS_CONTROL_MODIFY.getLabel(); content = EApprovalBusiness.AWARDS_CONTROL_MODIFY.getLabel();
memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()); memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue());
memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()); memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue());
//修改真实奖衔控制 //修改真实奖衔控制
@ -417,37 +373,37 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
baseMapper.updateById(control); baseMapper.updateById(control);
} }
if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()) { if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()) {
content=EApprovalBusiness.AWARDS_CONTROL_DELETE.getLabel(); content = EApprovalBusiness.AWARDS_CONTROL_DELETE.getLabel();
memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()); memberLog.setEditType(EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue());
memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()); memberLog.setEditTypePay(EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue());
//删除真实奖衔控制 //删除真实奖衔控制
UpdateWrapper<CuAwardsControl> updateWrapper = new UpdateWrapper(); UpdateWrapper<CuAwardsControl> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper.set("CREATION_TIME", controlVO.getCreationTime()); updateWrapper.set("CREATION_TIME", controlVO.getCreationTime());
updateWrapper.set("PK_CREATOR", controlVO.getPkCreator()); updateWrapper.set("PK_CREATOR", controlVO.getPkCreator());
updateWrapper.eq("PK_ID", control.getPkId()); updateWrapper.eq("PK_ID", control.getPkId());
baseMapper.update(null,updateWrapper); baseMapper.update(null, updateWrapper);
} }
if(StringUtils.isNotEmpty(ccl.getRealAwardsKeyVal())){ if (StringUtils.isNotEmpty(ccl.getRealAwardsKeyVal())) {
content=content+" 真实奖衔： "+ccl.getRealAwardsKeyVal(); content = content + " 真实奖衔： " + ccl.getRealAwardsKeyVal();
} }
if(StringUtils.isNotEmpty(ccl.getMentoringAwardKeyVal())){ if (StringUtils.isNotEmpty(ccl.getMentoringAwardKeyVal())) {
content=content+" 辅导奖衔： "+ccl.getMentoringAwardKeyVal(); content = content + " 辅导奖衔： " + ccl.getMentoringAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ccl.getDividendAwardKeyVal())){ if (StringUtils.isNotEmpty(ccl.getDividendAwardKeyVal())) {
content=content+" 分红奖衔： "+ccl.getDividendAwardKeyVal(); content = content + " 分红奖衔： " + ccl.getDividendAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ccl.getExtremeAwardsKeyVal())){ if (StringUtils.isNotEmpty(ccl.getExtremeAwardsKeyVal())) {
content=content+" 级差奖衔： "+ccl.getExtremeAwardsKeyVal(); content = content + " 级差奖衔： " + ccl.getExtremeAwardsKeyVal();
} }
if(StringUtils.isNotEmpty(ccl.getReplyExamAwardKeyVal())){ if (StringUtils.isNotEmpty(ccl.getReplyExamAwardKeyVal())) {
content=content+" 复购考核奖衔： "+ccl.getReplyExamAwardKeyVal(); content = content + " 复购考核奖衔： " + ccl.getReplyExamAwardKeyVal();
} }
if(StringUtils.isNotEmpty(ccl.getDivvyExamAwardsKeyVal())){ if (StringUtils.isNotEmpty(ccl.getDivvyExamAwardsKeyVal())) {
content=content+" 分红考核奖衔： "+ccl.getDivvyExamAwardsKeyVal(); content = content + " 分红考核奖衔： " + ccl.getDivvyExamAwardsKeyVal();
} }
//扣钱 //扣钱
if (controlVO.getProcessType().intValue() == EProcessType.AVOIDSIGNING.getValue()) { if (controlVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue()) {
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(controlVO.getPkCountry()); businessCommissionDTO.setPkCountry(controlVO.getPkCountry());
businessCommissionDTO.setPkAccount(ccl.getPkAccount()); businessCommissionDTO.setPkAccount(ccl.getPkAccount());
@ -455,13 +411,13 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
businessCommissionDTO.setTradeType(controlVO.getApprovalBusiness()); businessCommissionDTO.setTradeType(controlVO.getApprovalBusiness());
Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO);
if (!b) { if (!b) {
if(controlVO.getApprovalBusiness()==EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()){ if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_SAVE.getValue()) {
throw new ServiceException(ConfigMsgConstants.AWARDS_CONTROL_SAVE_PETITION); throw new ServiceException(ConfigMsgConstants.AWARDS_CONTROL_SAVE_PETITION);
} }
if(controlVO.getApprovalBusiness()==EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()){ if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_MODIFY.getValue()) {
throw new ServiceException(ConfigMsgConstants.AWARDS_CONTROL_MODIFY_PETITION); throw new ServiceException(ConfigMsgConstants.AWARDS_CONTROL_MODIFY_PETITION);
} }
if(controlVO.getApprovalBusiness()==EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()){ if (controlVO.getApprovalBusiness() == EApprovalBusiness.AWARDS_CONTROL_DELETE.getValue()) {
throw new ServiceException(ConfigMsgConstants.AWARDS_CONTROL_DELETE_PETITION); throw new ServiceException(ConfigMsgConstants.AWARDS_CONTROL_DELETE_PETITION);
} }
} }
@ -478,7 +434,7 @@ public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMappe
.freeSignFlag(true).build(); .freeSignFlag(true).build();
dtoList.add(businessLog); dtoList.add(businessLog);
} }
if(CollectionUtil.isNotEmpty(dtoList)){ if (CollectionUtil.isNotEmpty(dtoList)) {
//发送MQ到操作日志 //发送MQ到操作日志
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY,
dtoList); dtoList);

380
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -92,19 +92,19 @@ import java.util.stream.Collectors;
public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> implements ICuMemberService { public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> implements ICuMemberService {
@DubboReference @DubboReference
ICurrencyServiceApi currencyServiceApi; ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference @DubboReference
ICountryServiceApi countryServiceApi; ICountryServiceApi iCountryServiceApi;
@DubboReference @DubboReference
IServiceChargeServiceApi serviceChargeServiceApi; IServiceChargeServiceApi iServiceChargeServiceApi;
@DubboReference @DubboReference
IGradeServiceApi gradeServiceApi; IGradeServiceApi iGradeServiceApi;
@DubboReference @DubboReference
IApprovalServiceApi approvalServiceApi; IApprovalServiceApi iApprovalServiceApi;
@DubboReference @DubboReference
IAwardsServiceApi awardsServiceApi; IAwardsServiceApi iAwardsServiceApi;
@DubboReference @DubboReference
ISystemConfigServiceApi systemConfigServiceApi; ISystemConfigServiceApi iSystemConfigServiceApi;
@Autowired @Autowired
private ICuMemberRegisterService iCuMemberRegisterService; private ICuMemberRegisterService iCuMemberRegisterService;
@ -308,7 +308,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
public CuMember createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun) { public CuMember createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun) {
cuMember.setMemberCode(createUserNameByPremix(cuMember.getPkSettleCountry(), isHaiFun, MagicNumberConstants.OLD_DIGIT)); cuMember.setMemberCode(createUserNameByPremix(cuMember.getPkSettleCountry(), isHaiFun, MagicNumberConstants.OLD_DIGIT));
cuMember.setPkId(baseMapper.createMemberId()); cuMember.setPkId(baseMapper.createMemberId());
generateNumber(cuMember, cuMember.getPkSettleCountry());
// 生成主键 // 生成主键
return cuMember; return cuMember;
} }
@ -384,7 +383,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
log.error(e.getMessage()); log.error(e.getMessage());
return null; return null;
} }
} }
/** /**
@ -449,14 +447,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.specialBusinessQuery(updateCodeVO); return baseMapper.specialBusinessQuery(updateCodeVO);
} }
/** /**
* @description: 批量修改会员编号 * @description: 批量修改会员编号
**/ **/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpdateCodeVO updateCode(UpdateCodeVO updateCode) { public UpdateCodeVO updateCode(UpdateCodeVO updateCode) {
//业务单号 //业务单号
String code = CommonUtil.createSerialNumber(EOrderPrefix.SPECIAL_UPDATE_CODE.getValue()); String code = CommonUtil.createSerialNumber(EOrderPrefix.SPECIAL_UPDATE_CODE.getValue());
updateCode.setApprovalBusiness(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); updateCode.setApprovalBusiness(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue());
@ -515,7 +511,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
//发送MQ到操作日志 //发送MQ到操作日志
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY,
dtoList); dtoList);
return updateCode; return updateCode;
} }
@ -599,7 +594,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(upESVO.getSendIdList()) .sendIdList(upESVO.getSendIdList())
.fileList(upESVO.getFileList()) .fileList(upESVO.getFileList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -783,7 +778,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(zeroElementRevokeVO.getSendIdList()) .sendIdList(zeroElementRevokeVO.getSendIdList())
.fileList(zeroElementRevokeVO.getFileList()) .fileList(zeroElementRevokeVO.getFileList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.ZERO_ELEMENT_REVOKE_PETITION); throw new RuntimeException(ConfigMsgConstants.ZERO_ELEMENT_REVOKE_PETITION);
@ -813,7 +808,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public UpdateCodeVO petition(UpdateCodeVO updateCodeVO) { public UpdateCodeVO petition(UpdateCodeVO updateCodeVO) {
//业务单号 //业务单号
String code = CommonUtil.createSerialNumber(EOrderPrefix.SPECIAL_UPDATE_CODE.getValue()); String code = CommonUtil.createSerialNumber(EOrderPrefix.SPECIAL_UPDATE_CODE.getValue());
// 封装修改会员编号业务日志 // 封装修改会员编号业务日志
@ -857,7 +851,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(updateCodeVO.getSendIdList()) .sendIdList(updateCodeVO.getSendIdList())
.fileList(updateCodeVO.getFileList()) .fileList(updateCodeVO.getFileList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -935,7 +929,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(upseCountryVO.getSendIdList()) .sendIdList(upseCountryVO.getSendIdList())
.fileList(upseCountryVO.getFileList()) .fileList(upseCountryVO.getFileList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.UPDATE_SETTLE_PETITION); throw new RuntimeException(ConfigMsgConstants.UPDATE_SETTLE_PETITION);
@ -1011,7 +1005,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(policyCurrencyVO.getSendIdList()) .sendIdList(policyCurrencyVO.getSendIdList())
.fileList(policyCurrencyVO.getFileList()) .fileList(policyCurrencyVO.getFileList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION); throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION);
@ -1090,7 +1084,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -1117,7 +1111,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
} }
} }
} }
updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getPkModified, userID);
updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date);
@ -1129,8 +1122,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 特殊业务-修改会员编号-审核通过 * @description: 特殊业务-修改会员编号-审核通过
* @author: zhang jing
* @date: 2023/1/6 16:37
* @param: [updateCodeVO] * @param: [updateCodeVO]
* @return: boolean * @return: boolean
**/ **/
@ -1167,8 +1158,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 政策币签呈-审核通过-驳回 * @description: 政策币签呈-审核通过-驳回
* @author: zhang jing
* @date: 2023/5/10 18:02
* @param: [approvalBusinessResultDTO] * @param: [approvalBusinessResultDTO]
* @return: boolean * @return: boolean
**/ **/
@ -1194,7 +1183,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -1221,7 +1210,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
} }
} }
} }
updateWrapper.set(CuMemberServiceLog::getPkModified, userID); updateWrapper.set(CuMemberServiceLog::getPkModified, userID);
updateWrapper.set(CuMemberServiceLog::getModifiedTime, date); updateWrapper.set(CuMemberServiceLog::getModifiedTime, date);
@ -1232,8 +1220,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 删除政策币业务审核 * @description: 删除政策币业务审核
* @author: zhang jing
* @date: 2024/4/24 15:19
* @param: [approvalBusinessResultDTO] * @param: [approvalBusinessResultDTO]
* @return: boolean * @return: boolean
**/ **/
@ -1257,7 +1243,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue()); serviceChargeDTO.setType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -1304,14 +1290,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} else { } else {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_ERROR)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_ERROR));
} }
return true; return true;
} }
/** /**
* @description: 特殊业务-修改会员编号-审核驳回 * @description: 特殊业务-修改会员编号-审核驳回
* @author: zhang jing
* @date: 2023/1/7 9:16
* @param: [updateCodeVO] * @param: [updateCodeVO]
* @return: boolean * @return: boolean
**/ **/
@ -1332,7 +1315,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue());
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -1372,8 +1355,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 特殊业务-真实奖衔控制-审核通过或驳回 * @description: 特殊业务-真实奖衔控制-审核通过或驳回
* @author: zhang jing
* @date: 2023/1/6 16:37
* @param: [updateCodeVO] * @param: [updateCodeVO]
* @return: boolean * @return: boolean
**/ **/
@ -1443,7 +1424,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
} }
} }
} }
return true; return true;
} }
@ -1513,7 +1493,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.businessCode(code) .businessCode(code)
.signType(ESignType.getEnumByValue(placeParentParam.getSignType())) .signType(ESignType.getEnumByValue(placeParentParam.getSignType()))
.remark(placeParentParam.getRemark()).pkMemberList(memberSet).userIdList(placeParentParam.getUserIdList()).build(); .remark(placeParentParam.getRemark()).pkMemberList(memberSet).userIdList(placeParentParam.getUserIdList()).build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PLACE_PARENT); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PLACE_PARENT);
@ -1539,7 +1519,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_PLACE_MONEY)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_PLACE_MONEY));
} }
} }
return null; return null;
} }
@ -1549,7 +1528,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
* @param placeParentParam * @param placeParentParam
*/ */
public void sendPlaceParentLog(PlaceParentParam placeParentParam, LoginUser loginUser, Integer businessType, String code) { public void sendPlaceParentLog(PlaceParentParam placeParentParam, LoginUser loginUser, Integer businessType, String code) {
for (UpdatePlaceParentParam updatePlaceParentParam : placeParentParam.getUpdatePlaceParentList()) { for (UpdatePlaceParentParam updatePlaceParentParam : placeParentParam.getUpdatePlaceParentList()) {
StringBuilder str = new StringBuilder(); StringBuilder str = new StringBuilder();
String oldValue = updatePlaceParentParam.getOldValue(); String oldValue = updatePlaceParentParam.getOldValue();
@ -1583,7 +1561,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.build(); .build();
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, log); rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, log);
} }
} }
/** /**
@ -1697,64 +1674,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.build(); .build();
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, log); 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<UpdateParentParam> updateParentParamList, String businessNo, EApproveStatus approveStatus) {
// 日志列表
List<CuMemberServiceLog> 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<UpdateParentParam> 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<CuMemberMapper, CuMember> i
* @param pkCountry 国家 * @param pkCountry 国家
* @Description: 生成会员编号 * @Description: 生成会员编号
* @return: String * @return: String
* @Author: sui q
* @Date: 2022/9/30 17:35
*/ */
@Override @Override
public String createUserNameByPremix(Integer pkCountry, Boolean isHaiFun, Integer digit) { public String createUserNameByPremix(Integer pkCountry, Boolean isHaiFun, Integer digit) {
@ -1800,7 +1717,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
if (isHaiFun) { if (isHaiFun) {
prefix = SysConstants.HAI_FUN_PREFIX; prefix = SysConstants.HAI_FUN_PREFIX;
} else { } else {
CountryDTO country = countryServiceApi.getCountry(pkCountry).getData(); CountryDTO country = iCountryServiceApi.getCountry(pkCountry).getData();
prefix = country.getCode(); prefix = country.getCode();
} }
if (StringUtils.isEmpty(prefix)) { if (StringUtils.isEmpty(prefix)) {
@ -1859,7 +1776,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
if (isHaiFun) { if (isHaiFun) {
prefix = SysConstants.HAI_FUN_PREFIX; prefix = SysConstants.HAI_FUN_PREFIX;
} else { } else {
CountryDTO country = countryServiceApi.getCountry(pkCountry).getData(); CountryDTO country = iCountryServiceApi.getCountry(pkCountry).getData();
prefix = country.getCode(); prefix = country.getCode();
} }
if (StringUtils.isEmpty(prefix)) { if (StringUtils.isEmpty(prefix)) {
@ -1931,7 +1848,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.findMemberByMembercodesAndPkcountry(memberCodes, pkCountry); return baseMapper.findMemberByMembercodesAndPkcountry(memberCodes, pkCountry);
} }
@Override @Override
public List<CuMember> findMemberByMemberCodeList(List<String> memberCodeList, Integer pkCountry) { public List<CuMember> findMemberByMemberCodeList(List<String> memberCodeList, Integer pkCountry) {
return baseMapper.findMemberByMemberCodeList(memberCodeList, pkCountry); return baseMapper.findMemberByMemberCodeList(memberCodeList, pkCountry);
@ -1957,7 +1873,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.batchUpdateMemberByBusinessType(handleBusinessVO); return baseMapper.batchUpdateMemberByBusinessType(handleBusinessVO);
} }
/** /**
* 招商列表 * 招商列表
* *
@ -1978,8 +1893,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
*/ */
@Override @Override
public List<Tree<String>> systemTjSetListTree(List<CuMemberSettleExt> memberSettleExtList, CuMemberSettleExt memberSettleExt, String settleTableName, Boolean isMemberSecord) { public List<Tree<String>> systemTjSetListTree(List<CuMemberSettleExt> memberSettleExtList, CuMemberSettleExt memberSettleExt, String settleTableName, Boolean isMemberSecord) {
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
// 查询血缘伞下团队业绩和人数 // 查询血缘伞下团队业绩和人数
List<Long> memberIds = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList()); List<Long> memberIds = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList());
@ -2068,7 +1983,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
private Map<String, GradeDTO> queryGradeDTOMap(List<CuMemberSettleExt> memberSettleExtList) { private Map<String, GradeDTO> queryGradeDTOMap(List<CuMemberSettleExt> memberSettleExtList) {
Set<Integer> countrySet = memberSettleExtList.stream().distinct().map(CuMemberSettleExt::getPkSettleCountry).collect(Collectors.toSet()); Set<Integer> countrySet = memberSettleExtList.stream().distinct().map(CuMemberSettleExt::getPkSettleCountry).collect(Collectors.toSet());
Map<String, GradeDTO> gradeDtoMap = new HashMap<>(); Map<String, GradeDTO> gradeDtoMap = new HashMap<>();
Map<Integer, List<GradeDTO>> countryMap = gradeServiceApi.queryCountryGradeConfigByCondition(countrySet).getData(); Map<Integer, List<GradeDTO>> countryMap = iGradeServiceApi.queryCountryGradeConfigByCondition(countrySet).getData();
countryMap.forEach((pkCountry, gradeList) -> { countryMap.forEach((pkCountry, gradeList) -> {
gradeList.forEach(gradeDTO -> { gradeList.forEach(gradeDTO -> {
gradeDtoMap.put(pkCountry.toString() + gradeDTO.getPkId().toString(), gradeDTO); gradeDtoMap.put(pkCountry.toString() + gradeDTO.getPkId().toString(), gradeDTO);
@ -2139,10 +2054,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
if (amount == null) { if (amount == null) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
// if (loginUserCountry.equals(CountryConstants.CHINA_COUNTRY)){
// return amount.multiply(inExchangeRate);
// }
return amount.multiply(inExchangeRate); return amount.multiply(inExchangeRate);
} }
@ -2189,11 +2100,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
*/ */
@Override @Override
public List<Tree<String>> systemAzSetListTree(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt) { public List<Tree<String>> systemAzSetListTree(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt) {
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
R<List<BdAwards>> awardsDto = awardsServiceApi.queryAwards(memberSettleExt.getPkCountry()); R<List<BdAwards>> awardsDto = iAwardsServiceApi.queryAwards(memberSettleExt.getPkCountry());
for (BdAwards date : awardsDto.getData()) { for (BdAwards date : awardsDto.getData()) {
if (date.getPkId().equals(memberSettleExt.getPkAwards())) { if (date.getPkId().equals(memberSettleExt.getPkAwards())) {
memberSettleExt.setColor(date.getColor()); memberSettleExt.setColor(date.getColor());
@ -2291,7 +2202,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return build; return build;
} }
/** /**
* 安置架构五 * 安置架构五
* *
@ -2330,15 +2240,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return num.multiply(inExchangeRate).setScale(2, BigDecimal.ROUND_DOWN); return num.multiply(inExchangeRate).setScale(2, BigDecimal.ROUND_DOWN);
} }
} }
return num; return num;
} }
/** /**
* @description: 特殊配置 修改结算国列表 * @description: 特殊配置 修改结算国列表
* @author: zhang jing
* @date: 2023/4/28 17:24
* @param: [upseCountryVO] * @param: [upseCountryVO]
* @return: java.util.List<com.hzs.member.base.vo.UpdateSettleCountryVO> * @return: java.util.List<com.hzs.member.base.vo.UpdateSettleCountryVO>
**/ **/
@ -2349,8 +2255,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 查询修改政策币列表 * @description: 查询修改政策币列表
* @author: zhang jing
* @date: 2023/5/9 14:25
* @param: [upVO] * @param: [upVO]
* @return: java.util.List<com.hzs.member.base.vo.UpPolicyCurrencyVO> * @return: java.util.List<com.hzs.member.base.vo.UpPolicyCurrencyVO>
**/ **/
@ -2359,11 +2263,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.upPolicyCurrencyList(upVO); return baseMapper.upPolicyCurrencyList(upVO);
} }
/** /**
* @description: 特殊业务-批量修改结算国 * @description: 特殊业务-批量修改结算国
* @author: zhang jing
* @date: 2023/2/21 16:50
* @param: [upseCountryVO] * @param: [upseCountryVO]
* @return: com.hzs.member.base.vo.UpdateSettleCountryVO * @return: com.hzs.member.base.vo.UpdateSettleCountryVO
**/ **/
@ -2407,12 +2308,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
member.setModifiedTime(date); member.setModifiedTime(date);
//查询修改前结算国等级奖衔value值 //查询修改前结算国等级奖衔value值
R<GradeDTO> gd = iGradeServiceApi.getGrade(member.getPkRegisterGrade());
R<GradeDTO> gd = gradeServiceApi.getGrade(member.getPkRegisterGrade());
Integer pkRegisterGrade = gd.getData().getGradeValue(); Integer pkRegisterGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGrade(member.getPkSettleGrade()); gd = iGradeServiceApi.getGrade(member.getPkSettleGrade());
Integer pkSettleGrade = gd.getData().getGradeValue(); Integer pkSettleGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGradeByGradeValue(pkRegisterGrade, uc.getNewPkSettleCountry()); gd = iGradeServiceApi.getGradeByGradeValue(pkRegisterGrade, uc.getNewPkSettleCountry());
if (null == gd.getData()) { if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
@ -2420,7 +2320,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
member.setPkRegisterGrade(gd.getData().getPkId()); member.setPkRegisterGrade(gd.getData().getPkId());
gd = gradeServiceApi.getGradeByGradeValue(pkSettleGrade, uc.getNewPkSettleCountry()); gd = iGradeServiceApi.getGradeByGradeValue(pkSettleGrade, uc.getNewPkSettleCountry());
if (null == gd.getData()) { if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
@ -2428,8 +2328,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
member.setPkSettleGrade(gd.getData().getPkId()); member.setPkSettleGrade(gd.getData().getPkId());
R<BdAwards> aw = awardsServiceApi.getAwardsOne(member.getPkAwards()); R<BdAwards> aw = iAwardsServiceApi.getAwardsOne(member.getPkAwards());
R<List<BdAwards>> awList = awardsServiceApi.queryAwards(uc.getNewPkSettleCountry()); R<List<BdAwards>> awList = iAwardsServiceApi.queryAwards(uc.getNewPkSettleCountry());
if (CollectionUtil.isEmpty(awList.getData())) { if (CollectionUtil.isEmpty(awList.getData())) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL));
} }
@ -2447,12 +2347,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
updateWrapper.set(CuMemberAccount::getPkCountry, uc.getNewPkSettleCountry()); updateWrapper.set(CuMemberAccount::getPkCountry, uc.getNewPkSettleCountry());
updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId()); updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId());
iCuMemberAccountService.update(updateWrapper); 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); baseMapper.updateById(member);
CuSettleCountryDetailed countryDetailed = new CuSettleCountryDetailed(); CuSettleCountryDetailed countryDetailed = new CuSettleCountryDetailed();
countryDetailed.setPkServiceLog(memberLog.getPkId()); countryDetailed.setPkServiceLog(memberLog.getPkId());
@ -2499,8 +2393,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 特殊业务-修改政策币 * @description: 特殊业务-修改政策币
* @author: zhang jing
* @date: 2023/5/9 16:09
* @param: [upseCountryVO] * @param: [upseCountryVO]
* @return: com.hzs.member.base.vo.UpdateSettleCountryVO * @return: com.hzs.member.base.vo.UpdateSettleCountryVO
**/ **/
@ -2572,8 +2464,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 特殊业务-删除政策币业务 * @description: 特殊业务-删除政策币业务
* @author: zhang jing
* @date: 2024/4/24 11:52
* @param: [policyCurrencyVO] * @param: [policyCurrencyVO]
* @return: com.hzs.member.base.vo.UpPolicyCurrencyVO * @return: com.hzs.member.base.vo.UpPolicyCurrencyVO
**/ **/
@ -2660,7 +2550,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(policyCurrencyVO.getSendIdList()) .sendIdList(policyCurrencyVO.getSendIdList())
.fileList(policyCurrencyVO.getFileList()) .fileList(policyCurrencyVO.getFileList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION); throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION);
@ -2678,8 +2568,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 特殊业务-修改结算国-审核通过 * @description: 特殊业务-修改结算国-审核通过
* @author: zhang jing
* @date: 2023/2/22 9:34
* @param: [approvalBusinessResultDTO] * @param: [approvalBusinessResultDTO]
* @return: boolean * @return: boolean
**/ **/
@ -2719,11 +2607,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
member.setModifiedTime(date); member.setModifiedTime(date);
//查询修改前结算国等级奖衔value值 //查询修改前结算国等级奖衔value值
R<GradeDTO> gd = gradeServiceApi.getGrade(member.getPkRegisterGrade()); R<GradeDTO> gd = iGradeServiceApi.getGrade(member.getPkRegisterGrade());
Integer pkRegisterGrade = gd.getData().getGradeValue(); Integer pkRegisterGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGrade(member.getPkSettleGrade()); gd = iGradeServiceApi.getGrade(member.getPkSettleGrade());
Integer pkSettleGrade = gd.getData().getGradeValue(); 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()) { if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
@ -2731,7 +2619,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
member.setPkRegisterGrade(gd.getData().getPkId()); 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()) { if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
@ -2739,8 +2627,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
} }
member.setPkSettleGrade(gd.getData().getPkId()); member.setPkSettleGrade(gd.getData().getPkId());
R<BdAwards> aw = awardsServiceApi.getAwardsOne(member.getPkAwards()); R<BdAwards> aw = iAwardsServiceApi.getAwardsOne(member.getPkAwards());
R<List<BdAwards>> awList = awardsServiceApi.queryAwards(Integer.parseInt(uc.getNewSettleCountry())); R<List<BdAwards>> awList = iAwardsServiceApi.queryAwards(Integer.parseInt(uc.getNewSettleCountry()));
if (CollectionUtil.isEmpty(awList.getData())) { if (CollectionUtil.isEmpty(awList.getData())) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL));
} }
@ -2758,12 +2646,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
updateWrapper.set(CuMemberAccount::getPkCountry, Integer.parseInt(uc.getNewSettleCountry())); updateWrapper.set(CuMemberAccount::getPkCountry, Integer.parseInt(uc.getNewSettleCountry()));
updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId()); updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId());
iCuMemberAccountService.update(updateWrapper); 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())); member.setPkSettleCountry(Integer.parseInt(uc.getNewSettleCountry()));
baseMapper.updateById(member); baseMapper.updateById(member);
} }
@ -2773,8 +2655,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 特殊业务-修改结算国-审核驳回 * @description: 特殊业务-修改结算国-审核驳回
* @author: zhang jing
* @date: 2023/2/22 9:44
* @param: [approvalBusinessResultDTO] * @param: [approvalBusinessResultDTO]
* @return: boolean * @return: boolean
**/ **/
@ -2795,7 +2675,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue());
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -2835,8 +2715,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 校验会员是否有充值审核 * @description: 校验会员是否有充值审核
* @author: zhang jing
* @date: 2023/2/23 10:52
* @param: [pkMember] * @param: [pkMember]
* @return: java.lang.Integer * @return: java.lang.Integer
**/ **/
@ -2847,8 +2725,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 校验会员是否有提现审核 * @description: 校验会员是否有提现审核
* @author: zhang jing
* @date: 2023/2/23 10:52
* @param: [pkMember] * @param: [pkMember]
* @return: java.lang.Integer * @return: java.lang.Integer
**/ **/
@ -2859,8 +2735,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 校验会员所有账户是否有余额 * @description: 校验会员所有账户是否有余额
* @author: zhang jing
* @date: 2023/2/23 10:53
* @param: [pkMember] * @param: [pkMember]
* @return: java.lang.Integer * @return: java.lang.Integer
**/ **/
@ -2871,8 +2745,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 查询会员是否存在未完成基础业务办理 * @description: 查询会员是否存在未完成基础业务办理
* @author: zhang jing
* @date: 2023/2/23 16:00
* @param: [pkMember] * @param: [pkMember]
* @return: java.lang.Integer * @return: java.lang.Integer
**/ **/
@ -2883,8 +2755,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
/** /**
* @description: 查询会员是否存在未完成注水业绩业务 * @description: 查询会员是否存在未完成注水业绩业务
* @author: zhang jing
* @date: 2023/2/23 16:35
* @param: [pkMember] * @param: [pkMember]
* @return: java.lang.Integer * @return: java.lang.Integer
**/ **/
@ -2902,11 +2772,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
@Override @Override
public List<CensusSummaryVo> selectCensusSummary(CensusSummaryParam censusSummaryParam, List<String> days) { public List<CensusSummaryVo> selectCensusSummary(CensusSummaryParam censusSummaryParam, List<String> days) {
Integer loginUserCountry = SecurityUtils.getPkCountry(); Integer loginUserCountry = SecurityUtils.getPkCountry();
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(loginUserCountry); R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(loginUserCountry);
// 本国汇率 // 本国汇率
BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
// 中国汇率 // 中国汇率
R<CurrencyDTO> chinaCurrency = currencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); R<CurrencyDTO> chinaCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate();
// 根据类型查询所有人各类型的订单业绩汇总## // 根据类型查询所有人各类型的订单业绩汇总##
List<CensusSummaryVo> censusSummaryList = new ArrayList<>(); List<CensusSummaryVo> censusSummaryList = new ArrayList<>();
@ -2946,26 +2816,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setRegisterAmountLocality(checkIsDecimalNull(reAmount.add(lxReamount))); censusSummaryVo.setRegisterAmountLocality(checkIsDecimalNull(reAmount.add(lxReamount)));
censusSummaryVo.setRegisterPvLocality(USDToRMB(loginUserCountry, reAchieve.add(lxReachieve), inExchangeRate)); 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 lxamount = BigDecimal.ZERO;
BigDecimal lxachieve = BigDecimal.ZERO; BigDecimal lxachieve = BigDecimal.ZERO;
@ -3045,18 +2895,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
censusSummaryVo.setTripartitePvLocality(BigDecimal.ZERO); 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.setFansAmount(BigDecimal.ZERO);
censusSummaryVo.setHiFunPv(BigDecimal.ZERO); censusSummaryVo.setHiFunPv(BigDecimal.ZERO);
censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO); censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO);
@ -3064,7 +2902,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 本地币 // 本地币
censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO); censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO);
censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO); censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO);
// }
// 复购金额 // 复购金额
BigDecimal repurchaseAmount = BigDecimal.ZERO; BigDecimal repurchaseAmount = BigDecimal.ZERO;
@ -3104,42 +2941,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 复消 // 复消
repurchaseAmount = repurchaseAmount.add(memberMeritsSummaryMap.get(EOrderType.CONSUME_ORDER.getValue()).getAmount()); 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) { if (memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()) != null) {
// 特殊复购 // 特殊复购
specialRepurchaseAmount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAmount(); specialRepurchaseAmount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAmount();
@ -3200,7 +3001,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
*/ */
@Override @Override
public Integer getGradeTranslateValue(Integer pkId) { public Integer getGradeTranslateValue(Integer pkId) {
R<GradeDTO> grade = gradeServiceApi.getGrade(pkId); R<GradeDTO> grade = iGradeServiceApi.getGrade(pkId);
return grade.getData().getPkTransaction(); return grade.getData().getPkTransaction();
} }
@ -3213,7 +3014,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
*/ */
@Override @Override
public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) { public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) {
R<BdAwards> awards = awardsServiceApi.getAwardsOne(pkId); R<BdAwards> awards = iAwardsServiceApi.getAwardsOne(pkId);
return awards.getData().getPkTransaction(); return awards.getData().getPkTransaction();
} }
@ -3248,10 +3049,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
memberCode = createUserNameByPremix(parentMember.getPkSettleCountry(), Boolean.TRUE, MagicNumberConstants.DIGIT); memberCode = createUserNameByPremix(parentMember.getPkSettleCountry(), Boolean.TRUE, MagicNumberConstants.DIGIT);
} }
cuMember.setPkId(baseMapper.createMemberId()); cuMember.setPkId(baseMapper.createMemberId());
generateNumber(cuMember, cuMember.getPkSettleCountry());
memberParam.setMemberCode(memberCode); 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) { if (gradeDTO == null) {
return null; return null;
} }
@ -3270,8 +3070,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
* @param memberParam 参数 * @param memberParam 参数
* @Description: 生成用户 * @Description: 生成用户
* @return: void * @return: void
* @Author: sui q
* @Date: 2022/9/8 16:03
*/ */
CuMember packageSaveUser(MemberParam memberParam, CuMember parentMember) { CuMember packageSaveUser(MemberParam memberParam, CuMember parentMember) {
// 获取新的订单编号 // 获取新的订单编号
@ -3375,46 +3173,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.selectByMemberRealInfo(memberRealInfoParam); 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<CuMember> 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<CuMemberMapper, CuMember> i
return baseMapper.selectRegList(marketNewsParam); 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 @Override
public List<String> findNoPayMember(List<String> memberCodes, Integer pkCountry) { public List<String> findNoPayMember(List<String> memberCodes, Integer pkCountry) {
return baseMapper.findNoPayMember(memberCodes, pkCountry); return baseMapper.findNoPayMember(memberCodes, pkCountry);
} }
/**
* 计算公司用时
*/
public String getCompanyTime() {
return RandomUtil.randomDouble(100, 200) + "";
}
/** /**
* 计算明星用时 * 计算明星用时
*/ */
@ -3609,8 +3332,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 安置禁止 // 安置禁止
isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember());
} }
// }
} }
resultMap.put(showWaresDTO.getPkWares(), isShowWares); resultMap.put(showWaresDTO.getPkWares(), isShowWares);
} }
@ -3734,7 +3455,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.userIdList(updateParentPetitionParam.getUserIdList()) .userIdList(updateParentPetitionParam.getUserIdList())
.sendIdList(updateParentPetitionParam.getSendIdList()) .sendIdList(updateParentPetitionParam.getSendIdList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -3752,7 +3473,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY)); throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY));
} }
} }
return updateParentPetitionParam; return updateParentPetitionParam;
} }
@ -3763,7 +3483,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
*/ */
@Override @Override
public UpdatePlaceParentPetitionParam petitionUpdatePlaceParent(UpdatePlaceParentPetitionParam updatePlaceParentPetitionParam) { public UpdatePlaceParentPetitionParam petitionUpdatePlaceParent(UpdatePlaceParentPetitionParam updatePlaceParentPetitionParam) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
//业务单号 //业务单号
String code = CommonUtil.createSerialNumber(EOrderPrefix.UPDATE_PLACE_PARENT.getValue()); String code = CommonUtil.createSerialNumber(EOrderPrefix.UPDATE_PLACE_PARENT.getValue());
@ -3829,7 +3548,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.userIdList(updatePlaceParentPetitionParam.getUserIdList()) .userIdList(updatePlaceParentPetitionParam.getUserIdList())
.sendIdList(updatePlaceParentPetitionParam.getSendIdList()) .sendIdList(updatePlaceParentPetitionParam.getSendIdList())
.build(); .build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) { if (!submit.isSuccess()) {
log.error("====" + submit.getData()); log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION); throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -3873,7 +3592,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 修改直推 // 修改直推
baseMapper.updateParentById(memberServiceLog.getPkMember(), newParentMember.getPkId(), directPushNumber); baseMapper.updateParentById(memberServiceLog.getPkMember(), newParentMember.getPkId(), directPushNumber);
memberServiceLog.setApproveStatus(EApproveStatus.FINISH.getValue()); memberServiceLog.setApproveStatus(EApproveStatus.FINISH.getValue());
// memberServiceLog.setApproveNumber(memberServiceLog.getApproveNumber() + 1);
iCuMemberServiceLogService.updateById(memberServiceLog); iCuMemberServiceLogService.updateById(memberServiceLog);
} }
} }
@ -3896,7 +3614,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PARENT.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PARENT.getValue());
serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry()); serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry());
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -3975,7 +3693,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry()); serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry());
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() || if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) { null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); throw new ServiceException(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -4262,6 +3980,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
private String querySystemConfigByKey(Integer pkCountry, String key) { private String querySystemConfigByKey(Integer pkCountry, String key) {
return systemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData(); return iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData();
} }
} }

24
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
View File

@ -142,7 +142,7 @@ public class MemberStructureController extends BaseController {
// 查询秒结 表 如果 秒结表 没有则去 历史表 // 查询秒结 表 如果 秒结表 没有则去 历史表
Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
List<CuMemberSettleExt> cuMemberSettleExts = null; List<CuMemberSettleExt> cuMemberSettleExts;
// 查询今日会员表是否有值 // 查询今日会员表是否有值
Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember);
if (treeMemberCount > 0) { if (treeMemberCount > 0) {
@ -299,16 +299,18 @@ public class MemberStructureController extends BaseController {
} }
} else { } else {
List<Tree<String>> children = stringTree.getChildren(); List<Tree<String>> children = stringTree.getChildren();
List<Tree<String>> sortChildren = new ArrayList<>(); // 按照安置部门进行排序
int pd = Integer.parseInt(children.get(0).get("placeDept").toString()); children.sort(Comparator.comparing(o -> o.get("placeDept").toString()));
if (pd == 1) { // List<Tree<String>> sortChildren = new ArrayList<>();
sortChildren.add(children.get(0)); // int pd = Integer.parseInt(children.get(0).get("placeDept").toString());
sortChildren.add(children.get(1)); // if (pd == 1) {
} else { // sortChildren.add(children.get(0));
sortChildren.add(children.get(1)); // sortChildren.add(children.get(1));
sortChildren.add(children.get(0)); // } else {
} // sortChildren.add(children.get(1));
stringTree.setChildren(sortChildren); // sortChildren.add(children.get(0));
// }
stringTree.setChildren(children);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
} }
} else { } else {

37
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -1866,27 +1866,6 @@
order by cm.CREATION_TIME desc order by cm.CREATION_TIME desc
</select> </select>
<select id="selectByPkParentList" resultMap="MemberResultMap">
select cm.*,
a.recommendedOrderNumber recommendedOrderNumber
from CU_MEMBER cm
left join (select count(so.PK_ID) recommendedOrderNumber, so.pk_creator
from SA_ORDER so
where so.del_flag = 0
and so.ORDER_STATUS = 1
and so.ORDER_TYPE in (1, 7, 21)
group by so.pk_creator) a on a.pk_creator = cm.PK_ID
where 1 = 1
and a.recommendedOrderNumber > 0
</select>
<select id="queryCuMemberTreeParentTableCount" resultType="long">
select count(PK_ID)
from cu_member t
where PK_PARENT = #{pkMember}
</select>
<select id="selectRegList" resultType="com.hzs.member.marketnews.vo.UserInvestmentVo"> <select id="selectRegList" resultType="com.hzs.member.marketnews.vo.UserInvestmentVo">
select select
cm.MEMBER_CODE memberCode, cm.MEMBER_CODE memberCode,
@ -2003,22 +1982,6 @@
</if> </if>
</select> </select>
<!--查询最新会员-->
<select id="queryRecentlyMember" resultType="com.hzs.common.domain.member.base.CuMember">
select max(COUNTRY_CODE) COUNTRY_CODE
from cu_member
where pk_settle_country = #{pkCountry}
and COUNTRY_CODE is not null
</select>
<!--查询最新会员国际编号-->
<select id="queryInternationalMember" resultType="com.hzs.common.domain.member.base.CuMember">
select max(to_number(substr(global_code, 3))) global_code
from cu_member
where global_code is not null
</select>
<select id="parentList" resultType="com.hzs.member.base.vo.ParentMemberVo"> <select id="parentList" resultType="com.hzs.member.base.vo.ParentMemberVo">
select a.* from ( select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code select a.* from ( select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code
memberCode,cm.member_name memberName,cm.PK_REGISTER_GRADE pkRegisterGrade, memberCode,cm.member_name memberName,cm.PK_REGISTER_GRADE pkRegisterGrade,

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFrameworkConstants.java
View File

@ -1,11 +1,7 @@
package com.hzs.common.core.constant; package com.hzs.common.core.constant;
/** /**
* @Description: 会员架构展示头像 * 会员架构展示头像
* @Author: yuhui
* @Time: 2023/2/9 10:53
* @Classname: MemberFrameworkConstants
* @PackageName: com.hzs.common.core.constant
*/ */
public class MemberFrameworkConstants { public class MemberFrameworkConstants {