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 14:09:59 +08:00
parent 726ce0cb2c
commit fc62e263e5
7 changed files with 217 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java
View File

@ -184,4 +184,12 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
@Param("pkMember") Long pkMember, @Param("pkMember") Long pkMember,
@Param("monthTable") String monthTable); @Param("monthTable") String monthTable);
/**
* 查询会员当天业绩
*
* @param pkMember
* @return
*/
CuMemberAwardsUnderVO queryMemberTodayPv(@Param("pkMember") Long pkMember);
} }

11
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java
View File

@ -5,7 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberTree;
import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.member.achieve.param.MemberParentCountParam; import com.hzs.member.achieve.param.MemberParentCountParam;
import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO; import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -150,7 +149,7 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
* @param memberIds * @param memberIds
* @return * @return
*/ */
List<MemberParentCountParam> queryByMemberParentSettleSumPv(@Param("settleTableName") String settleTableName, @Param("memberIds") List<Long> memberIds); List<MemberParentCountParam> queryByMemberParentSettleSumPv(String settleTableName, List<Long> memberIds);
/** /**
* 查询会员显示业绩 * 查询会员显示业绩
@ -162,4 +161,12 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
*/ */
CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable); CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable);
/**
* 查询会员当天业绩
*
* @param pkMember
* @return
*/
CuMemberAwardsUnderVO queryMemberTodayPv(Long pkMember);
} }

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

@ -367,16 +367,24 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
// 查询会员首页业绩显示 // 查询会员首页业绩显示
CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable); CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable);
if (null != awardsUnderVO) { if (null != awardsUnderVO) {
// 当日新増PV
CuMemberAwardsUnderVO todayPv = iCuMemberTreeService.queryMemberTodayPv(pkMember);
BigDecimal big10000 = new BigDecimal("10000");
return CuMemberAwardsUnderVO.builder() return CuMemberAwardsUnderVO.builder()
.aNewPv(null != awardsUnderVO.getANewPv() ? awardsUnderVO.getANewPv() : BigDecimal.ZERO) .aNewPv(null != awardsUnderVO.getANewPv() ? awardsUnderVO.getANewPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR) : BigDecimal.ZERO)
.bNewPv(null != awardsUnderVO.getBNewPv() ? awardsUnderVO.getBNewPv() : BigDecimal.ZERO) .bNewPv(null != awardsUnderVO.getBNewPv() ? awardsUnderVO.getBNewPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR) : BigDecimal.ZERO)
.aMonthPv(null != awardsUnderVO.getAMonthPv() ? awardsUnderVO.getAMonthPv() : BigDecimal.ZERO) .aMonthPv(null != awardsUnderVO.getAMonthPv() ? todayPv.getANewPv().add(awardsUnderVO.getAMonthPv()).divide(big10000, 2, BigDecimal.ROUND_FLOOR) : todayPv.getANewPv())
.bMonthPv(null != awardsUnderVO.getBMonthPv() ? awardsUnderVO.getBMonthPv() : BigDecimal.ZERO) .bMonthPv(null != awardsUnderVO.getBMonthPv() ? todayPv.getBNewPv().add(awardsUnderVO.getBMonthPv()).divide(big10000, 2, BigDecimal.ROUND_FLOOR) : todayPv.getBNewPv())
.aSumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv() : BigDecimal.ZERO) .aSumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR) : BigDecimal.ZERO)
.bSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv() : BigDecimal.ZERO) .bSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR) : BigDecimal.ZERO)
.build(); .build();
} }
} }
// TODO 当月业绩，需要加上今天的新増业绩
return CuMemberAwardsUnderVO.builder() return CuMemberAwardsUnderVO.builder()
.aNewPv(BigDecimal.ZERO) .aNewPv(BigDecimal.ZERO)
.bNewPv(BigDecimal.ZERO) .bNewPv(BigDecimal.ZERO)

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

@ -60,7 +60,6 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
*/ */
@Override @Override
public List<CuMemberSettleExt> queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List<Integer> vertexIdList) { public List<CuMemberSettleExt> queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List<Integer> vertexIdList) {
long b = System.currentTimeMillis();
List<CuMemberSettleExt> memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); List<CuMemberSettleExt> memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
List<Long> ids = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList()); List<Long> ids = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList());
// 查询会员直推人数 // 查询会员直推人数
@ -244,4 +243,9 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
return baseMapper.queryMemberPv(settleTable, pkMember, monthTable); return baseMapper.queryMemberPv(settleTable, pkMember, monthTable);
} }
@Override
public CuMemberAwardsUnderVO queryMemberTodayPv(Long pkMember) {
return baseMapper.queryMemberTodayPv(pkMember);
}
} }

187
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
View File

