From 97205a139d646eb4746ff0f00d8584015a9564fa Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 9 Sep 2025 17:24:01 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E5=8E=9F=E5=A4=8D?= =?UTF-8?q?=E8=B4=AD=E7=BA=A7=E5=B7=AE=EF=BC=9B=E6=B7=BB=E5=8A=A0=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=97=A5=E7=BB=93=E6=98=8E=E7=BB=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CuMemberRetailDetailMapper.java | 11 ++ .../achieve/mapper/CuMemberTreeMapper.java | 10 -- .../service/ICuMemberRetailDetailService.java | 11 ++ .../achieve/service/ICuMemberTreeService.java | 5 - .../impl/CuMemberAchieveServiceImpl.java | 18 +- .../impl/CuMemberRetailDetailServiceImpl.java | 15 ++ .../service/impl/CuMemberTreeServiceImpl.java | 16 +- .../service/impl/BonusSettleRangeHandle.java | 6 - .../impl/CuMemberAwardsServiceImpl.java | 6 - .../bonus/order/mapper/BonusOrderMapper.java | 8 - .../order/service/IBonusOrderService.java | 8 - .../service/impl/BonusOrderServiceImpl.java | 22 --- .../achieve/CuMemberRetailDetailMapper.xml | 6 + .../achieve/CuMemberRetailRangeMapper.xml | 66 ++----- .../bonus/achieve/CuMemberTreeMapper.xml | 42 ++--- .../mapper/bonus/order/BonusOrderMapper.xml | 68 -------- .../achieve/CuMemberRetailRangeMapper.xml | 4 +- .../core/constant/TableNameConstants.java | 5 - .../member/achieve/CuMemberRetailDetail.java | 163 ++++++++++++++++++ .../member/achieve/CuMemberRetailRange.java | 12 -- .../achieve/ext/CuMemberRetailRangeExt.java | 5 - .../domain/sale/ext/SaOrderItemsExt.java | 7 - .../domain/sale/wares/ext/WaresRangeTmp.java | 23 --- .../src/test/java/com/CodeGenerator.java | 6 +- 24 files changed, 251 insertions(+), 292 deletions(-) create mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailDetailMapper.java create mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java create mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.java create mode 100644 bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailDetailMapper.xml create mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailDetail.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresRangeTmp.java diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailDetailMapper.java new file mode 100644 index 00000000..7f09bf4d --- /dev/null +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailDetailMapper.java @@ -0,0 +1,11 @@ +package com.hzs.bonus.achieve.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.common.domain.member.achieve.CuMemberRetailDetail; + +/** + * 日结算阶段表 Mapper 接口 + */ +public interface CuMemberRetailDetailMapper extends BaseMapper { + +} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java index 460ac6f8..0483be60 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java @@ -111,16 +111,6 @@ public interface CuMemberTreeMapper extends BaseMapper { void updateCuMemberRetailRangeAwardByDate(@Param("rangeTableName") String rangeTableName, @Param("settleDate") Date settleDate, @Param("awardType") Integer awardType); - /** - * 初始化期间奖衔 - */ - void updateCuMemberRetailRangeInitAward(@Param("rangeTableName") String rangeTableName); - - /** - * 初始化期间V5奖衔 - */ - void updateCuMemberRetailRangeInitV5Award(@Param("rangeTableName") String rangeTableName); - /** * 根据订单，查询出网体中记录的会员数据，推荐人、安置人 * diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java new file mode 100644 index 00000000..d849d643 --- /dev/null +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java @@ -0,0 +1,11 @@ +package com.hzs.bonus.achieve.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.common.domain.member.achieve.CuMemberRetailDetail; + +/** + * 日结算阶段表 服务类 + */ +public interface ICuMemberRetailDetailService extends IService { + +} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java index f0a75a87..0e1ae3fd 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java @@ -49,11 +49,6 @@ public interface ICuMemberTreeService extends IService { **/ void updateCuMemberRetailRangeAwardByDate(String rangeTableName, Date settleDate); - /** - * 初始化期间奖衔 - */ - void updateCuMemberRetailRangeInitAward(String rangeTableName); - /** * 删除日表数据 * diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java index f549ae10..3c118301 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -99,15 +99,15 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl 0; i--) { - String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(i, ChronoUnit.DAYS)); - int settlePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); - String targetTable = TableNameConstants.CU_MEMBER_SETTLE + settlePeriod; - baseMapper.chargeBackSaOrder(targetTable, sourceTable, period, cuMemberAchieve); - } +// String payTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrder.getPayTime()); +// int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(payTime).getPkId(); +// String sourceTable = TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(payTime); +// for (int i = 7; i > 0; i--) { +// String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(i, ChronoUnit.DAYS)); +// int settlePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); +// String targetTable = TableNameConstants.CU_MEMBER_SETTLE + settlePeriod; +// baseMapper.chargeBackSaOrder(targetTable, sourceTable, period, cuMemberAchieve); +// } return Boolean.TRUE; } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.java new file mode 100644 index 00000000..952b95c0 --- /dev/null +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.java @@ -0,0 +1,15 @@ +package com.hzs.bonus.achieve.service.impl; + +import com.hzs.bonus.achieve.mapper.CuMemberRetailDetailMapper; +import com.hzs.bonus.achieve.service.ICuMemberRetailDetailService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.common.domain.member.achieve.CuMemberRetailDetail; +import org.springframework.stereotype.Service; + +/** + * 日结算阶段表 服务实现类 + */ +@Service +public class CuMemberRetailDetailServiceImpl extends ServiceImpl implements ICuMemberRetailDetailService { + +} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java index 0c2ef6e4..b4dddc1f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -38,11 +38,11 @@ public class CuMemberTreeServiceImpl extends ServiceImpl 0) { - // 复购订单级差数据map(key:订单ID，value:订单明细+级差) - Map> rangeOrderMap = new HashMap<>(); - if (CollectionUtil.isNotEmpty(repurchaseOrderList)) { - rangeOrderMap = iBonusOrderService.getWaresRange(repurchaseOrderList); - } - // 按照血缘，查询该会员所有伞上会员 List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java index e371188e..2656cf5b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java @@ -39,12 +39,6 @@ public class CuMemberAwardsServiceImpl extends ServiceImpl orderType); - /** - * 查询订单商品级差数据 - * - * @param orderList 订单列表 - * @return - */ - List listOrderWaresRange(@Param("orderList") List orderList); - } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/IBonusOrderService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/IBonusOrderService.java index fac56c07..e1d60639 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/IBonusOrderService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/IBonusOrderService.java @@ -32,12 +32,4 @@ public interface IBonusOrderService { */ List listSaOrderByTime(Date startDate, Date endDate, List orderType); - /** - * 查询商品级差数据 - * - * @param orderList - * @return - */ - Map> getWaresRange(List orderList); - } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/impl/BonusOrderServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/impl/BonusOrderServiceImpl.java index e08db6ba..b48d0481 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/impl/BonusOrderServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/impl/BonusOrderServiceImpl.java @@ -41,26 +41,4 @@ public class BonusOrderServiceImpl implements IBonusOrderService { return bonusOrderMapper.listSaOrderByTime(startDate, endDate, orderType); } - @Override - public Map> getWaresRange(List orderList) { - Map> resultMap = new HashMap<>(); - - List resultList = new ArrayList<>(); - List> handleCutList = cuMemberBonusSettle.handleCutList(orderList, MagicNumberConstants.BATCH_UPDATE_NUM); - handleCutList.forEach(list -> { - resultList.addAll(bonusOrderMapper.listOrderWaresRange(orderList)); - }); - for (SaOrderItemsExt saOrderItemsExt : resultList) { - if (resultMap.containsKey(saOrderItemsExt.getPkOrder())) { - resultMap.get(saOrderItemsExt.getPkOrder()).add(saOrderItemsExt); - } else { - List tmpList = new ArrayList<>(); - tmpList.add(saOrderItemsExt); - resultMap.put(saOrderItemsExt.getPkOrder(), tmpList); - } - } - - return resultMap; - } - } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailDetailMapper.xml new file mode 100644 index 00000000..330b4b37 --- /dev/null +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailDetailMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml index ca9ccfcb..2febe044 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml @@ -38,7 +38,6 @@ - @@ -50,12 +49,10 @@ - - @@ -76,12 +73,8 @@ team_num = 0, enable_status = 1, pk_grade = (select pk_id from bd_grade where del_flag = 0 and grade_value = 20), - region_address = 0, big_team_pv = 0, - small_team_pv = 0, - all_team_new_pv = 0, - all_team_consume_pv = 0, - all_team_month_pv = 0 + small_team_pv = 0 @@ -92,8 +85,7 @@ team_new_pv, team_consume_pv, team_month_pv, team_new_amount, team_consume_amount, team_month_amount, recommend_num, team_num, - big_team_pv, small_team_pv, - all_team_new_pv, all_team_consume_pv, all_team_month_pv + big_team_pv, small_team_pv from ${yesterdayRangeTableName} ) b on (a.pk_member = b.pk_member) @@ -105,14 +97,11 @@ a.recommend_num = b.recommend_num, a.team_num = b.team_num, a.pk_grade = b.pk_grade, a.enable_status = b.enable_status, - a.big_team_pv = b.big_team_pv, a.small_team_pv = b.small_team_pv, - a.all_team_new_pv = b.all_team_new_pv, - a.all_team_consume_pv = b.all_team_consume_pv + a.big_team_pv = b.big_team_pv, a.small_team_pv = b.small_team_pv ,a.month_consume_pv = b.month_consume_pv ,a.team_month_pv = b.team_month_pv ,a.team_month_amount = b.team_month_amount - ,a.all_team_month_pv = b.all_team_month_pv @@ -124,10 +113,7 @@ #{item.newConsumePv} new_consume_pv, #{item.consumePv} consume_pv, #{item.monthConsumePv} month_consume_pv, #{item.teamNewPv} team_new_pv, #{item.teamConsumePv} team_consume_pv, #{item.teamMonthPv} team_month_pv, #{item.teamNewAmount} team_new_amount, #{item.teamConsumeAmount} team_consume_amount, #{item.teamMonthAmount} team_month_amount, - #{item.recommendNum} recommend_num, #{item.teamNum} team_num, #{item.enableStatus} enable_status, - #{item.allTeamNewPv} all_team_new_pv, - #{item.allTeamConsumePv} all_team_consume_pv, - #{item.allTeamMonthPv} all_team_month_pv + #{item.recommendNum} recommend_num, #{item.teamNum} team_num, #{item.enableStatus} enable_status from dual ) b @@ -137,10 +123,7 @@ a.new_consume_pv = b.new_consume_pv, a.consume_pv = b.consume_pv, a.month_consume_pv = b.month_consume_pv, a.team_new_pv = b.team_new_pv, a.team_consume_pv = b.team_consume_pv, a.team_month_pv = b.team_month_pv, a.team_new_amount = b.team_new_amount, a.team_consume_amount = b.team_consume_amount, a.team_month_amount = b.team_month_amount, - a.recommend_num = b.recommend_num, a.team_num = b.team_num, a.enable_status = b.enable_status, - a.all_team_new_pv = b.all_team_new_pv, - a.all_team_consume_pv = b.all_team_consume_pv, - a.all_team_month_pv = b.all_team_month_pv + a.recommend_num = b.recommend_num, a.team_num = b.team_num, a.enable_status = b.enable_status @@ -204,9 +187,7 @@ #{item.pkAwards} pk_awards, #{item.pkShareAwards} pk_share_awards, #{item.newConsumePv} new_consume_pv, #{item.teamNewPv} team_new_pv, - #{item.teamNewAmount} team_new_amount, #{item.enableStatus} enable_status, - #{item.allNewConsumePv} all_new_consume_pv, - #{item.allTeamNewPv} all_team_new_pv + #{item.teamNewAmount} team_new_amount, #{item.enableStatus} enable_status from dual ) b @@ -216,9 +197,7 @@ a.pk_grade = b.pk_grade, a.pk_awards = b.pk_awards, a.pk_share_awards = b.pk_share_awards, a.new_consume_pv = b.new_consume_pv, a.team_new_pv = b.team_new_pv, - a.team_new_amount = b.team_new_amount, a.enable_status = b.enable_status, - a.all_new_consume_pv = b.all_new_consume_pv, - a.all_team_new_pv = b.all_team_new_pv + a.team_new_amount = b.team_new_amount, a.enable_status = b.enable_status @@ -277,14 +256,10 @@ bwa.awards_value share_awards_value, a.big_team_pv, a.small_team_pv, - a.all_team_new_pv, - a.all_team_consume_pv, - a.all_team_month_pv, bw.range_ratio, bw.month_repurchase_ratio, bw.benefit_avg_ratio, bw.benefit_share_ratio, - br.name country_name, a.pk_vertex, bv.region_vertex_pk_id from ( @@ -298,8 +273,6 @@ on bw.pk_id = a.pk_awards left join bd_awards bwa on bwa.pk_id = a.pk_share_awards and bwa.del_flag = 0 - left join bd_area br - on br.pk_id = a.region_address and br.del_flag = 0 left join bd_vertex bv on bv.pk_id = a.pk_vertex where ba.del_flag = 0 and bw.del_flag = 0 @@ -327,8 +300,6 @@ a.big_team_pv, a.small_team_pv, a.system_type, - a.all_team_consume_pv, - a.all_team_month_pv, new_consume_pv, consume_pv, month_consume_pv, @@ -348,8 +319,7 @@ bw.range_ratio, bw.month_repurchase_ratio, bw.benefit_avg_ratio, - bw.benefit_share_ratio, - br.name country_name + bw.benefit_share_ratio from ${tableName} a inner join bd_grade ba on a.pk_grade = ba.pk_id @@ -357,8 +327,6 @@ on bw.pk_id = a.pk_awards and bw.del_flag = 0 inner join bd_awards bws on bws.pk_id = a.pk_share_awards and bws.del_flag = 0 - left join bd_area br - on br.pk_id = a.region_address and br.del_flag = 0 where ba.del_flag = 0 and a.pk_parent = #{pkParent} @@ -391,10 +359,6 @@ nvl(b.big_team_pv, 0) big_team_pv, nvl(b.small_team_pv, 0) small_team_pv, a.system_type, - a.all_new_consume_pv, - a.all_team_new_pv, - nvl(b.all_team_consume_pv, 0) + nvl(a.all_team_new_pv, 0) all_team_consume_pv, - nvl(b.all_team_month_pv, 0) + nvl(a.all_team_new_pv, 0) all_team_month_pv, bg.grade_value, bg.grade_name, bw.awards_value, @@ -404,8 +368,6 @@ bw.benefit_avg_ratio, bw.benefit_share_ratio, bws.awards_value share_awards_value, - br.name country_name, - cr.county region_address, bv.region_vertex_pk_id from ( select * @@ -422,10 +384,6 @@ on bws.pk_id = a.pk_share_awards and bws.del_flag = 0 inner join bd_grade bg on bg.pk_id = a.pk_grade - left join cu_member_retail_region cr - on cr.pk_member = cm.pk_id and cr.effective = 0 and cr.del_flag = 0 - left join bd_area br - on br.pk_id = cr.county and br.del_flag = 0 left join bd_vertex bv on bv.pk_id = cm.pk_vertex inner join bd_currency bt @@ -437,9 +395,7 @@ select cm.pk_id pk_member, cm.pk_parent, nvl(b.month_consume_pv, 0) + nvl(a.new_consume_pv, 0) month_consume_pv, - nvl(b.team_month_pv, 0) + nvl(a.team_new_pv, 0) team_month_pv, - nvl(b.all_team_consume_pv, 0) + nvl(a.all_team_new_pv, 0) all_team_consume_pv, - nvl(b.all_team_month_pv, 0) + nvl(a.all_team_new_pv, 0) all_team_month_pv + nvl(b.team_month_pv, 0) + nvl(a.team_new_pv, 0) team_month_pv from cu_member cm left join ${secondTableName} a on cm.pk_id = a.pk_member @@ -462,9 +418,7 @@ team_consume_amount, team_month_amount, big_team_pv, - small_team_pv, - all_team_consume_pv, - all_team_month_pv + small_team_pv from ${tableName} where pk_parent = #{pkParent} diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml index 73124e8f..c6a47f7e 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml @@ -330,7 +330,7 @@ customer_type, phone, pk_grade, pk_awards, account_status, pay_status, category, purchase_status, income_status, pk_team_code, pk_center_code, pk_vertex, pk_settle_country, is_real_name, - pk_country, pk_rate, pay_time, region_address, system_type, enable_status) + pk_country, pk_rate, pay_time, system_type, enable_status) select cm.pk_id, pk_parent, member_code, @@ -352,7 +352,6 @@ cm.pk_country, nvl(bc.pk_id, -1) pk_rate, cm.pay_time, - nvl(cr.county, 0) country, cm.system_type, cm.is_activate from cu_member cm @@ -365,8 +364,6 @@ and effective_date <= sysdate group by pk_country) bc on cm.pk_settle_country = bc.pk_country - left join cu_member_retail_region cr - on cr.pk_member = cm.pk_id and cr.effective = 0 and cr.del_flag = 0 where cm.del_flag = 0 @@ -441,25 +438,6 @@ - - - update ${rangeTableName} - set pk_awards = (select pk_id from bd_awards where awards_value = 0), - pk_share_awards = (select pk_id from bd_awards where awards_value = 0) - - - - - update ${rangeTableName} - set pk_awards = (select pk_id from bd_awards where awards_value = 5), - pk_share_awards = (select pk_id from bd_awards where awards_value = 5) - where pk_grade = ( - select pk_id - from bd_grade - where grade_value = 70 and del_flag = 0 - ) - - CREATE TABLE ${tableName} ( @@ -512,20 +490,30 @@ new_consume_pv number(17,6) default 0 not null, consume_pv number(17,6) default 0 not null, month_consume_pv number(17,6) default 0 not null, + new_consume_amount number(17,6) default 0 not null, + consume_amount number(17,6) default 0 not null, + month_consume_amount number(17,6) default 0 not null, + team_new_pv number(17,6) default 0 not null, team_consume_pv number(17,6) default 0 not null, team_month_pv number(17,6) default 0 not null, team_new_amount number(17,6) default 0 not null, team_consume_amount number(17,6) default 0 not null, team_month_amount number(17,6) default 0 not null, + recommend_num number(8) default 0 not null, team_num number(8) default 0 not null, - region_address number(8) default 0 not null, big_team_pv number(17,6) default 0 not null, small_team_pv number(17,6) default 0 not null, - all_team_new_pv number(17,6) default 0 not null, - all_team_consume_pv number(17,6) default 0 not null, - all_team_month_pv number(17,6) default 0 not null + + reg_consume_new_amount number(17,6) default 0 not null, + reg_consume_new_pv number(17,6) default 0 not null, + reg_team_new_amount number(17,6) default 0 not null, + reg_team_new_pv number(17,6) default 0 not null, + rep_consume_new_amount number(17,6) default 0 not null, + rep_consume_new_pv number(17,6) default 0 not null, + rep_team_new_amount number(17,6) default 0 not null, + rep_team_new_pv number(17,6) default 0 not null ) diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml index 30cffac9..9f270851 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml @@ -328,72 +328,4 @@ and #{endDate} > so.pay_time - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml index 26167ec1..94b2e756 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml @@ -483,8 +483,8 @@ currentMonth.ENABLE_STATUS, NVL( NVL( currentDay.ALL_NEW_CONSUME_PV, 0 ) + NVL( currentDay.ALL_TEAM_NEW_PV, 0 ), 0 ) todayPv, NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_NEW_PV, 0 ), 0 ) yesterdayPv, - NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentMonth.ALL_TEAM_MONTH_PV, 0 ) + NVL( currentDay.ALL_NEW_CONSUME_PV, 0 ) + NVL( currentDay.ALL_TEAM_NEW_PV, 0 ), 0 ) currentMonthPv, - NVL( lastMonth.MONTH_CONSUME_PV, 0 ) + NVL( lastMonth.ALL_TEAM_MONTH_PV, 0 ) lastMonthPv + NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_MONTH_PV, 0 ) + NVL( currentDay.ALL_NEW_CONSUME_PV, 0 ) + NVL( currentDay.ALL_TEAM_NEW_PV, 0 ), 0 ) currentMonthPv, + NVL( lastMonth.MONTH_CONSUME_PV, 0 ) + NVL( lastMonth.TEAM_MONTH_PV, 0 ) lastMonthPv FROM cu_member cu LEFT JOIN ${param.currentDayTableName} currentDay ON cu.PK_ID = currentDay.PK_MEMBER diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java index 362a5a3f..59771dc9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java @@ -30,11 +30,6 @@ public class TableNameConstants { */ public static final String CU_MEMBER_SETTLE = "cu_member_settle"; - /** - * 会员级差计算表 - */ - public static final String CU_MEMBER_RANGE = "CU_MEMBER_RANGE"; - /** * 会员级差计算表 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailDetail.java new file mode 100644 index 00000000..eb417641 --- /dev/null +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailDetail.java @@ -0,0 +1,163 @@ +package com.hzs.common.domain.member.achieve; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import com.hzs.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 日结算阶段表 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@KeySequence("CU_MEMBER_RETAIL_DETAIL_SEQ") +@TableName("CU_MEMBER_RETAIL_DETAIL") +public class CuMemberRetailDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("PK_ID") + private Long pkId; + + /** + * 会员ID + */ + @TableField("PK_MEMBER") + private Long pkMember; + + /** + * 会员子节点 + */ + @TableField("CHILD_NODE") + private Integer childNode; + + /** + * 推荐人 + */ + @TableField("PK_PARENT") + private Long pkParent; + + /** + * 三个阶段（1、2、3） + */ + @TableField("STAGE") + private Integer stage; + + /** + * 阶段状态（0=已完成，1=未完成） + */ + @TableField("STAGE_STATUS") + private Integer stageStatus; + + /** + * 阶段完成时间 + */ + @TableField("STAGE_DATE") + private Date stageDate; + + /** + * 点位1-1 + */ + @TableField("POINT_11") + private Long point11; + + /** + * 点位1-2 + */ + @TableField("POINT_12") + private Long point12; + + /** + * 点位2-1 + */ + @TableField("POINT_21") + private Long point21; + + /** + * 点位2-2 + */ + @TableField("POINT_22") + private Long point22; + + /** + * 点位2-3 + */ + @TableField("POINT_23") + private Long point23; + + /** + * 点位2-4 + */ + @TableField("POINT_24") + private Long point24; + + /** + * 点位3-1 + */ + @TableField("POINT_31") + private Long point31; + + /** + * 点位3-2 + */ + @TableField("POINT_32") + private Long point32; + + /** + * 点位3-3 + */ + @TableField("POINT_33") + private Long point33; + + /** + * 点位3-4 + */ + @TableField("POINT_34") + private Long point34; + + /** + * 点位3-5 + */ + @TableField("POINT_35") + private Long point35; + + /** + * 点位3-6 + */ + @TableField("POINT_36") + private Long point36; + + /** + * 点位3-7 + */ + @TableField("POINT_37") + private Long point37; + + /** + * 点位3-8 + */ + @TableField("POINT_38") + private Long point38; + + /** + * 点位类型（0=普通，1=赠送点位） + */ + @TableField("POINT_TYPE") + private Integer pointType; + + /** + * 赠点数量（三阶段走完赠送几个点位） + */ + @TableField("POINT_GIFT") + private Integer pointGift; + + +} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java index 502dbcb8..6674ed4e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java @@ -107,12 +107,6 @@ public class CuMemberRetailRange extends BaseEntity { @TableField("PK_RATE") private Integer pkRate; - /** - * 系统类型（2=新零售） - */ - @TableField("SYSTEM_TYPE") - private Integer systemType; - /** * 本人当天新消费pv */ @@ -173,12 +167,6 @@ public class CuMemberRetailRange extends BaseEntity { @TableField("TEAM_NUM") private Integer teamNum; - /** - * 县级区域地址 - */ - @TableField("REGION_ADDRESS") - private Integer regionAddress; - @TableField("big_team_pv") private BigDecimal bigTeamPv; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java index 7b205f47..521ef441 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java @@ -72,11 +72,6 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange { */ private BigDecimal coachRatio; - /** - * 县级名称 - */ - private String countryName; - /** * 团队累计消费pv（不管激活，全累计） -- 日结使用 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java index 6bc02d02..9b37d21b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java @@ -3,13 +3,11 @@ package com.hzs.common.domain.sale.ext; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.sale.wares.ext.WaresRangeTmp; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * 订单详情扩展 @@ -179,9 +177,4 @@ public class SaOrderItemsExt extends SaOrderItems { */ private BigDecimal supplyPrice; - /** - * 极差数据 - */ - private List waresRangeTmpList; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresRangeTmp.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresRangeTmp.java deleted file mode 100644 index 07ffb509..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresRangeTmp.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.common.domain.sale.wares.ext; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 极差明细临时实体 - */ -@Data -public class WaresRangeTmp { - - /** - * 价格 - */ - private BigDecimal rangePrice; - - /** - * 级别值 - */ - private Integer rangeValue; - -} diff --git a/code-util/src/test/java/com/CodeGenerator.java b/code-util/src/test/java/com/CodeGenerator.java index 085d10fd..5aae5688 100644 --- a/code-util/src/test/java/com/CodeGenerator.java +++ b/code-util/src/test/java/com/CodeGenerator.java @@ -20,7 +20,7 @@ public class CodeGenerator { // 模块名称（包名） String moduleName = "com.hzs.common.domain"; // 表名 - String[] tables = {"BD_VERTEX_SYSTEM"}; + String[] tables = {"CU_MEMBER_RETAIL_DETAIL"}; // 生成实体是否继承统一父类 boolean superBool = true; @@ -50,8 +50,8 @@ public class CodeGenerator { // dsc.setSchemaName("public"); dataSourceConfig.setUrl("jdbc:oracle:thin:@101.201.51.180:1521/orcl") .setDriverName("oracle.jdbc.driver.OracleDriver") - .setUsername("retail") - .setPassword("pwRetailTest180") + .setUsername("cloud_zk") + .setPassword("pwCloudzk180") .setDbType(DbType.ORACLE); mpg.setDataSource(dataSourceConfig);