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

## 调整部分业绩查询接口；

This commit is contained in:
cabbage 2025-08-28 14:11:15 +08:00
parent 9ac190845d
commit 7afabbf50e
14 changed files with 256 additions and 1342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import com.hzs.common.core.utils.poi.ExcelUtil;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.core.utils.TransactionUtils;
@ -23,7 +22,6 @@ import com.hzs.member.achieve.controller.vo.*;
import com.hzs.member.achieve.param.MemberAchieveDisParam;
import com.hzs.member.achieve.param.MonthAchieveParam;
import com.hzs.member.achieve.service.ICuMemberAchieveService;
import com.hzs.member.achieve.service.ICuMemberMonthAchieveService;
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.member.achieve.service.ICuMemberTreeService;
import com.hzs.member.base.service.ICuMemberService;
@ -44,47 +42,27 @@ import java.time.temporal.ChronoUnit;
import java.util.*;
/**
* description: 会员端查询市场动态的接口
*
* @author: sui q
* @time: 2023/4/6 16:11
* @classname: CuMemberAchieveDisController
* @package_name: com.hzs.member.achieve.controller.api
* version 1.0.0
* 会员端查询市场动态的接口
*/
@Slf4j
@RestController
@RequestMapping("/api/achieve")
public class ApiCuMemberAchieveDisController extends BaseController {
@Autowired
private ICuMemberTreeService memberTreeService;
@DubboReference
private ICurrencyServiceApi currencyServiceApi;
@Autowired
private ICuMemberService memberService;
@Autowired
private ICuMemberSettlePeriodService memberSettlePeriodService;
@Autowired
private ICuMemberAchieveService cuMemberAchieveService;
private ICuMemberMonthAchieveService cuMemberMonthAchieveService;
BigDecimal ten = new BigDecimal(10000);
@Autowired
public void setCuMemberMonthAchieveService(ICuMemberMonthAchieveService cuMemberMonthAchieveService) {
this.cuMemberMonthAchieveService = cuMemberMonthAchieveService;
}
@Autowired
public void setCuMemberAchieveService(ICuMemberAchieveService cuMemberAchieveService) {
this.cuMemberAchieveService = cuMemberAchieveService;
}
@DubboReference
ICurrencyServiceApi currencyServiceApi;
/**
* @description: 用于查询会员市场动态
* @return: AjaxResult
* @Author: sui q
* @Date: 2023/2/4 14:48
* 用于查询会员市场动态
*/
@GetMapping("/query-place-tree")
public AjaxResult queryPlaceParentTree() {
@ -95,11 +73,9 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* 用于查询会员市场动态
*
* @param memberAchieveDisParam 查询参数
* @description: 用于查询会员市场动态
* @return: AjaxResult
* @Author: sui q
* @Date: 2023/2/4 14:48
*/
@PostMapping("/query-place-tree-detail")
public AjaxResult queryPlaceParentTreeDetail(@RequestBody MemberAchieveDisParam memberAchieveDisParam) {
@ -112,11 +88,9 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* 用于查询会员最近的业绩
*
* @param memberAchieveDisParam 查询参数
* @description: 用于查询会员最近的业绩
* @return: AjaxResult
* @Author: sui q
* @Date: 2023/2/4 14:48
*/
@PostMapping("/query-last-achieve")
public AjaxResult queryLastAchieve(@RequestBody MemberAchieveDisParam memberAchieveDisParam) {
@ -126,11 +100,9 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* 用于查询会员真实业绩
*
* @param memberAchieveDisParam 查询参数
* @description: 用于查询会员真实业绩
* @return: AjaxResult
* @Author: sui q
* @Date: 2023/2/4 14:48
*/
@PostMapping("/query-real-achieve")
public AjaxResult queryRealAchieve(@RequestBody MemberAchieveDisParam memberAchieveDisParam) {
@ -148,23 +120,6 @@ public class ApiCuMemberAchieveDisController extends BaseController {
return AjaxResult.success(realPerformanceVo);
}
// /**
// * 安置业绩分布
// */
// @GetMapping("az-achievement")
// public AjaxResult azAchievement() {
// int month = DateUtil.month(DateUtils.currentDate()) + 1;
// // 查询安置伞下
//// List<CuMemberExt> cuMemberExts = memberService.queryPlaceSponsorUnderUmbrella(SecurityUtils.getUserId());
//// List<Long> memberIds = cuMemberExts.stream().map(a -> {
//// return a.getPkId();
//// }).collect(Collectors.toList());
// AchievementVo achievementVo = cuMemberAchieveService.azAchievement(SecurityUtils.getUserId(), SecurityUtils.getPkCountry(), month);
//
// return AjaxResult.success(achievementVo);
// }
/**
* 会员真实业绩分布
*
@ -172,99 +127,11 @@ public class ApiCuMemberAchieveDisController extends BaseController {
*/
@GetMapping("/query-real-performance-pic")
public AjaxResult queryRealPerformancePic() {
int month = DateUtil.month(DateUtils.currentDate()) + 1;
AzAchievementPie achievementPie = cuMemberAchieveService.queryRealPerformancePic(SecurityUtils.getUserId(), SecurityUtils.getPkCountry(), month);
return AjaxResult.success(achievementPie);
}
// /**
// * 首购业绩分布
// *
// * @return
// */
// @GetMapping("/query-first-performance-pic")
// public AjaxResult queryFirstPerformancePic() {
// Integer pkCountry = SecurityUtils.getPkCountry();
// R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(pkCountry);
// CurrencyDTO currency = currencyDto.getData();
// String time = null;
// Long userId = SecurityUtils.getUserId();
// CuMemberSettleExt memberSettleExt = null;
// Integer period = null;
// String settleTableName = null;
// CuMemberSettlePeriod csPeriod = null;
// Long pkMember = SecurityUtils.getUserId();
//
// DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
// time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
// csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
// settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId();
// memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember);
// // 左区业绩
// BigDecimal leftAchieve = BigDecimal.ZERO;
// // 右区业绩
// BigDecimal rightAchieve = BigDecimal.ZERO;
// if (memberSettleExt != null && memberSettleExt.getASumPv() != null) {
// leftAchieve = memberSettleExt.getASumPv();
// }
// if (memberSettleExt != null && memberSettleExt.getBSumPv() != null){
// rightAchieve = memberSettleExt.getBSumPv();
// }
// //
// AchievementVo achievementVo = new AchievementVo();
// if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
// achievementVo.setLeftAchieve(leftAchieve.divide(ten).multiply(currency.getInExchangeRate()));
// achievementVo.setRightAchieve(rightAchieve.divide(ten).multiply(currency.getInExchangeRate()));
// } else {
// achievementVo.setLeftAchieve(leftAchieve.divide(ten));
// achievementVo.setRightAchieve(rightAchieve.divide(ten));
// }
//
// // 左区人数
// // Long leftNumber = 0L;
// // 右区人数
// // Long rightNumber = 0L;
//
// // leftNumber = memberService.selectByDeptNumberCount(userId, EPlaceDept.LEFT_DEPT.getValue());
// // rightNumber = memberService.selectByDeptNumberCount(userId, EPlaceDept.RIGHT_DEPT.getValue());
//
// // 查询会员左右区人数
// List<DeptMemberNumberVo> deptMemberNumberVoList = memberService.selectByDeptNumberPlace(pkMember);
// Map<Integer, Long> memberNumberMap = deptMemberNumberVoList.stream().collect(Collectors.toMap(DeptMemberNumberVo::getPlaceDept, DeptMemberNumberVo::getQuantity));
//
// achievementVo.setLeftPeopleNumber(memberNumberMap.get(EPlaceDept.LEFT_DEPT.getValue()));
// achievementVo.setRightPeopleNumber(memberNumberMap.get(EPlaceDept.RIGHT_DEPT.getValue()));
// return AjaxResult.success(achievementVo);
//
// }
// /**
// * 复购业绩分布
// *
// * @return
// */
// @GetMapping("/query-repurchase-performance-pic")
// public AjaxResult queryRepurchasePerformancePic() {
// int month = DateUtil.month(DateUtils.currentDate()) + 1;
// AchievementVo achievementVo = cuMemberAchieveService.queryRepurchasePerformancePic(SecurityUtils.getUserId(), SecurityUtils.getPkCountry(), month);
//
// return AjaxResult.success(achievementVo);
// }
// /**
// * 推荐小区分布
// *
// * @return
// */
// @GetMapping("recommend-community")
// public AjaxResult recommendCommunity() {
// int month = DateUtil.month(DateUtils.currentDate()) + 1;
// AchievementVo achievementVo = cuMemberAchieveService.recommendAchievement(SecurityUtils.getUserId(), SecurityUtils.getPkCountry(), month);
// return AjaxResult.success(achievementVo);
// }
/**
* 月度新增业绩对比
*
@ -276,25 +143,8 @@ public class ApiCuMemberAchieveDisController extends BaseController {
return AjaxResult.success(cuMemberAchieveService.selectNewAddAchieveContrast(SecurityUtils.getUserId(), SecurityUtils.getPkCountry(), month));
}
// /**
// * 根据天数查询新增业绩
// *
// * @return AjaxResult
// */
// @GetMapping("/new-add-achieve-day")
// public AjaxResult selectNewAddAchieveByDay() {
// CuMemberNewAddAchieveVO newAddAchieveVO = CuMemberNewAddAchieveVO.builder().days(30L)
// .pkMember(SecurityUtils.getUserId()).pkCountry(SecurityUtils.getPkCountry()).build();
// return AjaxResult.success(cuMemberAchieveService.selectNewAddAchieveByDay(newAddAchieveVO));
// }
/**
* @description: 月度业绩-新增业绩统计
* @author: zhang jing
* @date: 2023/5/19 9:48
* @param:
* @return:
* 月度业绩-新增业绩统计
**/
@GetMapping("/place-new-add-achieve-stat")
public AjaxResult placeNewAddAchieveStat(PlaceNewAddAchieveVO pna) {
@ -309,11 +159,7 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* @description: 月度业绩-详情
* @author: zhang jing
* @date: 2023/9/28 11:00
* @param: [pna]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 月度业绩-详情
**/
@GetMapping("/place-new-add-achieve-details")
public TableDataInfo placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna) {
@ -321,16 +167,12 @@ public class ApiCuMemberAchieveDisController extends BaseController {
if (null == pna.getAchievementType()) {
pna.setAchievementType(EAchievementType.WHOLE.getValue());
}
List<PlaceNewAddAchieveVO> pnaList = cuMemberAchieveService.placeNewAddAchieveDetails(pna);
List<PlaceNewAddAchieveVO> pnaList = cuMemberAchieveService.placeNewAddAchieveDetails(pna);
return getDataTable(pnaList);
}
/**
* @description: 导出
* @author: zhang jing
* @date: 2023/6/6 15:42
* @param: [response, pna]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 导出
**/
@PostMapping("/export")
public void export(HttpServletResponse response, PlaceNewAddAchieveVO pna) {
@ -346,13 +188,8 @@ public class ApiCuMemberAchieveDisController extends BaseController {
util.exportExcel(response, list, "推荐业绩");
}
/**
* @description: 业绩分布-直推业绩统计（右图）
* @author: zhang jing
* @date: 2023/5/19 9:48
* @param:
* @return:
* 业绩分布-直推业绩统计（右图）
**/
@PostMapping("/parent-achieve-right")
public AjaxResult parentAchieveRight(@RequestBody ParentAchieveVO pa) {
@ -372,11 +209,7 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* @description: 业绩分布-直推业绩统计（左图）
* @author: zhang jing
* @date: 2023/5/23 20:03
* @param: [pa]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 业绩分布-直推业绩统计（左图）
**/
@PostMapping("/parent-achieve-left")
public AjaxResult parentAchieveLeft(@RequestBody ParentAchieveVO pa) {
@ -396,11 +229,7 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* @description: 根据月查询该月的最后一天
* @author: zhang jing
* @date: 2023/9/5 19:40
* @param: []
* @return:
* 根据月查询该月的最后一天
**/
public String lastDayByMonth(String endDate) {
// 将月份字符串转换为 LocalDate 对象
@ -417,63 +246,23 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* @description: 推荐达人
* @author: zhang jing
* @date: 2023/5/23 20:03
* @param: [pa]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 推荐达人
**/
@PostMapping("/recommend")
public TableDataInfo recommendExperts(@RequestBody ParentAchieveVO parentAchieveVO) {
return new TableDataInfo();
// if (parentAchieveVO.getWallType() == null) {
// return new TableDataInfo();
// }
// parentAchieveVO.setPkCountry(SecurityUtils.getPkCountry());
// List<CuMemberMonthAchieveExt> cuMemberMonthAchieveExtList = cuMemberMonthAchieveService.queryCuMemberMonthAchieveRecommend(parentAchieveVO);
// cuMemberMonthAchieveExtList.forEach(cuMemberMonthAchieveExt -> {
// String memberName = cuMemberMonthAchieveExt.getMemberName();
// if (memberName.length() > 2) {
// cuMemberMonthAchieveExt.setMemberName(memberName.replaceFirst(memberName.substring(1, memberName.length() - 1), "*"));
// } else {
// cuMemberMonthAchieveExt.setMemberName(memberName.replaceFirst(memberName.substring(1), "*"));
// }
// });
// return getDataTable(cuMemberMonthAchieveExtList);
}
/**
* @description: 抗衰达人
* @author: zhang jing
* @date: 2023/5/23 20:03
* @param: [pa]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 抗衰达人
**/
@PostMapping("/repurchase")
public TableDataInfo repurchaseExperts(@RequestBody ParentAchieveVO parentAchieveVO) {
return new TableDataInfo();
// if (parentAchieveVO.getWallType() == null) {
// return new TableDataInfo();
// }
// parentAchieveVO.setPkCountry(SecurityUtils.getPkCountry());
// List<CuMemberMonthAchieveExt> cuMemberMonthAchieveExtList = cuMemberMonthAchieveService.queryCuMemberMonthAchieveRepurchase(parentAchieveVO);
// cuMemberMonthAchieveExtList.forEach(cuMemberMonthAchieveExt -> {
// String memberName = cuMemberMonthAchieveExt.getMemberName();
// if (memberName.length() > 2) {
// cuMemberMonthAchieveExt.setMemberName(memberName.replaceFirst(memberName.substring(1, memberName.length() - 1), "*"));
// } else {
// cuMemberMonthAchieveExt.setMemberName(memberName.replaceFirst(memberName.substring(1), "*"));
// }
// });
// return getDataTable(cuMemberMonthAchieveExtList);
}
/**
* @description: 抗衰达人
* @author: zhang jing
* @date: 2023/5/23 20:03
* @param: [pa]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 抗衰达人
**/
@PostMapping("/month-achieve")
public TableDataInfo memberMonthAchieve(@RequestBody MonthAchieveParam monthAchieveParam) {
@ -482,9 +271,9 @@ public class ApiCuMemberAchieveDisController extends BaseController {
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
MemberMonthAchieveVO memberMonthAchieveVO = BeanUtil.copyProperties(cuMemberAchieveExt, MemberMonthAchieveVO.class);
setAchieve(cuMemberAchieveExt, memberMonthAchieveVO);
if(StringUtils.isNotEmpty(memberMonthAchieveVO.getMonth())){
if (StringUtils.isNotEmpty(memberMonthAchieveVO.getMonth())) {
String month = memberMonthAchieveVO.getMonth();
memberMonthAchieveVO.setMonth(month.substring(0,4) + "-" + month.substring(4));
memberMonthAchieveVO.setMonth(month.substring(0, 4) + "-" + month.substring(4));
}
memberMonthAchieveList.add(memberMonthAchieveVO);
}
@ -492,7 +281,7 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
private void setAchieve(CuMemberAchieveExt cuMemberAchieveExt, MemberMonthAchieveVO memberMonthAchieveVO) {
if(Objects.equals(CountryConstants.CHINA_COUNTRY, cuMemberAchieveExt.getPkSettleCountry())){
if (Objects.equals(CountryConstants.CHINA_COUNTRY, cuMemberAchieveExt.getPkSettleCountry())) {
memberMonthAchieveVO.setASumPv(ComputeUtil.computeMultiply(memberMonthAchieveVO.getASumPv(), cuMemberAchieveExt.getOutExchangeRate()));
memberMonthAchieveVO.setBSumPv(ComputeUtil.computeMultiply(memberMonthAchieveVO.getBSumPv(), cuMemberAchieveExt.getOutExchangeRate()));
memberMonthAchieveVO.setRepASumPv(ComputeUtil.computeMultiply(memberMonthAchieveVO.getRepASumPv(), cuMemberAchieveExt.getOutExchangeRate()));
@ -503,16 +292,12 @@ public class ApiCuMemberAchieveDisController extends BaseController {
}
/**
* @description: 抗衰达人
* @author: zhang jing
* @date: 2023/5/23 20:03
* @param: [pa]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 抗衰达人
**/
@PostMapping("/month-achieve-detail")
public TableDataInfo memberMonthAchieveDetail(@RequestBody MonthAchieveParam monthAchieveParam) {
List<MemberMonthAchieveVO> memberMonthAchieveList = new ArrayList<>();
if(StringUtils.isNotEmpty(monthAchieveParam.getMonth()) && monthAchieveParam.getPlaceDept() != null) {
if (StringUtils.isNotEmpty(monthAchieveParam.getMonth()) && monthAchieveParam.getPlaceDept() != null) {
startPage();
Date startDate = DateUtils.parseStringToDate(monthAchieveParam.getMonth() + "-01");
Date endDate = DateUtils.currentMonthLastDate(startDate);
@ -562,48 +347,35 @@ public class ApiCuMemberAchieveDisController extends BaseController {
*/
@GetMapping("get-data-info")
public AjaxResult getDataInfo() {
Date date = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, date);
return AjaxResult.success();
}
public static void main(String[] args) {
String firstTime = DateUtils.currentMonthFirstDateStr(DateUtils.currentDate());
String thisTime = DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, DateUtils.currentDate());
Date date = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
System.out.println(DateUtils.parseDateToFormat("M", date));
}
/**
* @description: 安置数据查询
* @author: zhang jing
* @date: 2024/7/11 15:52
* @param: [pna]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 安置数据查询
**/
@GetMapping("/place-frame-query")
public TableDataInfo placeFrameQuery(PlaceFrameQueryVO pfq) {
if(StringUtils.isEmpty(pfq.getMemberCode())){
if (StringUtils.isEmpty(pfq.getMemberCode())) {
pfq.setPkMember(SecurityUtils.getUserId());
}else{
if(memberService.getMemberByCode(pfq.getMemberCode())==null){
} else {
if (memberService.getMemberByCode(pfq.getMemberCode()) == null) {
return getDataTable(new ArrayList<>());
}
pfq.setPkMember(memberService.getMemberByCode(pfq.getMemberCode()).getPkId());
if(pfq.getPkMember()==null){
if (pfq.getPkMember() == null) {
return getDataTable(new ArrayList<>());
}
}
if(StringUtils.isEmpty(pfq.getStartDate())||StringUtils.isEmpty(pfq.getEndDate())){
if (StringUtils.isEmpty(pfq.getStartDate()) || StringUtils.isEmpty(pfq.getEndDate())) {
return getDataTable(new ArrayList<>());
}
//当前时间
Date date=DateUtils.currentDate();
String todayDate=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,date);
Date date = DateUtils.currentDate();
String todayDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
pfq.setTodayDate(todayDate);
String currentDate=DateUtils.beforeDateStr(1,ChronoUnit.DAYS, DateUtils.YYYY_MM_DD,date);
String currentDate = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date);
pfq.setCurrentDate(currentDate);
Integer curPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getCurrentDate()).getPkId();
String curSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + curPeriod;
@ -614,15 +386,15 @@ public class ApiCuMemberAchieveDisController extends BaseController {
//查询期数
Integer staPeriod = 0;
Integer endPeriod = 0;
pfq.setStartDate(DateUtils.beforeDateStr(1,ChronoUnit.DAYS, DateUtils.YYYY_MM_DD,pfq.getStartDate()));
if(memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate())!=null&&
memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate())!=null
){
pfq.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, pfq.getStartDate()));
if (memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate()) != null &&
memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate()) != null
) {
staPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate()).getPkId();
endPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getEndDate()).getPkId();
}
//前一天的一期
Integer beforePeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeDateStr(1,ChronoUnit.DAYS, DateUtils.YYYY_MM_DD,pfq.getCurrentDate())).getPkId();
Integer beforePeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, pfq.getCurrentDate())).getPkId();
pfq.setStaPeriod(staPeriod);
pfq.setEndPeriod(endPeriod);
pfq.setBeforePeriod(beforePeriod);
@ -636,79 +408,75 @@ public class ApiCuMemberAchieveDisController extends BaseController {
pfq.setBeforeSettleTableName(beforeSettleTableName);
//校验表是否存在
Integer endAchieveTable = memberTreeService.queryExistOracleTable(endAchieveTableName);
Integer endSettleTabl=memberTreeService.queryExistOracleTable(endSettleTableName);
Integer endSettleTabl = memberTreeService.queryExistOracleTable(endSettleTableName);
Integer curSettleTabl = memberTreeService.queryExistOracleTable(curSettleTableName);
pfq.setEndAchieveTable(endAchieveTable);
pfq.setEndSettleTabl(endSettleTabl);
//校验会员是否在某会员安置伞下
pfq.setPkPlaceParent(SecurityUtils.getUserId());
if(!pfq.getPkMember().equals(pfq.getPkPlaceParent())){
if(cuMemberAchieveService.checkPlaceMemberQuery(pfq)==null){
if (!pfq.getPkMember().equals(pfq.getPkPlaceParent())) {
if (cuMemberAchieveService.checkPlaceMemberQuery(pfq) == null) {
return getDataTable(new ArrayList<>());
}
}
//查询会员安置伞下第一层会员(本期)
if(curSettleTabl!=null){
List<PlaceFrameQueryVO> memberList=cuMemberAchieveService.placeBefMemberQuery(pfq);
if(CollectionUtil.isNotEmpty(memberList)){
if (curSettleTabl != null) {
List<PlaceFrameQueryVO> memberList = cuMemberAchieveService.placeBefMemberQuery(pfq);
if (CollectionUtil.isNotEmpty(memberList)) {
pfq.setBefMemberList(memberList);
pfq.setLev(memberList.get(0).getLev());
}
}
List<PlaceFrameQueryVO> beflist=new ArrayList<>();
if(CollectionUtil.isNotEmpty(pfq.getBefMemberList())){
beflist= cuMemberAchieveService.placeBefFrameQuery(pfq);
List<PlaceFrameQueryVO> beflist = new ArrayList<>();
if (CollectionUtil.isNotEmpty(pfq.getBefMemberList())) {
beflist = cuMemberAchieveService.placeBefFrameQuery(pfq);
}
//查询会员安置伞下第一层会员
if(endSettleTabl!=null){
List<PlaceFrameQueryVO> memberList=cuMemberAchieveService.placeMemberQuery(pfq);
if(CollectionUtil.isNotEmpty(memberList)){
if (endSettleTabl != null) {
List<PlaceFrameQueryVO> memberList = cuMemberAchieveService.placeMemberQuery(pfq);
if (CollectionUtil.isNotEmpty(memberList)) {
pfq.setMemberList(memberList);
pfq.setLev(memberList.get(0).getLev());
}
}
List<PlaceFrameQueryVO> list= cuMemberAchieveService.placeFrameQuery(pfq);
for(PlaceFrameQueryVO pq:list){
for(PlaceFrameQueryVO pf:beflist){
if(pq.getPkMember().equals(pf.getPkMember())){
List<PlaceFrameQueryVO> list = cuMemberAchieveService.placeFrameQuery(pfq);
for (PlaceFrameQueryVO pq : list) {
for (PlaceFrameQueryVO pf : beflist) {
if (pq.getPkMember().equals(pf.getPkMember())) {
pq.setNewCount(pf.getNewCount());
pq.setNewPv(pf.getNewPv());
}
}
}
return getDataTable(list);
return getDataTable(list);
}
/**
* @description: 推荐数据查询
* @author: zhang jing
* @date: 2024/7/12 13:33
* @param: [pna]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 推荐数据查询
**/
@GetMapping("/parent-frame-query")
public TableDataInfo parentFrameQuery(PlaceFrameQueryVO pfq) {
if(StringUtils.isEmpty(pfq.getMemberCode())){
if (StringUtils.isEmpty(pfq.getMemberCode())) {
pfq.setPkMember(SecurityUtils.getUserId());
}else{
if(memberService.getMemberByCode(pfq.getMemberCode())==null){
} else {
if (memberService.getMemberByCode(pfq.getMemberCode()) == null) {
return getDataTable(new ArrayList<>());
}
pfq.setPkMember(memberService.getMemberByCode(pfq.getMemberCode()).getPkId());
if(pfq.getPkMember()==null){
if (pfq.getPkMember() == null) {
return getDataTable(new ArrayList<>());
}
}
if(StringUtils.isEmpty(pfq.getStartDate())||StringUtils.isEmpty(pfq.getEndDate())){
if (StringUtils.isEmpty(pfq.getStartDate()) || StringUtils.isEmpty(pfq.getEndDate())) {
return getDataTable(new ArrayList<>());
}
//当前时间
Date date=DateUtils.currentDate();
String todayDate=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,date);
Date date = DateUtils.currentDate();
String todayDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
pfq.setTodayDate(todayDate);
String currentDate=DateUtils.beforeDateStr(1,ChronoUnit.DAYS, DateUtils.YYYY_MM_DD,date);
String currentDate = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date);
pfq.setCurrentDate(currentDate);
Integer curPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getCurrentDate()).getPkId();
String curSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + curPeriod;
@ -716,16 +484,16 @@ public class ApiCuMemberAchieveDisController extends BaseController {
//查询期数
Integer staPeriod = 0;
Integer endPeriod = 0;
pfq.setStartDate(DateUtils.beforeDateStr(1,ChronoUnit.DAYS, DateUtils.YYYY_MM_DD,pfq.getStartDate()));
if(memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate())!=null&&
memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate())!=null
){
pfq.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, pfq.getStartDate()));
if (memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate()) != null &&
memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate()) != null
) {
staPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getStartDate()).getPkId();
endPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(pfq.getEndDate()).getPkId();
}
//前一天的一期
Integer beforePeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeDateStr(1,ChronoUnit.DAYS, DateUtils.YYYY_MM_DD,pfq.getCurrentDate())).getPkId();
Integer beforePeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, pfq.getCurrentDate())).getPkId();
pfq.setStaPeriod(staPeriod);
pfq.setEndPeriod(endPeriod);
pfq.setBeforePeriod(beforePeriod);
@ -737,48 +505,48 @@ public class ApiCuMemberAchieveDisController extends BaseController {
pfq.setBeforeSettleTableName(beforeSettleTableName);
//校验表是否存在
Integer staSettleTabl = memberTreeService.queryExistOracleTable(staSettleTableName);
Integer endSettleTabl=memberTreeService.queryExistOracleTable(endSettleTableName);
Integer endSettleTabl = memberTreeService.queryExistOracleTable(endSettleTableName);
Integer curSettleTabl = memberTreeService.queryExistOracleTable(curSettleTableName);
pfq.setStaSettleTabl(staSettleTabl);
pfq.setEndSettleTabl(endSettleTabl);
//校验会员是否在某会员推荐线
pfq.setPkParent(SecurityUtils.getUserId());
if(!pfq.getPkMember().equals(pfq.getPkParent())){
if(cuMemberAchieveService.checkParentMemberQuery(pfq)==null){
if (!pfq.getPkMember().equals(pfq.getPkParent())) {
if (cuMemberAchieveService.checkParentMemberQuery(pfq) == null) {
return getDataTable(new ArrayList<>());
}
}
//查询会员推荐伞下第一层会员(本期)
if(curSettleTabl!=null){
List<PlaceFrameQueryVO> memberList=cuMemberAchieveService.placeBefMemberQuery(pfq);
if(CollectionUtil.isNotEmpty(memberList)){
if (curSettleTabl != null) {
List<PlaceFrameQueryVO> memberList = cuMemberAchieveService.placeBefMemberQuery(pfq);
if (CollectionUtil.isNotEmpty(memberList)) {
pfq.setBefMemberList(memberList);
pfq.setLev(memberList.get(0).getLev());
}
}
//查询本期业绩和新增人数
List<PlaceFrameQueryVO> beflist=new ArrayList<>();
if(CollectionUtil.isNotEmpty(pfq.getBefMemberList())){
beflist= cuMemberAchieveService.parentBefFrameQuery(pfq);
List<PlaceFrameQueryVO> beflist = new ArrayList<>();
if (CollectionUtil.isNotEmpty(pfq.getBefMemberList())) {
beflist = cuMemberAchieveService.parentBefFrameQuery(pfq);
}
//查询会员推荐伞下第一层会员
if(endSettleTabl!=null){
List<PlaceFrameQueryVO> memberList=cuMemberAchieveService.parentBefMemberQuery(pfq);
if(CollectionUtil.isNotEmpty(memberList)){
if (endSettleTabl != null) {
List<PlaceFrameQueryVO> memberList = cuMemberAchieveService.parentBefMemberQuery(pfq);
if (CollectionUtil.isNotEmpty(memberList)) {
pfq.setMemberList(memberList);
pfq.setLev(memberList.get(0).getLev());
}
}
List<PlaceFrameQueryVO> list= cuMemberAchieveService.parentFrameQuery(pfq);
for(PlaceFrameQueryVO pq:list){
for(PlaceFrameQueryVO pf:beflist){
if(pq.getPkMember().equals(pf.getPkMember())){
List<PlaceFrameQueryVO> list = cuMemberAchieveService.parentFrameQuery(pfq);
for (PlaceFrameQueryVO pq : list) {
for (PlaceFrameQueryVO pf : beflist) {
if (pq.getPkMember().equals(pf.getPkMember())) {
pq.setNewCount(pf.getNewCount());
pq.setNewPv(pf.getNewPv());
}
}
}
return getDataTable(list);
return getDataTable(list);
}

7
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/MemberMonthAchieveVO.java
View File

@ -8,12 +8,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* @description: 会员月累计业绩统计
* @author: sui q
* @time: 2023/8/29 17:31
* @classname: MemberMonthAchieve
* @package_name: com.hzs.member.achieve.controller.vo
* version 1.0.0
* 会员月累计业绩统计
*/
@Data
public class MemberMonthAchieveVO implements Serializable {

5
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java
View File

@ -10,12 +10,7 @@ import java.util.List;
/**
* <p>
* 直推业绩统计VO
* </p>
*
* @author zhangjing
* @since 2023-05-17
*/
@Data
public class ParentAchieveVO {

218
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java
View File

@ -17,12 +17,7 @@ import java.util.Date;
import java.util.List;
/**
* <p>
* 会员业绩记录 Mapper 接口
* </p>
*
* @author hzs
* @since 2022-10-26
*/
public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
@ -30,9 +25,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* 创建会员网体记录表
*
* @param tableName 日期
* @return: void
* @Author: sui q
* @Date: 2022/10/31 11:44
*/
void createCuMemberAchieveTable(String tableName);
@ -40,17 +32,11 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* 创建每年的会员考核表
*
* @param tableName 表名
* @return: void
* @Author: sui q
* @Date: 2022/11/7 14:10
*/
void createCuMemberMonthTable(String tableName);
/*
* @description:更新会员业绩表 每月月统计报表
* @author: sui q
* @date: 2023/8/29 10:57
* @param: null null
* 更新会员业绩表 每月月统计报表
**/
void mergeCuMemberMonth(@Param("date") String date, @Param("period") Integer period);
@ -60,9 +46,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* @param targetTableName 目标表 网体月表
* @param sourceTableName 来源表 结算日表
* @param period 期间
* @return: void2
* @Author: sui q
* @Date: 2023/2/16 11:35
*/
void insertCuMemberAchieveBySettleDate(@Param("targetTableName") String targetTableName,
@Param("sourceTableName") String sourceTableName, @Param("period") Integer period);
@ -73,9 +56,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* @param targetTableName 目标表 网体月表
* @param sourceTableName 来源表 结算日表
* @param period 期间
* @return: void
* @Author: sui q
* @Date: 2023/2/16 11:35
*/
void mergeCuMemberAchieveBySettleDate(@Param("targetTableName") String targetTableName,
@Param("sourceTableName") String sourceTableName, @Param("period") Integer period);
@ -86,17 +66,11 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
*
* @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据
* @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据
* @return: void
* @Author: sui q
* @Date: 2022/10/31 16:26
*/
void updateCuMemberSettleAchieveByBeforeDay(@Param("sourceTable") String sourceTable, @Param("targetTable") String targetTable);
/*
* @description: 更新为最初始的数据，新增的为0，历史的通过昨天进行更新
* @author: sui q
* @date: 2023/8/11 14:57
* @param: null null
* 更新为最初始的数据，新增的为0，历史的通过昨天进行更新
**/
void updateCuMemberSettleInitAchieve(String targetTable);
@ -106,18 +80,12 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* @param targetTable 结算表
* @param period 期间
* @param pkId 主键
* @return: void
* @Author: sui q
* @Date: 2023/3/11 13:42
*/
void updateCuMemberSettleAchieveBySpecialBus(@Param("targetTable") String targetTable, @Param("period") Integer period,
@Param("pkId") Long pkId);
/*
* @description: 根据到期日期更新业绩，到期后需要还原到实际累计金额
* @author: sui q
* @date: 2023/4/8 15:32
* @param: null null
* 根据到期日期更新业绩，到期后需要还原到实际累计金额
**/
void updateCuMemberSettleAchieveByDueDate(@Param("currentTableName") String currentTableName, @Param("yesTableName") String yesTableName,
@Param("currentDate") Date currentDate);
@ -128,9 +96,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
*
* @param memberAchieveParamList 会员业绩
* @param tableName 更新的表，结算日的日表
* @return: Boolean
* @Author: sui q
* @Date: 2022/11/2 11:30
*/
Boolean updateCuMemberBackOldAchieveEveryDay(@Param("memberAchieveParamList") List<?> memberAchieveParamList,
@Param("tableName") String tableName);
@ -140,9 +105,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
*
* @param memberAchieveParamList 会员业绩
* @param tableName 更新的表，结算日的日表
* @return: Boolean
* @Author: sui q
* @Date: 2022/11/2 11:30
*/
Boolean updateCuMemberBackAchieveEveryDay(@Param("memberAchieveParamList") List<?> memberAchieveParamList,
@Param("tableName") String tableName);
@ -153,17 +115,11 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* @param pkMember 会员主键
* @param pkCountry 公司
* @param tableName 结算表
* @return: CuMemberAchieve
* @Author: sui q
* @Date: 2022/10/26 15:04
*/
CuMemberAchieve queryCuMemberAchieveByPkMember(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry, @Param("tableName") String tableName);
/*
* description: 查询会员伞下血缘业绩
* @author: sui q
* @date: 2023/4/7 15:13
* @param: null null
* 查询会员伞下血缘业绩
**/
BigDecimal queryCuMemberUnderBloodAchieveByPkMember(@Param("treeTable") String treeTable, @Param("achieveTable") String achieveTable,
@Param("pkMember") Long pkMember, @Param("period") Integer period);
@ -227,102 +183,53 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
Integer selectExistTable(String tableName);
/**
* @description: 查询左右区新增业绩
* @author: zhang jing
* @date: 2023/5/19 11:00
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
* 查询左右区新增业绩
**/
PlaceNewAddAchieveVO selectNewABAchieve(PlaceNewAddAchieveVO pna);
List<PlaceNewAddAchieveVO> selectABDirectAchieve(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-详情
* @author: zhang jing
* @date: 2023/9/28 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
* 月度业绩-详情
**/
List<PlaceNewAddAchieveVO> placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 查询直推业绩
* @author: zhang jing
* @date: 2023/5/19 15:50
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
* 查询直推业绩
**/
PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna);
/**
* @description: 查询左右区人数
* @author: zhang jing
* @date: 2023/5/19 14:38
* @param: [pna]
* @return: java.lang.Integer
* 查询左右区人数
**/
List<PlaceNewAddAchieveVO> selectABCoun(PlaceNewAddAchieveVO pna);
/**
* @description: 查询最新月份左右区人数
* @author: zhang jing
* @date: 2023/9/10 17:51
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
* 查询最新月份左右区人数
**/
List<PlaceNewAddAchieveVO> selectABNewMonthCoun(PlaceNewAddAchieveVO pna);
/**
* @description: 根据日期查询最新期数
* @author: zhang jing
* @date: 2023/6/6 14:51
* @param: [pna]
* @return: java.lang.Integer
**/
Integer mostNewPeriod(PlaceNewAddAchieveVO pna);
/**
* @description: 查询各个等级直推人数和业绩
* @author: zhang jing
* @date: 2023/5/23 10:18
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
* 查询各个等级直推人数和业绩
**/
List<ParentAchieveVO> selectParentCounAchieve(ParentAchieveVO pav);
/**
* @description: 查询本人直推业绩
* @author: zhang jing
* @date: 2023/5/23 19:29
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
* 查询本人直推业绩
**/
List<ParentAchieveVO> selfParentCounAchieve(ParentAchieveVO pav);
/**
* @description: 查询前10直推业绩
* @author: zhang jing
* @date: 2023/5/23 19:31
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
* 查询前10直推业绩
**/
List<ParentAchieveVO> parentCounAchieveTop(ParentAchieveVO pav);
List<ParentAchieveVO> allDirectPush(ParentAchieveVO pav);
/**
* @description: 直推业绩前十人伞下等级业绩
* @author: zhang jing
* @date: 2023/5/31 19:56
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
* 直推业绩前十人伞下等级业绩
**/
List<ParentAchieveVO> umbrellaAchieveTop(ParentAchieveVO pav);
/**
* 查询安置数据
*
@ -339,7 +246,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
*/
List<PlacementDataBaseVO> selectAchieveByPkMember(PlacementDataParam param);
/**
* 查询推荐数据
*
@ -356,7 +262,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
*/
List<RecommendDataBaseVO> selectRecommendDataListByPkMember(PlacementDataParam param);
/**
* 查询体系总和
*
@ -423,10 +328,7 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
List<BigDecimal> selectByParent(@Param("memberIds") List<Long> memberIds, @Param("pkCountry") Integer pkCountry, @Param("achieveTable") String achieveTable);
/*
* @description: 更新会员的业绩
* @author: sui q
* @date: 2023/8/12 15:46
* @param: null null
* 更新会员的业绩
**/
void updateCuMemberAchieve(@Param("tableName") String tableName, @Param("period") Integer period);
@ -457,43 +359,28 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
List<RecommendImageDataVO> selectRecommendTeamImage(PlacementDataParam param);
/*
* @description: 查询月统计数据，按照月倒叙
* @author: sui q
* @date: 2023/8/29 16:10
* @param: null null
* 查询月统计数据，按照月倒叙
**/
List<CuMemberAchieveExt> queryMemberMonthAchieve(@Param("pkMember") Long pkMember, @Param("monthList") List<String> monthList);
/*
* @description: 查询会员一代伞下
* @author: sui q
* @date: 2023/8/29 18:07
* @param: null null
* 查询会员一代伞下
**/
List<Long> queryPkMemberMonthAchieve(@Param("month") String month, @Param("pkMember") Long pkMember);
/*
* @description: 查询月统计数据，查询明细
* @author: sui q
* @date: 2023/8/29 17:43
* @param: null null
* 查询月统计数据，查询明细
**/
List<CuMemberAchieveExt> queryMemberMonthAchieveDetail(@Param("monthAchieveParam") MonthAchieveParam monthAchieveParam,
@Param("memberList") List<Long> memberList);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
* 查询月统计数据，查询明细，安置伞下
**/
List<CuMemberAchieveExt> queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
* 查询月统计数据，查询明细，安置伞下
**/
List<CuMemberAchieveExt> queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
@ -523,96 +410,53 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
List<CuMemberNewAddAchieveVO> selectNewAddAchieveByPeriod(@Param("achieve") CuMemberNewAddAchieveVO achieve);
/**
* @description: 安置数据查询
* @author: zhang jing
* @date: 2024/7/16 13:14
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 安置数据查询
**/
List<PlaceFrameQueryVO> placeFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期安置伞下业绩和新增人数
* @author: zhang jing
* @date: 2024/7/24 9:47
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期安置伞下业绩和新增人数
**/
List<PlaceFrameQueryVO> placeBefFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询会员安置伞下第一层会员
* @author: zhang jing
* @date: 2024/7/17 9:22
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询会员安置伞下第一层会员
**/
List<PlaceFrameQueryVO> placeMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期安置网体会员
* @author: zhang jing
* @date: 2024/7/24 9:31
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期安置网体会员
**/
List<PlaceFrameQueryVO> placeBefMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 校验会员是否在某会员安置伞下
* @author: zhang jing
* @date: 2024/7/22 14:22
* @param: [pfq]
* @return: com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO
* 校验会员是否在某会员安置伞下
**/
PlaceFrameQueryVO checkPlaceMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 校验会员是否在某会员推荐线
* @author: zhang jing
* @date: 2024/7/22 14:22
* @param: [pfq]
* @return: com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO
* 校验会员是否在某会员推荐线
**/
PlaceFrameQueryVO checkParentMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询会员推荐伞下第一层会员
* @author: zhang jing
* @date: 2024/7/17 9:23
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询会员推荐伞下第一层会员
**/
List<PlaceFrameQueryVO> parentMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期推荐伞下第一层会员
* @author: zhang jing
* @date: 2024/7/24 9:33
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期推荐伞下第一层会员
**/
List<PlaceFrameQueryVO> parentBefMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 推荐数据查询
* @author: zhang jing
* @date: 2024/7/16 16:23
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 推荐数据查询
**/
List<PlaceFrameQueryVO> parentFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期推荐伞下业绩和新增人数
* @author: zhang jing
* @date: 2024/7/24 10:46
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期推荐伞下业绩和新增人数
**/
List<PlaceFrameQueryVO> parentBefFrameQuery(PlaceFrameQueryVO pfq);

54
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthAchieveMapper.java
View File

@ -1,71 +1,21 @@
package com.hzs.member.achieve.mapper;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve;
import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt;
import com.hzs.member.achieve.controller.vo.ParentAchieveVO;
import com.hzs.member.achieve.controller.vo.RealPerformanceVo;
import com.hzs.member.achieve.vo.CuMemberMonthVo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* <p>
* 会员月数据 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-06-06
*/
public interface CuMemberMonthAchieveMapper extends BaseMapper<CuMemberMonthAchieve> {
/*
* @description: 根据时间查询月业绩
* @author: sui q
* @date: 2023/6/7 14:37
* @param: null null
**/
List<CuMemberMonthAchieveExt> queryCuMemberMonthAchieveByDate(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod,
@Param("recommend") Integer recommend);
/*
* @description: 根据条件查询会员月业绩 推荐达人
* @author: sui q
* @date: 2023/6/7 16:00
* @param: null null
**/
List<CuMemberMonthAchieveExt> queryCuMemberMonthAchieveRecommend(ParentAchieveVO parentAchieveVO);
/*
* @description: 根据条件查询会员月业绩 推荐达人
* @author: sui q
* @date: 2023/6/7 16:00
* @param: null null
**/
List<CuMemberMonthAchieveExt> queryCuMemberMonthAchieveRepurchase(ParentAchieveVO parentAchieveVO);
/*
* @description: 每天插入会员月表，计算推荐业绩，复购业绩，1-6号计算前7天
* @author: sui q
* @date: 2023/6/6 14:15
* @param: null null
**/
void insertCuMemberMonthAchieve(@Param("tableName") String tableName, @Param("period") Integer period, @Param("month") String month);
/**
*
* @param pkMember 会员主键
* @param achieveTable 表名
* @return
*/
CuMemberMonthVo queryCuMemberMonthInfo(@Param("pkMember") Long pkMember,@Param("achieveTable") String achieveTable);
/**
* 查询会员真实业绩
*
* @param pkMember
* @param achieveTable
* @return
*/
RealPerformanceVo queryCuMemberMonthAchieveInfo(@Param("pkMember") Long pkMember,@Param("achieveTable") String achieveTable);
RealPerformanceVo queryCuMemberMonthAchieveInfo(@Param("pkMember") Long pkMember, @Param("achieveTable") String achieveTable);
}

4
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveParam.java
View File

@ -1,9 +1,5 @@
package com.hzs.member.achieve.param;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

133
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java
View File

@ -3,10 +3,8 @@ package com.hzs.member.achieve.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberAchieve;
import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt;
import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.member.achieve.controller.vo.*;
import com.hzs.member.achieve.param.MemberAchieveDisParam;
import com.hzs.member.achieve.param.MemberAchieveParam;
import com.hzs.member.achieve.param.MonthAchieveParam;
import com.hzs.member.achieve.vo.*;
import com.hzs.member.settlecenter.param.PlacementDataParam;
@ -14,21 +12,13 @@ import com.hzs.member.settlecenter.vo.PlacementDataVO;
import com.hzs.member.settlecenter.vo.PlacementImageDataVO;
import com.hzs.member.settlecenter.vo.RecommendImageDataVO;
import com.hzs.member.settlecenter.vo.RecommendTeamImagVO;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* <p>
* 会员业绩记录 服务类
* </p>
*
* @author hzs
* @since 2022-10-26
*/
public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
@ -37,33 +27,21 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*
* @param pkMember 会员主键
* @param pkCountry 公司
* @return: CuMemberAchieve
* @Author: sui q
* @Date: 2022/10/26 15:04
*/
CuMemberAchieve queryCuMemberAchieveByPkMember(Long pkMember, Integer pkCountry);
/*
* description: 业绩分布-安置图
* @author: sui q
* @date: 2023/4/6 18:01
* @param: null null
* 业绩分布-安置图
**/
CuMemberDisVO queryCuMemberAchieveDis(MemberAchieveDisParam memberAchieveDisParam);
/*
* @description: 点击架构树显示会员的业绩情况
* @author: sui q
* @date: 2023/5/10 16:04
* @param: null null
* 点击架构树显示会员的业绩情况
**/
CuMemberDisVO queryCuMemberDis(MemberAchieveDisParam memberAchieveDisParam);
/*
* description: 查询会员伞下血缘业绩
* @author: sui q
* @date: 2023/4/7 15:13
* @param: null null
* 查询会员伞下血缘业绩
**/
BigDecimal queryCuMemberUnderBloodAchieveByPkMember(MemberAchieveDisParam memberAchieveDisParam);
@ -117,39 +95,23 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
LocalDate getStartDateByType(Integer dayType, LocalDate localDate);
/**
* @description: 业绩分布-新增业绩统计
* @author: zhang jing
* @date: 2023/5/19 10:29
* @param: []
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
* 业绩分布-新增业绩统计
**/
PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-详情
* @author: zhang jing
* @date: 2023/9/28 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
* 月度业绩-详情
**/
List<PlaceNewAddAchieveVO> placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 业绩分布-直推业绩（右图）
* @author: zhang jing
* @date: 2023/5/20 16:22
* @param: [pa]
* @return: com.hzs.member.achieve.controller.vo.ParentAchieveVO
* 业绩分布-直推业绩（右图）
**/
ParentAchieveVO parentAchieveRight(ParentAchieveVO pa);
/**
* @description: 业绩分布-直推业绩（左图）
* @author: zhang jing
* @date: 2023/5/23 19:49
* @param: [pa]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
* 业绩分布-直推业绩（左图）
**/
List<ParentAchieveVO> parentAchieveLeft(ParentAchieveVO pa);
@ -180,7 +142,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*/
RealPerformanceVo queryRealPerformance(Long pkMember, Integer pkCountry, Integer month);
/**
* 会员真实业绩饼状图
*
@ -199,7 +160,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*/
PlacementImageDataVO selectPlaceImage(PlacementDataParam param);
/**
* 查询推荐体第图表
*
@ -208,7 +168,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*/
List<RecommendImageDataVO> selectRecommendVertexImage(PlacementDataParam param);
/**
* 查询推荐团队图表
*
@ -218,113 +177,67 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
List<RecommendTeamImagVO> selectRecommendTeamImage(PlacementDataParam param);
/*
* @description: 查询月统计数据，按照月倒叙
* @author: sui q
* @date: 2023/8/29 16:10
* @param: null null
* 查询月统计数据，按照月倒叙
**/
List<CuMemberAchieveExt> queryMemberMonthAchieve(Long pkMember, String month);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
* 查询月统计数据，查询明细，安置伞下
**/
List<CuMemberAchieveExt> queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
* 查询月统计数据，查询明细，安置伞下
**/
List<CuMemberAchieveExt> queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
/**
* @description: 安置数据查询
* @author: zhang jing
* @date: 2023/5/19 10:29
* @param: []
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
* 安置数据查询
**/
List<PlaceFrameQueryVO> placeFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description:
* @author: zhang jing
* @date: 2024/7/24 10:02
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
*
**/
List<PlaceFrameQueryVO> placeBefFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description: 推荐数据查询
* @author: zhang jing
* @date: 2024/7/17 9:28
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 推荐数据查询
**/
List<PlaceFrameQueryVO> parentFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期推荐伞下业绩和新增人数
* @author: zhang jing
* @date: 2024/7/24 10:47
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期推荐伞下业绩和新增人数
**/
List<PlaceFrameQueryVO> parentBefFrameQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询会员安置伞下第一层会员
* @author: zhang jing
* @date: 2024/7/17 9:29
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询会员安置伞下第一层会员
**/
List<PlaceFrameQueryVO> placeMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期安置网体会员
* @author: zhang jing
* @date: 2024/7/24 9:31
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期安置网体会员
**/
List<PlaceFrameQueryVO> placeBefMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询会员推荐伞下第一层会员
* @author: zhang jing
* @date: 2024/7/17 9:29
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询会员推荐伞下第一层会员
**/
List<PlaceFrameQueryVO> parentMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 查询本期推荐伞下第一层会员
* @author: zhang jing
* @date: 2024/7/24 9:33
* @param: [pfq]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO>
* 查询本期推荐伞下第一层会员
**/
List<PlaceFrameQueryVO> parentBefMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 校验会员是否在某会员安置伞下
* @author: zhang jing
* @date: 2024/7/22 14:23
* @param: [pfq]
* @return: com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO
* 校验会员是否在某会员安置伞下
**/
PlaceFrameQueryVO checkPlaceMemberQuery(PlaceFrameQueryVO pfq);
/**
* @description: 校验会员是否在某会员推荐线
* @author: zhang jing
* @date: 2024/7/22 14:23
* @param: [pfq]
* @return: com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO
* 校验会员是否在某会员推荐线
**/
PlaceFrameQueryVO checkParentMemberQuery(PlaceFrameQueryVO pfq);

13
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java
View File

@ -2,27 +2,16 @@ package com.hzs.member.achieve.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve;
import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt;
import com.hzs.member.achieve.controller.vo.MemberMonthAchieveVO;
import com.hzs.member.achieve.controller.vo.ParentAchieveVO;
import com.hzs.member.achieve.controller.vo.RealPerformanceVo;
import com.hzs.member.achieve.vo.CuMemberMonthVo;
import java.util.Date;
import java.util.List;
/**
* <p>
* 会员月数据 服务类
* </p>
*
* @author hzs
* @since 2023-06-06
*/
public interface ICuMemberMonthAchieveService extends IService<CuMemberMonthAchieve> {
/**
* 查询会员真实业绩
*
* @param pkMember
* @param achieveTable
* @return

545
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

28
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java
View File

@ -1,52 +1,28 @@
package com.hzs.member.achieve.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.enums.HonorWallType;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt;
import com.hzs.common.domain.member.honor.CuHonorWall;
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
import com.hzs.member.achieve.controller.vo.ParentAchieveVO;
import com.hzs.member.achieve.controller.vo.RealPerformanceVo;
import com.hzs.member.achieve.mapper.CuMemberMonthAchieveMapper;
import com.hzs.member.achieve.service.ICuMemberAchieveService;
import com.hzs.member.achieve.service.ICuMemberMonthAchieveService;
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.member.achieve.service.ICuMemberTreeService;
import com.hzs.member.achieve.vo.CuMemberMonthVo;
import com.hzs.member.base.service.ICuHonorWallService;
import com.hzs.member.base.service.ICuMemberHonorWallService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/**
* <p>
* 会员月数据 服务实现类
* </p>
*
* @author hzs
* @since 2023-06-06
*/
@Service
public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAchieveMapper, CuMemberMonthAchieve> implements ICuMemberMonthAchieveService {
/**
* 查询会员真实业绩
*
* @param pkMember
* @param achieveTable
* @return
*/
@Override
public RealPerformanceVo queryCuMemberMonthAchieveInfo(Long pkMember, String achieveTable) {
return baseMapper.queryCuMemberMonthAchieveInfo(pkMember,achieveTable);
return baseMapper.queryCuMemberMonthAchieveInfo(pkMember, achieveTable);
}
}

16
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberMonthVo.java
View File

@ -1,23 +1,9 @@
package com.hzs.member.achieve.vo;/**
* @Description:
* @Author: yuhui
* @Time: 2023/8/30 10:41
* @Classname: CuMemberMonthVo
* @PackageName: com.hzs.member.achieve.vo
*/
package com.hzs.member.achieve.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.member.achieve.vo
*@Author: yh
*@CreateTime: 2023-08-30 10:41
*@Description: TODO
*@Version: 1.0
*/
@Data
public class CuMemberMonthVo {

33
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java
View File

@ -16,12 +16,6 @@ import java.util.List;
/**
* 会员首页
*
* @Description:
* @Author: ljc
* @Time: 2023/5/4 21:06
* @Classname: ApiHomePageController
* @Package_name: com.hzs.member.base.controller.api
*/
@Slf4j
@RequestMapping("/api/member")
@ -29,11 +23,9 @@ import java.util.List;
public class ApiHomePageController {
@Autowired
ICuMemberAchieveService cuMemberAchieveService;
private ICuMemberAchieveService iCuMemberAchieveService;
@Autowired
ICuMemberService cuMemberService;
private ICuMemberService iCuMemberService;
/**
* 会员的安置部门
@ -42,7 +34,7 @@ public class ApiHomePageController {
*/
@GetMapping("/place-dept")
public AjaxResult placeDept(Integer placeDept) {
return AjaxResult.success(cuMemberService.selectMemberPlaceDeptByPkMember(SecurityUtils.getUserId(), placeDept));
return AjaxResult.success(iCuMemberService.selectMemberPlaceDeptByPkMember(SecurityUtils.getUserId(), placeDept));
}
/**
@ -56,9 +48,13 @@ public class ApiHomePageController {
if (null == placeDept) {
placeDept = 1;
}
CuMemberNewAddAchieveVO newAddAchieveVO = CuMemberNewAddAchieveVO.builder().dayType(dayType)
.pkMember(SecurityUtils.getUserId()).pkCountry(SecurityUtils.getPkCountry()).placeDept(placeDept).build();
List<CuMemberNewAddAchieveVO> cuMemberNewAddAchieveVOList = cuMemberAchieveService.selectNewAddAchieve(newAddAchieveVO);
CuMemberNewAddAchieveVO newAddAchieveVO = CuMemberNewAddAchieveVO.builder()
.dayType(dayType)
.pkMember(SecurityUtils.getUserId())
.pkCountry(SecurityUtils.getPkCountry())
.placeDept(placeDept)
.build();
List<CuMemberNewAddAchieveVO> cuMemberNewAddAchieveVOList = iCuMemberAchieveService.selectNewAddAchieve(newAddAchieveVO);
return AjaxResult.success(cuMemberNewAddAchieveVOList);
}
@ -69,7 +65,7 @@ public class ApiHomePageController {
*/
@GetMapping("/index-awards")
public AjaxResult selectAwards() {
return AjaxResult.success(cuMemberAchieveService.selectAwardsByPkMember(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
return AjaxResult.success(iCuMemberAchieveService.selectAwardsByPkMember(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
}
/**
@ -81,13 +77,12 @@ public class ApiHomePageController {
public AjaxResult selectAwardsFive(Integer placeDept) {
//查询部门的结算国
Long pkMember = SecurityUtils.getUserId();
List<CuMemberVO> cuMemberVOList = cuMemberService.selectMemberPlaceDeptByPkMember(pkMember, placeDept);
List<CuMemberVO> cuMemberVOList = iCuMemberService.selectMemberPlaceDeptByPkMember(pkMember, placeDept);
return AjaxResult.success(
cuMemberAchieveService.selectAwardsFiveByPkMember(pkMember, cuMemberVOList.get(0).getPkSettleCountry(), placeDept)
iCuMemberAchieveService.selectAwardsFiveByPkMember(pkMember, cuMemberVOList.get(0).getPkSettleCountry(), placeDept)
);
}
/**
* 会员荣誉奖衔
*
@ -95,7 +90,7 @@ public class ApiHomePageController {
*/
@GetMapping("/index-member-awards")
public AjaxResult selectMemberAwards(Integer pkAwards) {
return AjaxResult.success(cuMemberAchieveService.selectMemberAwards(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
return AjaxResult.success(iCuMemberAchieveService.selectMemberAwards(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
}
}

26
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
View File

@ -751,20 +751,6 @@
CONNECT BY pk_place_parent = PRIOR pk_id
</select>
<!--根据日期查询最新期数-->
<select id="mostNewPeriod" parameterType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO"
resultType="java.lang.Integer">
select max(PK_ID) from (
select s.PK_ID from cu_member_settle_period s
INNER JOIN ${achieveTableName} t on t.period=s.PK_ID
where s.del_flag = 0
and s.settle_date >= to_date(#{startDate}, 'yyyy-mm-dd')
and s.settle_date &lt; to_date(#{endDate}, 'yyyy-mm-dd')
)
</select>
<!--查询直推业绩-->
<select id="selectParentAchieve" parameterType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO"
resultType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO">
@ -834,15 +820,6 @@
) tt left join BD_GRADE bg on tt.pk_grade=bg.pk_id
</select>
<!--查询所有直推的人-->
<select id="allDirectPush" parameterType="com.hzs.member.achieve.controller.vo.ParentAchieveVO"
resultType="com.hzs.member.achieve.controller.vo.ParentAchieveVO">
SELECT t.pk_member,m.MEMBER_NAME
FROM ${treeTableNameEnd} t
INNER JOIN CU_MEMBER m on m.PK_ID=t.PK_MEMBER
where t.period = #{period}
and t.pk_parent= #{pkMember} ORDER BY PK_MEMBER
</select>
<!-- 查询前10直推业绩-->
<select id="parentCounAchieveTop" parameterType="com.hzs.member.achieve.controller.vo.ParentAchieveVO"
@ -1599,13 +1576,14 @@
<select id="selectNewAddAchieveByPeriod" resultType="com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO">
<foreach collection="achieve.achieveTableList" item="achieveTableName" open=" " separator=" union all " close=" ">
select replace('${achieveTableName}','CU_MEMBER_SETTLE_D','') periodNum, s.new_pv aNewPv
select replace('${achieveTableName}','CU_MEMBER_SETTLE_D','') periodNum, s.new_pv aNewPv
from ${achieveTableName} s
where s.pk_member = #{achieve.pkMember}
and s.place_dept = #{achieve.placeDept}
</foreach>
order by periodNum
</select>
<!-- 查询会员安置伞下第一层会员-->
<select id="placeMemberQuery" resultType="com.hzs.member.achieve.controller.vo.PlaceFrameQueryVO">
SELECT 1 lev,

106
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml
View File

@ -4,90 +4,34 @@
<!-- 通用查询映射结果 -->
<resultMap id="CuMemberMonthAchieve" type="com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt">
<id column="PK_ID" property="pkId" />
<result column="DEL_FLAG" property="delFlag" />
<result column="CREATION_TIME" property="creationTime" />
<result column="MODIFIED_TIME" property="modifiedTime" />
<result column="PK_COUNTRY" property="pkCountry" />
<result column="PK_CREATOR" property="pkCreator" />
<result column="PK_MODIFIED" property="pkModified" />
<result column="PK_MEMBER" property="pkMember" />
<result column="PERIOD" property="period" />
<result column="SETTLE_MONTH" property="settleMonth" />
<result column="RECOMMEND_MONEY" property="recommendMoney" />
<result column="RECOMMEND_ACHIEVE" property="recommendAchieve" />
<result column="REPURCHASE_MONEY" property="repurchaseMoney" />
<result column="REPURCHASE_ACHIEVE" property="repurchaseAchieve" />
<result column="WALL_TYPE" property="wallType" />
<result column="MONEY" property="money" />
<result column="MEMBER_NAME" property="memberName" />
<result column="HEAD_PATH" property="headPath" />
<id column="PK_ID" property="pkId"/>
<result column="DEL_FLAG" property="delFlag"/>
<result column="CREATION_TIME" property="creationTime"/>
<result column="MODIFIED_TIME" property="modifiedTime"/>
<result column="PK_COUNTRY" property="pkCountry"/>
<result column="PK_CREATOR" property="pkCreator"/>
<result column="PK_MODIFIED" property="pkModified"/>
<result column="PK_MEMBER" property="pkMember"/>
<result column="PERIOD" property="period"/>
<result column="SETTLE_MONTH" property="settleMonth"/>
<result column="RECOMMEND_MONEY" property="recommendMoney"/>
<result column="RECOMMEND_ACHIEVE" property="recommendAchieve"/>
<result column="REPURCHASE_MONEY" property="repurchaseMoney"/>
<result column="REPURCHASE_ACHIEVE" property="repurchaseAchieve"/>
<result column="WALL_TYPE" property="wallType"/>
<result column="MONEY" property="money"/>
<result column="MEMBER_NAME" property="memberName"/>
<result column="HEAD_PATH" property="headPath"/>
</resultMap>
<insert id="insertCuMemberMonthAchieve">
merge into CU_MEMBER_MONTH_ACHIEVE a
using(
select pk_member,#{period} period,RECOMMEND_MONEY,RECOMMEND_ACHIEVE,REPURCHASE_MONEY,REPURCHASE_ACHIEVE,pk_country from(
select pk_member,pk_country,sum(REGISTER_NEW_AMOUNT+UPGRADE_NEW_AMOUNT) RECOMMEND_MONEY,sum(REGISTER_NEW_PV) RECOMMEND_ACHIEVE,
sum(REPURCHASE_NEW_AMOUNT+HI_FUN_NEW_AMOUNT+MALL_NEW_AMOUNT) REPURCHASE_MONEY,sum(REPURCHASE_PV) REPURCHASE_ACHIEVE from ${tableName}
where REGISTER_NEW_AMOUNT+UPGRADE_NEW_AMOUNT>0 or REPURCHASE_NEW_AMOUNT>0
group by pk_member,pk_country)
) b
on (a.pk_member=b.pk_member and a.period=b.period)
when matched then
update set a.RECOMMEND_MONEY = b.RECOMMEND_MONEY, a.RECOMMEND_ACHIEVE=b.RECOMMEND_ACHIEVE,
a.REPURCHASE_MONEY=b.REPURCHASE_MONEY,a.REPURCHASE_ACHIEVE=b.REPURCHASE_ACHIEVE
WHEN NOT MATCHED THEN
insert(PK_ID, PK_MEMBER, PERIOD, SETTLE_MONTH, RECOMMEND_MONEY,RECOMMEND_ACHIEVE,REPURCHASE_MONEY,
REPURCHASE_ACHIEVE,PK_COUNTRY,PK_CREATOR)
values (CU_MEMBER_MONTH_ACHIEVE_SEQ.NEXTVAL,
b.pk_member,b.period,#{month},b.RECOMMEND_MONEY,b.RECOMMEND_ACHIEVE,b.REPURCHASE_MONEY,
b.REPURCHASE_ACHIEVE,b.PK_COUNTRY,1)
</insert>
<select id="queryCuMemberMonthAchieveByDate" resultMap="CuMemberMonthAchieve">
select * from(
select * from (
select pk_member,pk_country,${recommend} wall_type,sum(recommend_money) money from CU_MEMBER_MONTH_ACHIEVE
where del_flag=0 and period >= #{startPeriod} and period &lt; #{endPeriod}
group by pk_member,pk_country
order by sum(recommend_money) desc
) where rownum &lt;= 3
) a
order by wall_type,a.money desc
</select>
<select id="queryCuMemberMonthAchieveRecommend" resultMap="CuMemberMonthAchieve">
select rownum rank, nvl(cu.nick_name, cu.member_name) member_name, cu.HEAD_PATH,a.money from (
select pk_member,sum(recommend_money) money from CU_MEMBER_MONTH_ACHIEVE
where del_flag = 0 and pk_country= #{pkCountry}
and period between #{startPeriod} and #{endPeriod}
group by pk_member
order by sum(recommend_money) desc) a
inner join cu_member cu
on a.pk_member=cu.pk_id
where rownum &lt;= 3
</select>
<select id="queryCuMemberMonthAchieveRepurchase" resultMap="CuMemberMonthAchieve">
select rownum rank, nvl(cu.nick_name, cu.member_name) member_name, cu.head_path,a.money from (
select pk_member,sum(repurchase_money) money from CU_MEMBER_MONTH_ACHIEVE
where del_flag = 0 and pk_country=#{pkCountry}
and period between #{startPeriod} and #{endPeriod}
group by pk_member
order by sum(repurchase_money) desc) a
inner join cu_member cu
on a.pk_member=cu.pk_id
where rownum &lt;= 3
</select>
<select id="queryCuMemberMonthInfo" resultType="com.hzs.member.achieve.vo.CuMemberMonthVo">
select PK_MEMBER pkMember,PK_PARENT pkParent,PK_PLACE_PARENT pkPlaceParent,PLACE_DEPT placeDept,MEMBER_CODE memberCode,MEMBER_NAME memberName,
CUSTOMER_TYPE customerType, PHONE phone ,PK_GRADE pkGrade ,PK_AWARDS pkAwards,PK_TEAM_CODE pkTeamCode,PK_CENTER_CODE pkCenterCode,
PK_VERTEX pkVertex ,PK_SETTLE_COUNTRY pkSettleCountry ,A_SUM_PV aSumPv,B_SUM_PV bSumPv,REP_A_SUM_PV repASumPv, REP_B_SUM_PV repBSumPv,
REGISTER_PV registerPv, REPURCHASE_PV repurchasePv
from ${achieveTable} where PK_MEMBER = #{pkMember}
</select>
<select id="queryCuMemberMonthAchieveInfo" resultType="com.hzs.member.achieve.controller.vo.RealPerformanceVo">
select nvl(sum(A_NEW_PV),0) firstLeftPurchaseTotal,nvl(sum(B_NEW_PV),0) firstRightPurchaseTotal,nvl(sum(REP_A_NEW_PV),0) firstLeftRepurchaseTotal,nvl(sum(REP_B_NEW_PV),0) firstRightRepurchaseTotal
from ${achieveTable} WHERE pk_member=#{pkMember}
select nvl(sum(A_NEW_PV), 0) firstLeftPurchaseTotal,
nvl(sum(B_NEW_PV), 0) firstRightPurchaseTotal,
nvl(sum(REP_A_NEW_PV), 0) firstLeftRepurchaseTotal,
nvl(sum(REP_B_NEW_PV), 0) firstRightRepurchaseTotal
from ${achieveTable}
WHERE pk_member = #{pkMember}
</select>
</mapper>