@ -25,7 +25,6 @@ import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.BdCountry;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.service.ITransactionCommonService;
import com.hzs.common.util.TransactionUtils; import com.hzs.common.util.TransactionUtils;
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.member.achieve.service.ICuMemberTreeService; import com.hzs.member.achieve.service.ICuMemberTreeService;
@ -49,37 +48,28 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/**
* @Description:
* @Author: yuhui
* @Time: 2023/2/6 16:45
* @Classname: MemberStructureController
* @PackageName: com.hzs.member.memberStructure.controller.api
*/
@RestController @RestController
@RequestMapping("/api/member-structure") @RequestMapping("/api/member-structure")
public class ApiMemberStructureController extends BaseController { public class ApiMemberStructureController extends BaseController {
@Autowired @Autowired
private ITransactionCommonService iTransactionCommonService; private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired @Autowired
private ICuMemberSettlePeriodService memberSettlePeriodService; private ICuMemberTreeService iCuMemberTreeService;
@Autowired @Autowired
private ICuMemberTreeService memberTreeService; private ICuMemberService iCuMemberService;
@Autowired
private ICuMemberService memberService;
@DubboReference @DubboReference
IGradeServiceApi gradeServiceApi; IGradeServiceApi iGradeServiceApi;
@DubboReference @DubboReference
IUserServiceApi iUserServiceApi; IUserServiceApi iUserServiceApi;
@DubboReference @DubboReference
ICountryServiceApi countryServiceApi; ICountryServiceApi iCountryServiceApi;
/** /**
* 安置架构网体 * 安置架构网体
*/ */
@GetMapping("/az-framework") // @GetMapping("/az-framework")
public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) {
if (level == null) { if (level == null) {
level = 7; level = 7;
@ -92,17 +82,16 @@ public class ApiMemberStructureController extends BaseController {
date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date); date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date);
} }
String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
// Integer period = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time).getPkId();
Long pkMember; Long pkMember;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = memberService.getMember(memberCode); CuMember member = iCuMemberService.getMember(memberCode);
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS));
} }
// 查询编号是否在登录用户伞下 // 查询编号是否在登录用户伞下
List<CuMemberExt> memberList = memberService.queryPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); List<CuMemberExt> memberList = iCuMemberService.queryPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode);
if (CollectionUtil.isNotEmpty(memberList)) { if (CollectionUtil.isNotEmpty(memberList)) {
pkMember = member.getPkId(); pkMember = member.getPkId();
} else { } else {
@ -110,18 +99,18 @@ public class ApiMemberStructureController extends BaseController {
pkMember = SecurityUtils.getUserId(); pkMember = SecurityUtils.getUserId();
} }
} else { } else {
CuMember member = memberService.getMember(SecurityUtils.getMemberCode()); CuMember member = iCuMemberService.getMember(SecurityUtils.getMemberCode());
pkMember = member.getPkId(); pkMember = member.getPkId();
} }
Integer period = null; Integer period = null;
Date settleDate = null; Date settleDate = null;
if (memberSettlePeriodId != null) { if (memberSettlePeriodId != null) {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} else { } else {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
@ -135,27 +124,26 @@ public class ApiMemberStructureController extends BaseController {
String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period;
// 查询所有用户表数据 id // 查询所有用户表数据 id
// 查询秒结 表 如果 秒结表 没有则去 历史表 // 查询秒结 表 如果 秒结表 没有则去 历史表
Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
List<CuMemberSettleExt> cuMemberSettleExts; List<CuMemberSettleExt> cuMemberSettleExts;
// 查询今日会员表是否有值 // 查询今日会员表是否有值
Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember);
if (treeMemberCount > 0) { if (treeMemberCount > 0) {
//表格存在 //表格存在
cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList);
} else { } else {
DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
} }
settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList);
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
@ -163,57 +151,40 @@ public class ApiMemberStructureController extends BaseController {
// 添加自身 // 添加自身
cuMemberSettleExts.add(memberSettleExt); cuMemberSettleExts.add(memberSettleExt);
List<CuMemberSettleExt> cuMemberSettleExtList = cuMemberSettleExts.stream().map(a -> { List<CuMemberSettleExt> cuMemberSettleExtList = cuMemberSettleExts.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList());
a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt);
return a;
}).collect(Collectors.toList());
List<Tree<String>> build = memberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
// if (type != EStructureType.JG4.getIntValue()){ R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
List<Tree<String>> trees = setTreeList(build, level, allCountryData); List<Tree<String>> trees = setTreeList(build, level, allCountryData);
return AjaxResult.success(trees); return AjaxResult.success(trees);
// }else {
// return AjaxResult.success(build);
// }
} }
} else { } else {
// 查询 历史 // 查询 历史
String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
// 表示表格存在 // 表示表格存在
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
// List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level);
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<CuMemberSettleExt> cuMemberSettleExtList = list.stream().map(a -> { List<CuMemberSettleExt> cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList());
a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt);
return a;
}).collect(Collectors.toList());
List<Tree<String>> build = memberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
// if (type != EStructureType.JG4.getIntValue()){ R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
List<Tree<String>> trees = setTreeList(build, level, allCountryData); List<Tree<String>> trees = setTreeList(build, level, allCountryData);
return AjaxResult.success(trees); return AjaxResult.success(trees);
// }else {
// return AjaxResult.success(build);
// }
} }
} }
return AjaxResult.success(); return AjaxResult.success();
} }
@ -221,10 +192,7 @@ public class ApiMemberStructureController extends BaseController {
* @param build * @param build
* @return * @return
*/ */
// 设置虚拟节点
public List<Tree<String>> setTreeList(List<Tree<String>> build, Integer numberOfPlies, Map<Integer, BdCountry> allCountryData) { public List<Tree<String>> setTreeList(List<Tree<String>> build, Integer numberOfPlies, Map<Integer, BdCountry> allCountryData) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1(); String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1();
String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2(); String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2();
@ -245,8 +213,6 @@ public class ApiMemberStructureController extends BaseController {
emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); emptyNode1.putExtra("settleCountryUrl2", nationalFlag2);
emptyNode1.putExtra("countryUrl", nationalFlag1); emptyNode1.putExtra("countryUrl", nationalFlag1);
emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.putExtra("countryUrl2", nationalFlag2);
// emptyNode1.setChildren(setChildren(level,emptyNode1.getId()));
stringTree.getChildren().add(emptyNode1); stringTree.getChildren().add(emptyNode1);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
@ -262,7 +228,6 @@ public class ApiMemberStructureController extends BaseController {
emptyNode2.putExtra("countryUrl", nationalFlag1); emptyNode2.putExtra("countryUrl", nationalFlag1);
emptyNode2.putExtra("countryUrl2", nationalFlag2); emptyNode2.putExtra("countryUrl2", nationalFlag2);
emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni);
// emptyNode2.setChildren(setChildren(level,emptyNode2.getId()));
stringTree.getChildren().add(emptyNode2); stringTree.getChildren().add(emptyNode2);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
} else if (stringTree.getChildren().size() == 1) { } else if (stringTree.getChildren().size() == 1) {
@ -281,10 +246,8 @@ public class ApiMemberStructureController extends BaseController {
emptyNode.setParentId(stringTree.getId()); emptyNode.setParentId(stringTree.getId());
emptyNode.setId(RandomUtil.randomNumbers(3)); emptyNode.setId(RandomUtil.randomNumbers(3));
emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni);
// emptyNode.setChildren(setChildren(level,emptyNode.getId()));
stringTree.getChildren().add(emptyNode); stringTree.getChildren().add(emptyNode);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
} else { } else {
emptyNode.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue());
emptyNode.putExtra("level", level + 1); emptyNode.putExtra("level", level + 1);
@ -297,7 +260,6 @@ public class ApiMemberStructureController extends BaseController {
emptyNode.putExtra("settleCountryUrl2", nationalFlag2); emptyNode.putExtra("settleCountryUrl2", nationalFlag2);
emptyNode.putExtra("countryUrl", nationalFlag1); emptyNode.putExtra("countryUrl", nationalFlag1);
emptyNode.putExtra("countryUrl2", nationalFlag2); emptyNode.putExtra("countryUrl2", nationalFlag2);
// emptyNode.setChildren(setChildren(level,emptyNode.getId()));
stringTree.getChildren().add(emptyNode); stringTree.getChildren().add(emptyNode);
List<Tree<String>> strTree = stringTree.getChildren(); List<Tree<String>> strTree = stringTree.getChildren();
List<Tree<String>> sortChildren = new ArrayList<>(); List<Tree<String>> sortChildren = new ArrayList<>();
@ -305,7 +267,6 @@ public class ApiMemberStructureController extends BaseController {
sortChildren.add(strTree.get(0)); sortChildren.add(strTree.get(0));
stringTree.setChildren(sortChildren); stringTree.setChildren(sortChildren);
setTreeList(sortChildren, numberOfPlies, allCountryData); setTreeList(sortChildren, numberOfPlies, allCountryData);
} }
} else { } else {
List<Tree<String>> children = stringTree.getChildren(); List<Tree<String>> children = stringTree.getChildren();
@ -324,7 +285,6 @@ public class ApiMemberStructureController extends BaseController {
} else { } else {
// 等于空 // 等于空
List<Tree<String>> children = new ArrayList<>(); List<Tree<String>> children = new ArrayList<>();
children = new ArrayList<>();
Tree<String> emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); Tree<String> emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5));
emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue());
emptyNode1.putExtra("level", level + 1); emptyNode1.putExtra("level", level + 1);
@ -337,10 +297,8 @@ public class ApiMemberStructureController extends BaseController {
emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.putExtra("countryUrl2", nationalFlag2);
emptyNode1.setParentId(stringTree.getId()); emptyNode1.setParentId(stringTree.getId());
emptyNode1.setId(RandomUtil.randomNumbers(3)); emptyNode1.setId(RandomUtil.randomNumbers(3));
// emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId()));
children.add(emptyNode1); children.add(emptyNode1);
Tree<String> emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); Tree<String> emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5));
emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue());
emptyNode2.putExtra("level", level + 1); emptyNode2.putExtra("level", level + 1);
@ -353,25 +311,22 @@ public class ApiMemberStructureController extends BaseController {
emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni);
emptyNode2.setParentId(stringTree.getId()); emptyNode2.setParentId(stringTree.getId());
emptyNode2.setId(RandomUtil.randomNumbers(3)); emptyNode2.setId(RandomUtil.randomNumbers(3));
// emptyNode2.setChildren(setChildren( level+1,emptyNode2.getId()));
children.add(emptyNode2); children.add(emptyNode2);
stringTree.setChildren(children); stringTree.setChildren(children);
setTreeList(children, numberOfPlies, allCountryData); setTreeList(children, numberOfPlies, allCountryData);
} }
} }
} }
return build; return build;
} }
private Integer defaultLevel = 5; private Integer defaultLevel = 5;
/** /**
* 推荐架构网体 * 推荐架构网体
*/ */
@GetMapping("/tj-framework") // @GetMapping("/tj-framework")
public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) { public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) {
Date date = DateUtils.currentDate(); Date date = DateUtils.currentDate();
if (DateUtils.getCurrentHour() < 2) { if (DateUtils.getCurrentHour() < 2) {
@ -384,13 +339,13 @@ public class ApiMemberStructureController extends BaseController {
List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList(); List<Integer> vertexIdList = userAuthorityDTO.getVertexIdList();
Long pkMember; Long pkMember;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = memberService.getMember(memberCode); CuMember member = iCuMemberService.getMember(memberCode);
if (member == null) { if (member == null) {
return AjaxResult.error("会员编号不存在"); return AjaxResult.error("会员编号不存在");
} }
// 查询编号是否在登录用户伞下 // 查询编号是否在登录用户伞下
if (!memberCode.equals(SecurityUtils.getMemberCode())) { if (!memberCode.equals(SecurityUtils.getMemberCode())) {
Long placeCount = memberService.checkPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); Long placeCount = iCuMemberService.checkPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode);
if (placeCount == 0) { if (placeCount == 0) {
// 如果查询编号不存在伞下 则直接查询订单为当前登录人的 // 如果查询编号不存在伞下 则直接查询订单为当前登录人的
pkMember = SecurityUtils.getUserId(); pkMember = SecurityUtils.getUserId();
@ -401,33 +356,31 @@ public class ApiMemberStructureController extends BaseController {
pkMember = SecurityUtils.getUserId(); pkMember = SecurityUtils.getUserId();
} }
} else { } else {
CuMember member = memberService.getMember(SecurityUtils.getMemberCode()); CuMember member = iCuMemberService.getMember(SecurityUtils.getMemberCode());
pkMember = member.getPkId(); pkMember = member.getPkId();
} }
Integer period = null; Integer period = null;
Date settleDate = null; Date settleDate = null;
if (memberSettlePeriodId != null) { if (memberSettlePeriodId != null) {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} else { } else {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} }
} }
// 查询当天 (秒结) // 查询当天 (秒结)
if (settleDate != null && if (settleDate != null &&
DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) {
// 查询所有用户表数据 id // 查询所有用户表数据 id
// 会员结算秒结表 // 会员结算秒结表
String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period;
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
//表格存在 //表格存在
if (level == null) { if (level == null) {
@ -435,37 +388,30 @@ public class ApiMemberStructureController extends BaseController {
} }
List<CuMemberSettleExt> cuMemberSettleExts; List<CuMemberSettleExt> cuMemberSettleExts;
// 查询今日会员表是否有值 // 查询今日会员表是否有值
Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember);
if (treeMemberCount > 0) { if (treeMemberCount > 0) {
//表格存在 //表格存在
cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
} else { } else {
DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
} }
settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
} }
// 查询会员是否在秒结表中有值
// List<CuMemberSettleExt> cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level);
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
// 添加自身 // 添加自身
cuMemberSettleExts.add(memberSettleExt); cuMemberSettleExts.add(memberSettleExt);
List<CuMemberSettleExt> cuMemberSettleExtList = cuMemberSettleExts.stream().map(a -> { List<CuMemberSettleExt> cuMemberSettleExtList = cuMemberSettleExts.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList());
a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); List<Tree<String>> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true);
return a;
}).collect(Collectors.toList());
List<Tree<String>> build = memberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} else { } else {
@ -478,65 +424,56 @@ public class ApiMemberStructureController extends BaseController {
settleTableName = null; settleTableName = null;
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<CuMemberSettleExt> cuMemberSettleExtList = list.stream().map(a -> { List<CuMemberSettleExt> cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList());
a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); List<Tree<String>> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true);
return a;
}).collect(Collectors.toList());
List<Tree<String>> build = memberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
return AjaxResult.success(setTreeList(build, level, allCountryData)); return AjaxResult.success(setTreeList(build, level, allCountryData));
} }
} else { } else {
if (level == null) { if (level == null) {
level = defaultLevel; level = defaultLevel;
} }
DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
} }
// 查询 历史 // 查询 历史
String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber == null) { if (tableNumber == null) {
// 表示表格存在 // 表示表格存在
settleTableName = null; settleTableName = null;
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember);
if (StringUtils.isNotBlank(memberSettleExt.getParentMemberCode()) && MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (StringUtils.isNotBlank(memberSettleExt.getParentMemberCode()) && MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
// List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<CuMemberSettleExt> cuMemberSettleExtList = list.stream().map(a -> { List<CuMemberSettleExt> cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList());
a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); List<Tree<String>> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, false);
return a;
}).collect(Collectors.toList());
List<Tree<String>> build = memberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, false);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} }
} }
/** /**
@ -544,7 +481,7 @@ public class ApiMemberStructureController extends BaseController {
* *
* @return * @return
*/ */
@GetMapping("get-member-settle-period") @GetMapping("/get-member-settle-period")
public AjaxResult getMemberSettlePeriod() { public AjaxResult getMemberSettlePeriod() {
// 查询最近一月的数据 // 查询最近一月的数据
DateTime dateTime = DateUtil.lastMonth(); DateTime dateTime = DateUtil.lastMonth();
@ -555,7 +492,7 @@ public class ApiMemberStructureController extends BaseController {
date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date); date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date);
} }
queryWrapper.between("SETTLE_DATE", dateTime, date); queryWrapper.between("SETTLE_DATE", dateTime, date);
List<CuMemberSettlePeriod> list = memberSettlePeriodService.list(queryWrapper); List<CuMemberSettlePeriod> list = iCuMemberSettlePeriodService.list(queryWrapper);
List<CuMemberSettlePeriodVo> resultList = new ArrayList<>(); List<CuMemberSettlePeriodVo> resultList = new ArrayList<>();
for (CuMemberSettlePeriod cuMemberSettlePeriod : list) { for (CuMemberSettlePeriod cuMemberSettlePeriod : list) {
CuMemberSettlePeriodVo cuMemberSettlePeriodVo = BeanUtil.copyProperties(cuMemberSettlePeriod, CuMemberSettlePeriodVo.class); CuMemberSettlePeriodVo cuMemberSettlePeriodVo = BeanUtil.copyProperties(cuMemberSettlePeriod, CuMemberSettlePeriodVo.class);
@ -575,42 +512,36 @@ public class ApiMemberStructureController extends BaseController {
* *
* @return * @return
*/ */
@GetMapping("get-avatar-info") @GetMapping("/get-avatar-info")
public AjaxResult getAvatarUrl() { public AjaxResult getAvatarUrl() {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
//R<List<GradeDTO>> list = gradeServiceApi.queryGradeConfigByCondition(user.getDataCountry());
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EGrade.values());
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE);
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
// 虚拟 // 虚拟
JSONObject other = new JSONObject(); JSONObject other = new JSONObject();
other.put("name", transactionMap.get(EnumsPrefixConstants.ENU_CAT + Math.abs(EGrade.VIRTUALLY.getIndex()))); other.put("name", ECategory.getLabelByValue(Math.abs(EGrade.VIRTUALLY.getIndex())));
other.put("value", MemberFrameworkConstants.xuni); other.put("value", MemberFrameworkConstants.xuni);
array.add(other); array.add(other);
// 已注销 // 已注销
JSONObject zxOther = new JSONObject(); JSONObject zxOther = new JSONObject();
//transactionMap.get(EGrade.LOGGED_OUT) zxOther.put("name", ECategory.getLabelByValue(Math.abs(EGrade.LOGGED_OUT.getIndex())));
zxOther.put("name", transactionMap.get(EnumsPrefixConstants.ENU_CAT + Math.abs(EGrade.LOGGED_OUT.getIndex())));
zxOther.put("value", MemberFrameworkConstants.LOG_OFF); zxOther.put("value", MemberFrameworkConstants.LOG_OFF);
array.add(zxOther); array.add(zxOther);
// 待激活 非中国 // 待激活 非中国
if (!SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { if (!SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
JSONObject djhOther = new JSONObject(); JSONObject djhOther = new JSONObject();
djhOther.put("name", transactionMap.get(EnumsPrefixConstants.ENU_CAT + Math.abs(EGrade.DEAD_POINT.getIndex()))); djhOther.put("name", ECategory.getLabelByValue(Math.abs(EGrade.DEAD_POINT.getIndex())));
djhOther.put("value", MemberFrameworkConstants.toBeActivated); djhOther.put("value", MemberFrameworkConstants.toBeActivated);
array.add(djhOther); array.add(djhOther);
} }
R<List<GradeDTO>> list = gradeServiceApi.selectGradeAll(pkCountry); R<List<GradeDTO>> list = iGradeServiceApi.selectGradeAll(pkCountry);
for (GradeDTO date : list.getData()) { for (GradeDTO date : list.getData()) {
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();
js.put("name", transactionMap1.get(date.getPkTransaction())); js.put("name", date.getGradeName());
js.put("value", date.getIcon()); js.put("value", date.getIcon());
array.add(js); array.add(js);
} }
return AjaxResult.success(array); return AjaxResult.success(array);
} }
} }

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

