From fc62e263e54cee0328b0291804051171b5d7d753 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 6 May 2025 14:09:59 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=BD=93=E6=9C=88=E4=B8=9A=E7=BB=A9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E6=97=A5=E6=96=B0=E5=A2=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/mapper/CuMemberTreeMapper.java | 8 + .../achieve/service/ICuMemberTreeService.java | 11 +- .../impl/CuMemberAchieveServiceImpl.java | 20 +- .../service/impl/CuMemberTreeServiceImpl.java | 6 +- .../api/ApiMemberStructureController.java | 187 +++++---------- .../manage/MemberStructureController.java | 50 +--- .../member/achieve/CuMemberTreeMapper.xml | 218 ++++++++++-------- 7 files changed, 217 insertions(+), 283 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java index fffe4ab5..3fc2dee6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java @@ -184,4 +184,12 @@ public interface CuMemberTreeMapper extends BaseMapper { @Param("pkMember") Long pkMember, @Param("monthTable") String monthTable); + /** + * 查询会员当天业绩 + * + * @param pkMember + * @return + */ + CuMemberAwardsUnderVO queryMemberTodayPv(@Param("pkMember") Long pkMember); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java index a841d8f9..823740e2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java @@ -5,7 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberTree; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.member.achieve.param.MemberParentCountParam; import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -150,7 +149,7 @@ public interface ICuMemberTreeService extends IService { * @param memberIds * @return */ - List queryByMemberParentSettleSumPv(@Param("settleTableName") String settleTableName, @Param("memberIds") List memberIds); + List queryByMemberParentSettleSumPv(String settleTableName, List memberIds); /** * 查询会员显示业绩 @@ -162,4 +161,12 @@ public interface ICuMemberTreeService extends IService { */ CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable); + /** + * 查询会员当天业绩 + * + * @param pkMember + * @return + */ + CuMemberAwardsUnderVO queryMemberTodayPv(Long pkMember); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 8d849e0b..ff9c6035 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -367,16 +367,24 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List vertexIdList) { - long b = System.currentTimeMillis(); List memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); List ids = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList()); // 查询会员直推人数 @@ -244,4 +243,9 @@ public class CuMemberTreeServiceImpl extends ServiceImpl memberList = memberService.queryPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); + List memberList = iCuMemberService.queryPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); if (CollectionUtil.isNotEmpty(memberList)) { pkMember = member.getPkId(); } else { @@ -110,18 +99,18 @@ public class ApiMemberStructureController extends BaseController { pkMember = SecurityUtils.getUserId(); } } else { - CuMember member = memberService.getMember(SecurityUtils.getMemberCode()); + CuMember member = iCuMemberService.getMember(SecurityUtils.getMemberCode()); pkMember = member.getPkId(); } Integer period = null; Date settleDate = null; if (memberSettlePeriodId != null) { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } else { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); @@ -135,27 +124,26 @@ public class ApiMemberStructureController extends BaseController { String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; // 查询所有用户表数据 id // 查询秒结 表 如果 秒结表 没有则去 历史表 - - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { List cuMemberSettleExts; // 查询今日会员表是否有值 - Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); + Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); if (treeMemberCount > 0) { //表格存在 - cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); } else { DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); } 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())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } @@ -163,57 +151,40 @@ public class ApiMemberStructureController extends BaseController { // 添加自身 cuMemberSettleExts.add(memberSettleExt); - List cuMemberSettleExtList = cuMemberSettleExts.stream().map(a -> { - a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); - return a; - }).collect(Collectors.toList()); - List> build = memberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt); + List cuMemberSettleExtList = cuMemberSettleExts.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); + List> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt); // 安置架构 无点位 追加空点位 - // if (type != EStructureType.JG4.getIntValue()){ - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); List> trees = setTreeList(build, level, allCountryData); return AjaxResult.success(trees); - // }else { - // return AjaxResult.success(build); - // } } - } else { // 查询 历史 String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { // 表示表格存在 // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - // List list = memberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level); - List list = memberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); + List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List cuMemberSettleExtList = list.stream().map(a -> { - a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); - return a; - }).collect(Collectors.toList()); - List> build = memberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt); + List cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); + List> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt); // 安置架构 无点位 追加空点位 - // if (type != EStructureType.JG4.getIntValue()){ - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); List> trees = setTreeList(build, level, allCountryData); return AjaxResult.success(trees); - // }else { - // return AjaxResult.success(build); - // } } } - return AjaxResult.success(); } @@ -221,10 +192,7 @@ public class ApiMemberStructureController extends BaseController { * @param build * @return */ - - // 设置虚拟节点 public List> setTreeList(List> build, Integer numberOfPlies, Map allCountryData) { - Integer pkCountry = SecurityUtils.getPkCountry(); String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1(); String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2(); @@ -245,8 +213,6 @@ public class ApiMemberStructureController extends BaseController { emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); emptyNode1.putExtra("countryUrl", nationalFlag1); emptyNode1.putExtra("countryUrl2", nationalFlag2); - - // emptyNode1.setChildren(setChildren(level,emptyNode1.getId())); stringTree.getChildren().add(emptyNode1); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); @@ -262,7 +228,6 @@ public class ApiMemberStructureController extends BaseController { emptyNode2.putExtra("countryUrl", nationalFlag1); emptyNode2.putExtra("countryUrl2", nationalFlag2); emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); - // emptyNode2.setChildren(setChildren(level,emptyNode2.getId())); stringTree.getChildren().add(emptyNode2); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); } else if (stringTree.getChildren().size() == 1) { @@ -281,10 +246,8 @@ public class ApiMemberStructureController extends BaseController { emptyNode.setParentId(stringTree.getId()); emptyNode.setId(RandomUtil.randomNumbers(3)); emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni); - // emptyNode.setChildren(setChildren(level,emptyNode.getId())); stringTree.getChildren().add(emptyNode); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); - } else { emptyNode.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode.putExtra("level", level + 1); @@ -297,7 +260,6 @@ public class ApiMemberStructureController extends BaseController { emptyNode.putExtra("settleCountryUrl2", nationalFlag2); emptyNode.putExtra("countryUrl", nationalFlag1); emptyNode.putExtra("countryUrl2", nationalFlag2); - // emptyNode.setChildren(setChildren(level,emptyNode.getId())); stringTree.getChildren().add(emptyNode); List> strTree = stringTree.getChildren(); List> sortChildren = new ArrayList<>(); @@ -305,7 +267,6 @@ public class ApiMemberStructureController extends BaseController { sortChildren.add(strTree.get(0)); stringTree.setChildren(sortChildren); setTreeList(sortChildren, numberOfPlies, allCountryData); - } } else { List> children = stringTree.getChildren(); @@ -324,7 +285,6 @@ public class ApiMemberStructureController extends BaseController { } else { // 等于空 List> children = new ArrayList<>(); - children = new ArrayList<>(); Tree emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode1.putExtra("level", level + 1); @@ -337,10 +297,8 @@ public class ApiMemberStructureController extends BaseController { emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.setParentId(stringTree.getId()); emptyNode1.setId(RandomUtil.randomNumbers(3)); - // emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId())); children.add(emptyNode1); - Tree emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode2.putExtra("level", level + 1); @@ -353,25 +311,22 @@ public class ApiMemberStructureController extends BaseController { emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode2.setParentId(stringTree.getId()); emptyNode2.setId(RandomUtil.randomNumbers(3)); - // emptyNode2.setChildren(setChildren( level+1,emptyNode2.getId())); children.add(emptyNode2); stringTree.setChildren(children); setTreeList(children, numberOfPlies, allCountryData); - } } } return build; } - private Integer defaultLevel = 5; /** * 推荐架构网体 */ - @GetMapping("/tj-framework") +// @GetMapping("/tj-framework") public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) { Date date = DateUtils.currentDate(); if (DateUtils.getCurrentHour() < 2) { @@ -384,13 +339,13 @@ public class ApiMemberStructureController extends BaseController { List vertexIdList = userAuthorityDTO.getVertexIdList(); Long pkMember; if (StringUtils.isNotBlank(memberCode)) { - CuMember member = memberService.getMember(memberCode); + CuMember member = iCuMemberService.getMember(memberCode); if (member == null) { return AjaxResult.error("会员编号不存在"); } // 查询编号是否在登录用户伞下 if (!memberCode.equals(SecurityUtils.getMemberCode())) { - Long placeCount = memberService.checkPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); + Long placeCount = iCuMemberService.checkPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); if (placeCount == 0) { // 如果查询编号不存在伞下 则直接查询订单为当前登录人的 pkMember = SecurityUtils.getUserId(); @@ -401,33 +356,31 @@ public class ApiMemberStructureController extends BaseController { pkMember = SecurityUtils.getUserId(); } } else { - CuMember member = memberService.getMember(SecurityUtils.getMemberCode()); + CuMember member = iCuMemberService.getMember(SecurityUtils.getMemberCode()); pkMember = member.getPkId(); } Integer period = null; Date settleDate = null; if (memberSettlePeriodId != null) { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } else { - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } } - // 查询当天 (秒结) if (settleDate != null && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { // 查询所有用户表数据 id - // 会员结算秒结表 String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { //表格存在 if (level == null) { @@ -435,37 +388,30 @@ public class ApiMemberStructureController extends BaseController { } List cuMemberSettleExts; // 查询今日会员表是否有值 - Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); + Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); if (treeMemberCount > 0) { //表格存在 - cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); } else { DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); } settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); } - // 查询会员是否在秒结表中有值 - // List cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level); - // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } - memberSettleExt.setLevel(0); // 添加自身 cuMemberSettleExts.add(memberSettleExt); - List cuMemberSettleExtList = cuMemberSettleExts.stream().map(a -> { - a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); - return a; - }).collect(Collectors.toList()); - List> build = memberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true); + List cuMemberSettleExtList = cuMemberSettleExts.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); + List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true); // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } else { @@ -478,65 +424,56 @@ public class ApiMemberStructureController extends BaseController { settleTableName = null; } // 查询顶点 - CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); + CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - List list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List cuMemberSettleExtList = list.stream().map(a -> { - a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); - return a; - }).collect(Collectors.toList()); - List> build = memberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true); + List cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); + List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true); // 安置架构 无点位 追加空点位 - R> allCountryMap = countryServiceApi.getAllCountryMap(); + R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); return AjaxResult.success(setTreeList(build, level, allCountryData)); } - } else { if (level == null) { level = defaultLevel; } DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); } // 查询 历史 String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber == 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())) { memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); } memberSettleExt.setLevel(0); //查询下级 - // List list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level); - List list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); + List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); - List cuMemberSettleExtList = list.stream().map(a -> { - a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName())); - return a; - }).collect(Collectors.toList()); - List> build = memberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, false); + List cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); + List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, false); // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } - } /** @@ -544,7 +481,7 @@ public class ApiMemberStructureController extends BaseController { * * @return */ - @GetMapping("get-member-settle-period") + @GetMapping("/get-member-settle-period") public AjaxResult getMemberSettlePeriod() { // 查询最近一月的数据 DateTime dateTime = DateUtil.lastMonth(); @@ -555,7 +492,7 @@ public class ApiMemberStructureController extends BaseController { date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date); } queryWrapper.between("SETTLE_DATE", dateTime, date); - List list = memberSettlePeriodService.list(queryWrapper); + List list = iCuMemberSettlePeriodService.list(queryWrapper); List resultList = new ArrayList<>(); for (CuMemberSettlePeriod cuMemberSettlePeriod : list) { CuMemberSettlePeriodVo cuMemberSettlePeriodVo = BeanUtil.copyProperties(cuMemberSettlePeriod, CuMemberSettlePeriodVo.class); @@ -575,42 +512,36 @@ public class ApiMemberStructureController extends BaseController { * * @return */ - @GetMapping("get-avatar-info") + @GetMapping("/get-avatar-info") public AjaxResult getAvatarUrl() { Integer pkCountry = SecurityUtils.getPkCountry(); - //R> list = gradeServiceApi.queryGradeConfigByCondition(user.getDataCountry()); - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EGrade.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE); JSONArray array = new JSONArray(); // 虚拟 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); array.add(other); // 已注销 JSONObject zxOther = new JSONObject(); - //transactionMap.get(EGrade.LOGGED_OUT) - zxOther.put("name", transactionMap.get(EnumsPrefixConstants.ENU_CAT + Math.abs(EGrade.LOGGED_OUT.getIndex()))); + zxOther.put("name", ECategory.getLabelByValue(Math.abs(EGrade.LOGGED_OUT.getIndex()))); zxOther.put("value", MemberFrameworkConstants.LOG_OFF); array.add(zxOther); // 待激活 非中国 if (!SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { 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); array.add(djhOther); } - R> list = gradeServiceApi.selectGradeAll(pkCountry); + R> list = iGradeServiceApi.selectGradeAll(pkCountry); for (GradeDTO date : list.getData()) { JSONObject js = new JSONObject(); - js.put("name", transactionMap1.get(date.getPkTransaction())); + js.put("name", date.getGradeName()); js.put("value", date.getIcon()); array.add(js); } - return AjaxResult.success(array); } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index 9b138ff5..9f80569f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -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.CuMemberSettleExt; 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.util.TransactionUtils; 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.dto.GradeDTO; import com.hzs.system.sys.IUserServiceApi; -import com.hzs.system.sys.dto.LoginUser; import com.hzs.system.sys.dto.UserAuthorityDTO; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -55,8 +53,6 @@ import java.util.*; @RequestMapping("/manage/member-structure") public class MemberStructureController extends BaseController { - @Autowired - private UserTokenService userTokenService; @Autowired private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Autowired @@ -158,7 +154,6 @@ public class MemberStructureController extends BaseController { CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); } settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); @@ -173,14 +168,10 @@ public class MemberStructureController extends BaseController { cuMemberSettleExts.add(memberSettleExt); List> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt); // 安置架构 无点位 追加空点位 - // if (type != EStructureType.JG4.getIntValue()){ R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); List> trees = setTreeList(build, level, allCountryData); return AjaxResult.success(trees); - // }else { - // return AjaxResult.success(build); - // } } else { // 查询表格是否存在 tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); @@ -199,13 +190,9 @@ public class MemberStructureController extends BaseController { list.add(memberSettleExt); List> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt); // 安置架构 无点位 追加空点位 - // if (type != EStructureType.JG4.getIntValue()){ R> allCountryMap = iCountryServiceApi.getAllCountryMap(); Map allCountryData = allCountryMap.getData(); return AjaxResult.success(setTreeList(build, level, allCountryData)); - // }else { - // return AjaxResult.success(build); - // } } } else { // 查询 历史 @@ -220,7 +207,6 @@ public class MemberStructureController extends BaseController { } memberSettleExt.setLevel(0); //查询下级 - // List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level); List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); @@ -231,16 +217,9 @@ public class MemberStructureController extends BaseController { return AjaxResult.success(setTreeList(build, level, allCountryData)); } } - return AjaxResult.success(); } - /** - * @param build - * @return - */ - - // 设置虚拟节点 public List> setTreeList(List> build, Integer numberOfPlies, Map allCountryData) { Integer pkCountry = SecurityUtils.getPkCountry(); String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1(); @@ -262,7 +241,6 @@ public class MemberStructureController extends BaseController { emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); emptyNode1.putExtra("countryUrl", nationalFlag1); emptyNode1.putExtra("countryUrl2", nationalFlag2); - // emptyNode1.setChildren(setChildren(level,emptyNode1.getId())); stringTree.getChildren().add(emptyNode1); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); @@ -278,7 +256,6 @@ public class MemberStructureController extends BaseController { emptyNode2.putExtra("countryUrl2", nationalFlag2); emptyNode2.setId(RandomUtil.randomNumbers(3)); emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); - // emptyNode2.setChildren(setChildren(level,emptyNode2.getId())); stringTree.getChildren().add(emptyNode2); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); } else if (stringTree.getChildren().size() == 1) { @@ -297,7 +274,6 @@ public class MemberStructureController extends BaseController { emptyNode.putExtra("settleCountryUrl2", nationalFlag2); emptyNode.putExtra("countryUrl", nationalFlag1); emptyNode.putExtra("countryUrl2", nationalFlag2); - // emptyNode.setChildren(setChildren(level,emptyNode.getId())); stringTree.getChildren().add(emptyNode); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); @@ -313,7 +289,6 @@ public class MemberStructureController extends BaseController { emptyNode.putExtra("settleCountryUrl2", nationalFlag2); emptyNode.putExtra("countryUrl", nationalFlag1); emptyNode.putExtra("countryUrl2", nationalFlag2); - // emptyNode.setChildren(setChildren(level,emptyNode.getId())); stringTree.getChildren().add(emptyNode); List> strTree = stringTree.getChildren(); List> sortChildren = new ArrayList<>(); @@ -321,7 +296,6 @@ public class MemberStructureController extends BaseController { sortChildren.add(strTree.get(0)); stringTree.setChildren(sortChildren); setTreeList(sortChildren, numberOfPlies, allCountryData); - } } else { List> children = stringTree.getChildren(); @@ -352,7 +326,6 @@ public class MemberStructureController extends BaseController { emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.setParentId(stringTree.getId()); emptyNode1.setId(RandomUtil.randomNumbers(3)); - // emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId())); children.add(emptyNode1); Tree emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); @@ -367,7 +340,6 @@ public class MemberStructureController extends BaseController { emptyNode2.putExtra("countryUrl", nationalFlag1); emptyNode2.putExtra("countryUrl2", nationalFlag2); emptyNode2.setId(RandomUtil.randomNumbers(3)); - // emptyNode2.setChildren(setChildren( level+1,emptyNode2.getId())); children.add(emptyNode2); stringTree.setChildren(children); @@ -375,11 +347,9 @@ public class MemberStructureController extends BaseController { } } } - return build; } - /** * 推荐架构网体 */ @@ -430,8 +400,8 @@ public class MemberStructureController extends BaseController { } } // 查询当天 (秒结) - if (settleDate != null && - DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { + if (settleDate != null + && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { // 查询所有用户表数据 id // 会员结算秒结表 @@ -442,7 +412,7 @@ public class MemberStructureController extends BaseController { if (level == null) { level = defaultLevel; } - List cuMemberSettleExts = null; + List cuMemberSettleExts; // 查询今日会员表是否有值 Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); if (treeMemberCount > 0) { @@ -454,7 +424,6 @@ public class MemberStructureController extends BaseController { CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); } settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); @@ -494,7 +463,6 @@ public class MemberStructureController extends BaseController { // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } - } else { if (level == null) { level = defaultLevel; @@ -521,7 +489,6 @@ public class MemberStructureController extends BaseController { } memberSettleExt.setLevel(0); //查询下级 - // List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level); List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); // 无法查询到自身 所有单独查询自身并且添加 list.add(memberSettleExt); @@ -529,7 +496,6 @@ public class MemberStructureController extends BaseController { // 安置架构 无点位 追加空点位 return AjaxResult.success(build); } - } /** @@ -602,7 +568,7 @@ public class MemberStructureController extends BaseController { * * @return */ - @GetMapping("get-member-settle-period") + @GetMapping("/get-member-settle-period") public AjaxResult getMemberSettlePeriod() { // 查询最近一月的数据 DateTime dateTime = DateUtil.lastMonth(); @@ -623,16 +589,13 @@ public class MemberStructureController extends BaseController { return AjaxResult.success(resultList); } - /** * 获取头像信息 * * @return */ - @GetMapping("get-avatar-info") + @GetMapping("/get-avatar-info") public AjaxResult getAvatarUrl() { - LoginUser user = userTokenService.getLoginUser(); - //R> list = iGradeServiceApi.queryGradeConfigByCondition(user.getDataCountry()); JSONArray array = new JSONArray(); // 虚拟 JSONObject other = new JSONObject(); @@ -659,7 +622,6 @@ public class MemberStructureController extends BaseController { js.put("value", date.getIcon()); array.add(js); } - return AjaxResult.success(array); } @@ -668,7 +630,7 @@ public class MemberStructureController extends BaseController { * * @return */ - @PostMapping("get-url-base64") + @PostMapping("/get-url-base64") public Map getUrlBase64(@RequestBody Map urlMap) { Map resultMap = new HashMap<>(); for (Map.Entry ss : urlMap.entrySet()) { diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index 9f04ecdf..0ea844fd 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -1,7 +1,6 @@ - + @@ -106,8 +105,7 @@ - period - NUMBER(6) default 0 not null, + period NUMBER(6) default 0 not null, pk_member NUMBER(20) not null, pk_parent NUMBER(20) not null, pk_place_parent NUMBER(20), @@ -144,119 +142,101 @@ - pk_rate - NUMBER(6) , - a_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, - b_sum_amount 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, - a_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, - b_new_pv 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, - a_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_b_balance 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_a_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_b_sum_amount 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, - register_amount 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_pv 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_new_amount 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_pv 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, - hi_fun_amount 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_pv 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_new_amount 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, - UPGRADE_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, - MALL_Blo_NEW_PV NUMBER(17,6) default 0 not null, - min_achieve number(17,6) default 0 not null, - round NUMBER(6) default 0 not null, - second NUMBER(4) default 1 not null + pk_rate NUMBER(6) , + a_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, + b_sum_amount 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, + a_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, + b_new_pv 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, + a_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_b_balance 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_a_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_b_sum_amount 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, + register_amount 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_pv 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_new_amount 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_pv 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, + hi_fun_amount 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_pv 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_new_amount 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, + UPGRADE_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, + MALL_Blo_NEW_PV NUMBER(17,6) default 0 not null, + min_achieve number(17,6) default 0 not null, + round NUMBER(6) default 0 not null, + second NUMBER(4) default 1 not null - r_a_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_b_sum_amount 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_a_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_b_sum_real_pv 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_a_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_b_sum_pv NUMBER(17,6) default 0 not null + r_a_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_b_sum_amount 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_a_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_b_sum_real_pv 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_a_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_b_sum_pv NUMBER(17,6) default 0 not null - CREATE - OR REPLACE TRIGGER - ${tableName} - _ - TRIG - BEFORE - INSERT - OR - UPDATE ON ${tableName} - FOR EACH ROW + CREATE OR REPLACE TRIGGER ${tableName}_TRIG + BEFORE INSERT OR UPDATE ON ${tableName} FOR EACH ROW DECLARE v_newVal NUMBER(12) := 0; - v_incval - NUMBER(12) := 0; + v_incval NUMBER(12) := 0; BEGIN - IF + IF INSERTING AND :new.pk_id IS NULL THEN - SELECT ${tableNameSeq}.NEXTVAL - INTO v_newVal - FROM DUAL; + SELECT ${tableNameSeq}.NEXTVAL INTO v_newVal FROM DUAL; IF v_newVal = 1 THEN - SELECT NVL(max(pk_id), 0) - INTO v_newVal - FROM ${tableName}; - v_newVal - := v_newVal + 1; + SELECT NVL(max(pk_id), 0) INTO v_newVal FROM ${tableName}; + v_newVal := v_newVal + 1; LOOP - EXIT WHEN v_incval >= v_newVal; - SELECT ${tableNameSeq}.nextval - INTO v_incval - FROM dual; + EXIT + WHEN v_incval >= v_newVal; + SELECT ${tableNameSeq}.nextval INTO v_incval FROM dual; END LOOP; END IF; - :new - .pk_id := v_newVal; + :new.pk_id := v_newVal; END IF; END; @@ -655,4 +635,38 @@ + + +