@ -29,7 +29,6 @@ import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.BdCountry;
import com.hzs.common.security.service.UserTokenService;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.util.TransactionUtils; import com.hzs.common.util.TransactionUtils;
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
@ -40,7 +39,6 @@ import com.hzs.system.base.ICountryServiceApi;
import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.IGradeServiceApi;
import com.hzs.system.config.dto.GradeDTO; import com.hzs.system.config.dto.GradeDTO;
import com.hzs.system.sys.IUserServiceApi; import com.hzs.system.sys.IUserServiceApi;
import com.hzs.system.sys.dto.LoginUser;
import com.hzs.system.sys.dto.UserAuthorityDTO; import com.hzs.system.sys.dto.UserAuthorityDTO;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -55,8 +53,6 @@ import java.util.*;
@RequestMapping("/manage/member-structure") @RequestMapping("/manage/member-structure")
public class MemberStructureController extends BaseController { public class MemberStructureController extends BaseController {
@Autowired
private UserTokenService userTokenService;
@Autowired @Autowired
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired @Autowired
@ -158,7 +154,6 @@ public class MemberStructureController extends BaseController {
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate();
} }
settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList);
@ -173,14 +168,10 @@ public class MemberStructureController extends BaseController {
cuMemberSettleExts.add(memberSettleExt); cuMemberSettleExts.add(memberSettleExt);
List<Tree<String>> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
// if (type != EStructureType.JG4.getIntValue()){
R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
List<Tree<String>> trees = setTreeList(build, level, allCountryData); List<Tree<String>> trees = setTreeList(build, level, allCountryData);
return AjaxResult.success(trees); return AjaxResult.success(trees);
// }else {
// return AjaxResult.success(build);
// }
} else { } else {
// 查询表格是否存在 // 查询表格是否存在
tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
@ -199,13 +190,9 @@ public class MemberStructureController extends BaseController {
list.add(memberSettleExt); list.add(memberSettleExt);
List<Tree<String>> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
// if (type != EStructureType.JG4.getIntValue()){
R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
return AjaxResult.success(setTreeList(build, level, allCountryData)); return AjaxResult.success(setTreeList(build, level, allCountryData));
// }else {
// return AjaxResult.success(build);
// }
} }
} else { } else {
// 查询 历史 // 查询 历史
@ -220,7 +207,6 @@ public class MemberStructureController extends BaseController {
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
// List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level);
List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
@ -231,16 +217,9 @@ public class MemberStructureController extends BaseController {
return AjaxResult.success(setTreeList(build, level, allCountryData)); return AjaxResult.success(setTreeList(build, level, allCountryData));
} }
} }
return AjaxResult.success(); return AjaxResult.success();
} }
/**
* @param build
* @return
*/
// 设置虚拟节点
public List<Tree<String>> setTreeList(List<Tree<String>> build, Integer numberOfPlies, Map<Integer, BdCountry> allCountryData) { public List<Tree<String>> setTreeList(List<Tree<String>> build, Integer numberOfPlies, Map<Integer, BdCountry> allCountryData) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1(); String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1();
@ -262,7 +241,6 @@ public class MemberStructureController extends BaseController {
emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); emptyNode1.putExtra("settleCountryUrl2", nationalFlag2);
emptyNode1.putExtra("countryUrl", nationalFlag1); emptyNode1.putExtra("countryUrl", nationalFlag1);
emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.putExtra("countryUrl2", nationalFlag2);
// emptyNode1.setChildren(setChildren(level,emptyNode1.getId()));
stringTree.getChildren().add(emptyNode1); stringTree.getChildren().add(emptyNode1);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
@ -278,7 +256,6 @@ public class MemberStructureController extends BaseController {
emptyNode2.putExtra("countryUrl2", nationalFlag2); emptyNode2.putExtra("countryUrl2", nationalFlag2);
emptyNode2.setId(RandomUtil.randomNumbers(3)); emptyNode2.setId(RandomUtil.randomNumbers(3));
emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni);
// emptyNode2.setChildren(setChildren(level,emptyNode2.getId()));
stringTree.getChildren().add(emptyNode2); stringTree.getChildren().add(emptyNode2);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
} else if (stringTree.getChildren().size() == 1) { } else if (stringTree.getChildren().size() == 1) {
@ -297,7 +274,6 @@ public class MemberStructureController extends BaseController {
emptyNode.putExtra("settleCountryUrl2", nationalFlag2); emptyNode.putExtra("settleCountryUrl2", nationalFlag2);
emptyNode.putExtra("countryUrl", nationalFlag1); emptyNode.putExtra("countryUrl", nationalFlag1);
emptyNode.putExtra("countryUrl2", nationalFlag2); emptyNode.putExtra("countryUrl2", nationalFlag2);
// emptyNode.setChildren(setChildren(level,emptyNode.getId()));
stringTree.getChildren().add(emptyNode); stringTree.getChildren().add(emptyNode);
setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData);
@ -313,7 +289,6 @@ public class MemberStructureController extends BaseController {
emptyNode.putExtra("settleCountryUrl2", nationalFlag2); emptyNode.putExtra("settleCountryUrl2", nationalFlag2);
emptyNode.putExtra("countryUrl", nationalFlag1); emptyNode.putExtra("countryUrl", nationalFlag1);
emptyNode.putExtra("countryUrl2", nationalFlag2); emptyNode.putExtra("countryUrl2", nationalFlag2);
// emptyNode.setChildren(setChildren(level,emptyNode.getId()));
stringTree.getChildren().add(emptyNode); stringTree.getChildren().add(emptyNode);
List<Tree<String>> strTree = stringTree.getChildren(); List<Tree<String>> strTree = stringTree.getChildren();
List<Tree<String>> sortChildren = new ArrayList<>(); List<Tree<String>> sortChildren = new ArrayList<>();
@ -321,7 +296,6 @@ public class MemberStructureController extends BaseController {
sortChildren.add(strTree.get(0)); sortChildren.add(strTree.get(0));
stringTree.setChildren(sortChildren); stringTree.setChildren(sortChildren);
setTreeList(sortChildren, numberOfPlies, allCountryData); setTreeList(sortChildren, numberOfPlies, allCountryData);
} }
} else { } else {
List<Tree<String>> children = stringTree.getChildren(); List<Tree<String>> children = stringTree.getChildren();
@ -352,7 +326,6 @@ public class MemberStructureController extends BaseController {
emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.putExtra("countryUrl2", nationalFlag2);
emptyNode1.setParentId(stringTree.getId()); emptyNode1.setParentId(stringTree.getId());
emptyNode1.setId(RandomUtil.randomNumbers(3)); emptyNode1.setId(RandomUtil.randomNumbers(3));
// emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId()));
children.add(emptyNode1); children.add(emptyNode1);
Tree<String> emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); Tree<String> emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5));
@ -367,7 +340,6 @@ public class MemberStructureController extends BaseController {
emptyNode2.putExtra("countryUrl", nationalFlag1); emptyNode2.putExtra("countryUrl", nationalFlag1);
emptyNode2.putExtra("countryUrl2", nationalFlag2); emptyNode2.putExtra("countryUrl2", nationalFlag2);
emptyNode2.setId(RandomUtil.randomNumbers(3)); emptyNode2.setId(RandomUtil.randomNumbers(3));
// emptyNode2.setChildren(setChildren( level+1,emptyNode2.getId()));
children.add(emptyNode2); children.add(emptyNode2);
stringTree.setChildren(children); stringTree.setChildren(children);
@ -375,11 +347,9 @@ public class MemberStructureController extends BaseController {
} }
} }
} }
return build; return build;
} }
/** /**
* 推荐架构网体 * 推荐架构网体
*/ */
@ -430,8 +400,8 @@ public class MemberStructureController extends BaseController {
} }
} }
// 查询当天 (秒结) // 查询当天 (秒结)
if (settleDate != null && if (settleDate != null
DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) {
// 查询所有用户表数据 id // 查询所有用户表数据 id
// 会员结算秒结表 // 会员结算秒结表
@ -442,7 +412,7 @@ public class MemberStructureController extends BaseController {
if (level == null) { if (level == null) {
level = defaultLevel; level = defaultLevel;
} }
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) {
@ -454,7 +424,6 @@ public class MemberStructureController extends BaseController {
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate();
} }
settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
@ -494,7 +463,6 @@ public class MemberStructureController extends BaseController {
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} }
} else { } else {
if (level == null) { if (level == null) {
level = defaultLevel; level = defaultLevel;
@ -521,7 +489,6 @@ public class MemberStructureController extends BaseController {
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
// List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level);
List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
@ -529,7 +496,6 @@ public class MemberStructureController extends BaseController {
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} }
} }
/** /**
@ -602,7 +568,7 @@ public class MemberStructureController extends BaseController {
* *
* @return * @return
*/ */
@GetMapping("get-member-settle-period") @GetMapping("/get-member-settle-period")
public AjaxResult getMemberSettlePeriod() { public AjaxResult getMemberSettlePeriod() {
// 查询最近一月的数据 // 查询最近一月的数据
DateTime dateTime = DateUtil.lastMonth(); DateTime dateTime = DateUtil.lastMonth();
@ -623,16 +589,13 @@ public class MemberStructureController extends BaseController {
return AjaxResult.success(resultList); return AjaxResult.success(resultList);
} }
/** /**
* 获取头像信息 * 获取头像信息
* *
* @return * @return
*/ */
@GetMapping("get-avatar-info") @GetMapping("/get-avatar-info")
public AjaxResult getAvatarUrl() { public AjaxResult getAvatarUrl() {
LoginUser user = userTokenService.getLoginUser();
//R<List<GradeDTO>> list = iGradeServiceApi.queryGradeConfigByCondition(user.getDataCountry());
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
// 虚拟 // 虚拟
JSONObject other = new JSONObject(); JSONObject other = new JSONObject();
@ -659,7 +622,6 @@ public class MemberStructureController extends BaseController {
js.put("value", date.getIcon()); js.put("value", date.getIcon());
array.add(js); array.add(js);
} }
return AjaxResult.success(array); return AjaxResult.success(array);
} }
@ -668,7 +630,7 @@ public class MemberStructureController extends BaseController {
* *
* @return * @return
*/ */
@PostMapping("get-url-base64") @PostMapping("/get-url-base64")
public Map<String, String> getUrlBase64(@RequestBody Map<String, String> urlMap) { public Map<String, String> getUrlBase64(@RequestBody Map<String, String> urlMap) {
Map<String, String> resultMap = new HashMap<>(); Map<String, String> resultMap = new HashMap<>();
for (Map.Entry<String, String> ss : urlMap.entrySet()) { for (Map.Entry<String, String> ss : urlMap.entrySet()) {

218
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.member.achieve.mapper.CuMemberTreeMapper" <mapper namespace="com.hzs.member.achieve.mapper.CuMemberTreeMapper">
>
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="CuMemberSettleExt" type="com.hzs.common.domain.member.ext.CuMemberSettleExt"> <resultMap id="CuMemberSettleExt" type="com.hzs.common.domain.member.ext.CuMemberSettleExt">
@ -106,8 +105,7 @@
<!-- 会员网体月表数据，用于查询 网体跟业绩分开 横向分表--> <!-- 会员网体月表数据，用于查询 网体跟业绩分开 横向分表-->
<sql id="CuMemberTreeColumn"> <sql id="CuMemberTreeColumn">
period period NUMBER(6) default 0 not null,
NUMBER(6) default 0 not null,
pk_member NUMBER(20) not null, pk_member NUMBER(20) not null,
pk_parent NUMBER(20) not null, pk_parent NUMBER(20) not null,
pk_place_parent NUMBER(20), pk_place_parent NUMBER(20),
@ -144,119 +142,101 @@
</sql> </sql>
<sql id="CuMemberSettleDetailColumn"> <sql id="CuMemberSettleDetailColumn">
pk_rate pk_rate NUMBER(6) ,
NUMBER(6) , a_balance NUMBER(17,6) default 0 not null,
a_balance NUMBER(17,6) default 0 not null, b_balance NUMBER(17,6) default 0 not null,
b_balance NUMBER(17,6) default 0 not null, a_sum_amount NUMBER(17,6) default 0 not null,
a_sum_amount NUMBER(17,6) default 0 not null, b_sum_amount NUMBER(17,6) default 0 not null,
b_sum_amount NUMBER(17,6) default 0 not null, a_sum_pv NUMBER(17,6) default 0 not null,
a_sum_pv NUMBER(17,6) default 0 not null, b_sum_pv NUMBER(17,6) default 0 not null,
b_sum_pv NUMBER(17,6) default 0 not null, a_new_amount NUMBER(17,6) default 0 not null,
a_new_amount NUMBER(17,6) default 0 not null, b_new_amount NUMBER(17,6) default 0 not null,
b_new_amount NUMBER(17,6) default 0 not null, a_new_pv NUMBER(17,6) default 0 not null,
a_new_pv NUMBER(17,6) default 0 not null, b_new_pv NUMBER(17,6) default 0 not null,
b_new_pv NUMBER(17,6) default 0 not null, a_sum_real_amount NUMBER(17,6) default 0 not null,
a_sum_real_amount NUMBER(17,6) default 0 not null, b_sum_real_amount NUMBER(17,6) default 0 not null,
b_sum_real_amount NUMBER(17,6) default 0 not null, a_sum_real_pv NUMBER(17,6) default 0 not null,
a_sum_real_pv NUMBER(17,6) default 0 not null, b_sum_real_pv NUMBER(17,6) default 0 not null,
b_sum_real_pv NUMBER(17,6) default 0 not null, rep_a_balance NUMBER(17,6) default 0 not null,
rep_a_balance NUMBER(17,6) default 0 not null, rep_b_balance NUMBER(17,6) default 0 not null,
rep_b_balance NUMBER(17,6) default 0 not null, rep_a_new_amount NUMBER(17,6) default 0 not null,
rep_a_new_amount NUMBER(17,6) default 0 not null, rep_b_new_amount NUMBER(17,6) default 0 not null,
rep_b_new_amount NUMBER(17,6) default 0 not null, rep_a_new_pv NUMBER(17,6) default 0 not null,
rep_a_new_pv NUMBER(17,6) default 0 not null, rep_b_new_pv NUMBER(17,6) default 0 not null,
rep_b_new_pv NUMBER(17,6) default 0 not null, rep_a_sum_amount NUMBER(17,6) default 0 not null,
rep_a_sum_amount NUMBER(17,6) default 0 not null, rep_b_sum_amount NUMBER(17,6) default 0 not null,
rep_b_sum_amount NUMBER(17,6) default 0 not null, rep_a_sum_pv NUMBER(17,6) default 0 not null,
rep_a_sum_pv NUMBER(17,6) default 0 not null, rep_b_sum_pv NUMBER(17,6) default 0 not null,
rep_b_sum_pv NUMBER(17,6) default 0 not null, register_amount NUMBER(17,6) default 0 not null,
register_amount NUMBER(17,6) default 0 not null, register_pv NUMBER(17,6) default 0 not null,
register_pv NUMBER(17,6) default 0 not null, register_new_amount NUMBER(17,6) default 0 not null,
register_new_amount NUMBER(17,6) default 0 not null, register_new_pv NUMBER(17,6) default 0 not null,
register_new_pv NUMBER(17,6) default 0 not null, upgrade_amount NUMBER(17,6) default 0 not null,
upgrade_amount NUMBER(17,6) default 0 not null, upgrade_pv NUMBER(17,6) default 0 not null,
upgrade_pv NUMBER(17,6) default 0 not null, upgrade_new_amount NUMBER(17,6) default 0 not null,
upgrade_new_amount NUMBER(17,6) default 0 not null, upgrade_new_pv NUMBER(17,6) default 0 not null,
upgrade_new_pv NUMBER(17,6) default 0 not null, repurchase_amount NUMBER(17,6) default 0 not null,
repurchase_amount NUMBER(17,6) default 0 not null, repurchase_pv NUMBER(17,6) default 0 not null,
repurchase_pv NUMBER(17,6) default 0 not null, repurchase_new_amount NUMBER(17,6) default 0 not null,
repurchase_new_amount NUMBER(17,6) default 0 not null, repurchase_new_pv NUMBER(17,6) default 0 not null,
repurchase_new_pv NUMBER(17,6) default 0 not null, hi_fun_amount NUMBER(17,6) default 0 not null,
hi_fun_amount NUMBER(17,6) default 0 not null, hi_fun_pv NUMBER(17,6) default 0 not null,
hi_fun_pv NUMBER(17,6) default 0 not null, hi_fun_new_amount NUMBER(17,6) default 0 not null,
hi_fun_new_amount NUMBER(17,6) default 0 not null, hi_fun_new_pv NUMBER(17,6) default 0 not null,
hi_fun_new_pv NUMBER(17,6) default 0 not null, mall_amount NUMBER(17,6) default 0 not null,
mall_amount NUMBER(17,6) default 0 not null, mall_pv NUMBER(17,6) default 0 not null,
mall_pv NUMBER(17,6) default 0 not null, mall_new_amount NUMBER(17,6) default 0 not null,
mall_new_amount NUMBER(17,6) default 0 not null, mall_new_pv NUMBER(17,6) default 0 not null,
mall_new_pv NUMBER(17,6) default 0 not null, REGISTER_Blo_NEW_PV NUMBER(17,6) default 0 not null,
REGISTER_Blo_NEW_PV NUMBER(17,6) default 0 not null, UPGRADE_Blo_NEW_PV NUMBER(17,6) default 0 not null,
UPGRADE_Blo_NEW_PV NUMBER(17,6) default 0 not null, REPURCHASE_Blo_NEW_PV NUMBER(17,6) default 0 not null,
REPURCHASE_Blo_NEW_PV NUMBER(17,6) default 0 not null, HI_FUN_Blo_NEW_PV NUMBER(17,6) default 0 not null,
HI_FUN_Blo_NEW_PV NUMBER(17,6) default 0 not null, MALL_Blo_NEW_PV NUMBER(17,6) default 0 not null,
MALL_Blo_NEW_PV NUMBER(17,6) default 0 not null, min_achieve number(17,6) default 0 not null,
min_achieve number(17,6) default 0 not null, round NUMBER(6) default 0 not null,
round NUMBER(6) default 0 not null, second NUMBER(4) default 1 not null
second NUMBER(4) default 1 not null
</sql> </sql>
<sql id="CuMemberBackColumn"> <sql id="CuMemberBackColumn">
r_a_balance r_a_balance NUMBER(17,6) default 0 not null,
NUMBER(17,6) default 0 not null, r_b_balance NUMBER(17,6) default 0 not null,
r_b_balance NUMBER(17,6) default 0 not null, r_a_sum_amount NUMBER(17,6) default 0 not null,
r_a_sum_amount NUMBER(17,6) default 0 not null, r_b_sum_amount NUMBER(17,6) default 0 not null,
r_b_sum_amount NUMBER(17,6) default 0 not null, r_a_sum_pv NUMBER(17,6) default 0 not null,
r_a_sum_pv NUMBER(17,6) default 0 not null, r_b_sum_pv NUMBER(17,6) default 0 not null,
r_b_sum_pv NUMBER(17,6) default 0 not null, r_a_sum_real_amount NUMBER(17,6) default 0 not null,
r_a_sum_real_amount NUMBER(17,6) default 0 not null, r_b_sum_real_amount NUMBER(17,6) default 0 not null,
r_b_sum_real_amount NUMBER(17,6) default 0 not null, r_a_sum_real_pv NUMBER(17,6) default 0 not null,
r_a_sum_real_pv NUMBER(17,6) default 0 not null, r_b_sum_real_pv NUMBER(17,6) default 0 not null,
r_b_sum_real_pv NUMBER(17,6) default 0 not null, r_rep_a_balance NUMBER(17,6) default 0 not null,
r_rep_a_balance NUMBER(17,6) default 0 not null, r_rep_b_balance NUMBER(17,6) default 0 not null,
r_rep_b_balance NUMBER(17,6) default 0 not null, r_rep_a_sum_amount NUMBER(17,6) default 0 not null,
r_rep_a_sum_amount NUMBER(17,6) default 0 not null, r_rep_b_sum_amount NUMBER(17,6) default 0 not null,
r_rep_b_sum_amount NUMBER(17,6) default 0 not null, r_rep_a_sum_pv NUMBER(17,6) default 0 not null,
r_rep_a_sum_pv NUMBER(17,6) default 0 not null, r_rep_b_sum_pv NUMBER(17,6) default 0 not null
r_rep_b_sum_pv NUMBER(17,6) default 0 not null
</sql> </sql>
<sql id="CuMemberTableTrig"> <sql id="CuMemberTableTrig">
CREATE CREATE OR REPLACE TRIGGER ${tableName}_TRIG
OR REPLACE TRIGGER BEFORE INSERT OR UPDATE ON ${tableName} FOR EACH ROW
${tableName}
_
TRIG
BEFORE
INSERT
OR
UPDATE ON ${tableName}
FOR EACH ROW
DECLARE DECLARE
v_newVal NUMBER(12) := 0; v_newVal NUMBER(12) := 0;
v_incval v_incval NUMBER(12) := 0;
NUMBER(12) := 0;
BEGIN BEGIN
IF IF
INSERTING AND :new.pk_id IS NULL THEN INSERTING AND :new.pk_id IS NULL THEN
SELECT ${tableNameSeq}.NEXTVAL SELECT ${tableNameSeq}.NEXTVAL INTO v_newVal FROM DUAL;
INTO v_newVal
FROM DUAL;
IF IF
v_newVal = 1 THEN v_newVal = 1 THEN
SELECT NVL(max(pk_id), 0) SELECT NVL(max(pk_id), 0) INTO v_newVal FROM ${tableName};
INTO v_newVal v_newVal := v_newVal + 1;
FROM ${tableName};
v_newVal
:= v_newVal + 1;
LOOP LOOP
EXIT WHEN v_incval >= v_newVal; EXIT
SELECT ${tableNameSeq}.nextval WHEN v_incval >= v_newVal;
INTO v_incval SELECT ${tableNameSeq}.nextval INTO v_incval FROM dual;
FROM dual;
END LOOP; END LOOP;
END IF; END IF;
:new :new.pk_id := v_newVal;
.pk_id := v_newVal;
END IF; END IF;
END; END;
</sql> </sql>
@ -655,4 +635,38 @@
</if> </if>
</select> </select>
<!-- 查询会员当天业绩 -->
<select id="queryMemberTodayPv" resultType="com.hzs.member.achieve.vo.CuMemberAwardsUnderVO">
select a.order_achieve a_new_pv, b.order_achieve b_new_pv
from (select nvl(sum(so.order_achieve), 0) order_achieve
from sa_order so
where so.del_flag = 0
and so.order_status = 1
and to_char(so.pay_time, 'yyyy-mm-dd') =
to_char(sysdate, 'yyyy-mm-dd')
and so.order_type in (1, 2, 3, 24, 25, 26, 10)
and so.pk_member in
(select cm.pk_id
from cu_member cm
start with cm.pk_place_parent = #{pkMember}
and cm.place_dept = 1
and cm.del_flag = 0
connect by prior cm.pk_id = cm.pk_place_parent) ) a
left join (select nvl(sum(so.order_achieve), 0) order_achieve
from sa_order so
where so.del_flag = 0
and so.order_status = 1
and to_char(so.pay_time, 'yyyy-mm-dd') =
to_char(sysdate, 'yyyy-mm-dd')
and so.order_type in (1, 2, 3, 24, 25, 26, 10)
and so.pk_member in
(select cm.pk_id
from cu_member cm
start with cm.pk_place_parent = #{pkMember}
and cm.place_dept = 2
and cm.del_flag = 0
connect by prior cm.pk_id = cm.pk_place_parent)) b
on 1 = 1
</select>
</mapper> </mapper>