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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sangelxiu1 2025-09-16 17:07:27 +08:00
parent 5c2b8e6562 188b733d80
commit 8b52bbb00f
29 changed files with 280 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailDetailMapper.java Normal file
View File

@ -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<CuMemberRetailDetail> {
}

10
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
View File

@ -111,16 +111,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
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);
/**
* 根据订单，查询出网体中记录的会员数据，推荐人、安置人
*

11
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java Normal file
View File

@ -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<CuMemberRetailDetail> {
}

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java
View File

@ -49,11 +49,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
**/
void updateCuMemberRetailRangeAwardByDate(String rangeTableName, Date settleDate);
/**
* 初始化期间奖衔
*/
void updateCuMemberRetailRangeInitAward(String rangeTableName);
/**
* 删除日表数据
*

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

@ -99,15 +99,15 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
cuMemberAchieve.setRepNewAmount(saOrder.getOrderAmount());
cuMemberAchieve.setRepNewPv(saOrder.getOrderAchieve());
}
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);
}
// 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;
}

15
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.java Normal file
View File

@ -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<CuMemberRetailDetailMapper, CuMemberRetailDetail> implements ICuMemberRetailDetailService {
}

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

@ -38,11 +38,11 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
Integer number = baseMapper.queryExistOracleTable(settleTableName);
if (number == null || number <= 0) {
baseMapper.createCuMemberSettleTable(settleTableName);
baseMapper.createCuMemberTreeDayOnlyIndex(settleTableName);
baseMapper.createCuMemberTreeParentIndex(settleTableName);
baseMapper.createCuMemberTreePlaceIndex(settleTableName);
// baseMapper.createCuMemberTreeDayOnlyIndex(settleTableName);
// baseMapper.createCuMemberTreeParentIndex(settleTableName);
// baseMapper.createCuMemberTreePlaceIndex(settleTableName);
}
// 创建新零售级差结算记录表
// 创建结算记录表
String retailRangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
number = baseMapper.queryExistOracleTable(retailRangeTableName);
if (number == null || number <= 0) {
@ -54,6 +54,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
if (number == null || number <= 0) {
baseMapper.insertCuMemberRetailRangeByMember(retailRangeTableName);
}
// TODO 创建结算明细表
// 创建月表记录表
createMonthTreeTableName(date);
@ -114,12 +116,6 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
baseMapper.updateCuMemberRetailRangeAwardByDate(rangeTableName, settleDate, EAwardsType.SHARE_TYPE.getValue());
}
@Override
public void updateCuMemberRetailRangeInitAward(String rangeTableName) {
baseMapper.updateCuMemberRetailRangeInitAward(rangeTableName);
baseMapper.updateCuMemberRetailRangeInitV5Award(rangeTableName);
}
@Override
public void truncateCuMemberTreeTable(String tableName) {
baseMapper.truncateCuMemberTreeTable(tableName);

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -295,12 +295,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
iCuMemberRetailRangeService.mergeMemberRetailRangeByYesterday(settleEndDate, rangeTableName, yesterdayRangeTableName, isSameMonth);
if (retailOrderList.size() > 0) {
// 复购订单级差数据map(key:订单ID，value:订单明细+级差)
Map<Long, List<SaOrderItemsExt>> rangeOrderMap = new HashMap<>();
if (CollectionUtil.isNotEmpty(repurchaseOrderList)) {
rangeOrderMap = iBonusOrderService.getWaresRange(repurchaseOrderList);
}
// 按照血缘，查询该会员所有伞上会员
List<CuMemberRetailRangeExt> memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList);

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAwardsServiceImpl.java
View File

@ -39,12 +39,6 @@ public class CuMemberAwardsServiceImpl extends ServiceImpl<CuMemberAwardsMapper,
@Override
public void calculateCuMemberRetailRangeAwardsInit(String settleDate, Integer period, String rangeTableName) {
if (settleDate.endsWith("01")) {
// 每月1号初始化结算表奖衔（月度奖衔归0，V5给S1奖衔）
iCuMemberTreeService.updateCuMemberRetailRangeInitAward(rangeTableName);
// 每月1号初始化会员表奖衔（月度奖衔归0，V5给S1奖衔）
iCuMemberService.updateCuMemberRetailRangeInitAward();
}
// 回退结算表奖衔
iCuMemberTreeService.updateBackCuMemberRetailRangeAward(rangeTableName, period);
// 回退会员表奖衔

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/mapper/BonusOrderMapper.java
View File

@ -41,12 +41,4 @@ public interface BonusOrderMapper {
@Param("endDate") Date endDate,
@Param("orderType") List<Integer> orderType);
/**
* 查询订单商品级差数据
*
* @param orderList 订单列表
* @return
*/
List<SaOrderItemsExt> listOrderWaresRange(@Param("orderList") List<SaOrderExt> orderList);
}

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/IBonusOrderService.java
View File

@ -32,12 +32,4 @@ public interface IBonusOrderService {
*/
List<SaOrder> listSaOrderByTime(Date startDate, Date endDate, List<Integer> orderType);
/**
* 查询商品级差数据
*
* @param orderList
* @return
*/
Map<Long, List<SaOrderItemsExt>> getWaresRange(List<SaOrderExt> orderList);
}

22
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/order/service/impl/BonusOrderServiceImpl.java
View File

@ -41,26 +41,4 @@ public class BonusOrderServiceImpl implements IBonusOrderService {
return bonusOrderMapper.listSaOrderByTime(startDate, endDate, orderType);
}
@Override
public Map<Long, List<SaOrderItemsExt>> getWaresRange(List<SaOrderExt> orderList) {
Map<Long, List<SaOrderItemsExt>> resultMap = new HashMap<>();
List<SaOrderItemsExt> resultList = new ArrayList<>();
List<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<SaOrderItemsExt> tmpList = new ArrayList<>();
tmpList.add(saOrderItemsExt);
resultMap.put(saOrderItemsExt.getPkOrder(), tmpList);
}
}
return resultMap;
}
}

6
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailDetailMapper.xml Normal file
View File

@ -0,0 +1,6 @@
<?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">
<mapper namespace="com.hzs.bonus.achieve.mapper.CuMemberRetailDetailMapper">
</mapper>

66
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
View File

@ -38,7 +38,6 @@
<result column="TEAM_MONTH_AMOUNT" property="teamMonthAmount"/>
<result column="RECOMMEND_NUM" property="recommendNum"/>
<result column="TEAM_NUM" property="teamNum"/>
<result column="REGION_ADDRESS" property="regionAddress"/>
<result column="GRADE_VALUE" property="gradeValue"/>
<result column="GRADE_NAME" property="gradeName"/>
<result column="AWARDS_NAME" property="awardsName"/>
@ -50,12 +49,10 @@
<result column="BENEFIT_SHARE_RATIO" property="benefitShareRatio"/>
<result column="coach_algebra" property="coachAlgebra"/>
<result column="coach_ratio" property="coachRatio"/>
<result column="COUNTRY_NAME" property="countryName"/>
<result column="big_team_pv" property="bigTeamPv"/>
<result column="small_team_pv" property="smallTeamPv"/>
<result column="region_vertex_pk_id" property="regionVertexPkId"/>
<result column="all_new_consume_pv" property="allNewConsumePv"/>
<result column="all_team_new_pv" property="allTeamNewPv"/>
<result column="all_team_consume_pv" property="allTeamConsumePv"/>
<result column="all_team_month_pv" property="allTeamMonthPv"/>
@ -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
</update>
<update id="mergeMemberRetailRangeByYesterday">
@ -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
<if test="isSameMonth == 0">
,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
</if>
</update>
@ -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
</foreach>
) 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
</update>
<!-- 当前网体更新极差秒接表 -->
@ -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
</foreach>
) 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
</update>
<update id="mergeMemberRetailGradeByMember">
@ -314,14 +293,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 (
@ -335,8 +310,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
@ -364,8 +337,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,
@ -385,8 +356,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
@ -394,8 +364,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}
</select>
@ -428,10 +396,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,
@ -441,8 +405,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 *
@ -459,10 +421,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
@ -474,9 +432,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
@ -499,9 +455,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}
</select>

42
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
View File

@ -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 &lt;= 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
</insert>
@ -441,25 +438,6 @@
</if>
</update>
<!-- 初始化期间奖衔 -->
<update id="updateCuMemberRetailRangeInitAward">
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>
<!-- 初始化期间V5奖衔 -->
<update id="updateCuMemberRetailRangeInitV5Award">
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
)
</update>
<update id="createCuMemberRetailRangeSecondTable">
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
)
</update>

68
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
View File

@ -328,72 +328,4 @@
and #{endDate} > so.pay_time
</select>
<!-- 通用查询映射结果 -->
<resultMap id="SaOrderItems" type="com.hzs.common.domain.sale.ext.SaOrderItemsExt">
<result column="PK_ORDER" property="pkOrder"/>
<result column="PK_ID" property="pkId"/>
<result column="PRICE" property="price"/>
<result column="WARES_QUANTITY" property="waresQuantity"/>
<result column="PK_WARES" property="pkWares"/>
<result column="PK_PRODUCT" property="pkProduct"/>
<result column="PK_WARES_DETAIL" property="pkWaresDetail"/>
<result column="PK_WARES_SPECS_SKU" property="pkWaresSpecsSku"/>
<collection property="waresRangeTmpList" ofType="com.hzs.common.domain.sale.wares.ext.WaresRangeTmp">
<result column="RANGE_PRICE" property="rangePrice"/>
<result column="RANGE_VALUE" property="rangeValue"/>
</collection>
</resultMap>
<!-- 查询商品级差数据 -->
<select id="listOrderWaresRange" resultMap="SaOrderItems">
select soi.pk_order,
soi.pk_id,
soi.price,
soi.wares_quantity,
bwr.pk_wares,
bwr.pk_product,
bwr.pk_wares_detail,
bwr.pk_wares_specs_sku,
bwr.price range_price,
br.range_value
from (select so.pk_id pk_order,
soi.pk_id,
soi.pk_wares,
soi.pk_product,
soi.pk_wares_detail,
soi.pk_wares_specs_sku,
soi.price,
max(soi.wares_quantity) wares_quantity
from sa_order so
left join sa_order_items soi
on soi.pk_order = so.pk_id
where so.del_flag = 0
and soi.del_flag = 0
and soi.is_gift = 1
and so.order_code in
<foreach collection="orderList" item="items" open="(" separator="," close=")">
#{items.orderCode}
</foreach>
group by so.pk_id,
soi.pk_id,
soi.pk_wares,
soi.pk_product,
soi.pk_wares_detail,
soi.pk_wares_specs_sku,
soi.price) soi
left join bd_wares_range bwr
on bwr.pk_wares = soi.pk_wares
and bwr.pk_product = soi.pk_product
and bwr.pk_wares_detail = soi.pk_wares_detail
and bwr.pk_wares_specs_sku = soi.pk_wares_specs_sku
left join bd_range br
on br.pk_id = bwr.pk_range
and br.del_flag = 0
order by bwr.pk_wares,
bwr.pk_product,
bwr.pk_wares_detail,
bwr.pk_wares_specs_sku,
br.range_value
</select>
</mapper>

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

@ -3225,7 +3225,13 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 根据类型查询所有人各类型的订单业绩汇总
List<CensusSummaryVo> censusSummaryList = new ArrayList<>();
for (String day : days) {
censusSummaryParam.setTime(day);
censusSummaryParam.setTime(day);// 将体系转换成集合类型
if (censusSummaryParam.getPkBdVertexStr() != null) {
censusSummaryParam.setPkBdVertexStrList(Arrays.stream(censusSummaryParam.getPkBdVertexStr().split(","))
.map(Integer::valueOf)
.collect(Collectors.toList()));
}
List<MemberMeritsSummaryVo> memberMeritsSummaryVoList = baseMapper.queryDateBySummary(censusSummaryParam);
Map<Integer, MemberMeritsSummaryVo> memberMeritsSummaryMap = memberMeritsSummaryVoList.stream().collect(Collectors.toMap(MemberMeritsSummaryVo::getOrderType, Function.identity()));

4
bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java
View File

@ -51,5 +51,9 @@ public class CensusSummaryParam {
* 体系
*/
private String pkBdVertexStr;
/**
* 体系集合
*/
private List<Integer> pkBdVertexStrList;
}

4
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
View File

@ -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

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

@ -2368,9 +2368,9 @@
and sa.del_flag = 0
and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
and sa.pk_country = #{pkCountry}
<if test="pkVertex != null and pkVertex.size > 0 ">
<if test="pkBdVertexStrList != null and pkBdVertexStrList.size > 0 ">
and cm.pk_vertex in
<foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
<foreach collection="pkBdVertexStrList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>

47
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
View File

@ -573,12 +573,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 查询订单信息
SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
if (null == saOrder) {
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
}
// 订单支付日期 < 当前日期-7天
Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED);
return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
}
// 操作日志内容
@ -644,16 +644,14 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
return "订单已经发货，不能进行调换货物";
}
// 是否扣款
boolean orderCostFlag = false;
// 修改前的订单金额 + 邮费
BigDecimal beforeAmount = saOrder.getOrderAmount().add(saOrder.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
// 修改后的订单金额 + 邮费
BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
// 对比修改前后订单价格处理是否补差价
// 校验订单原订单价格和调换完货之后的价格不相同不进行换货
if (beforeAmount.compareTo(afterAmount) != 0) {
// 修改前后金额不相同则进行处理
orderCostFlag = true;
return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
}
if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@ -662,13 +660,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
changeIdList, noChangeIdList,
userId, pkCountry, nowDate);
if (orderCostFlag) {
// 订单调换货物扣费处理
R resultR = iMemberAccountServiceApi.orderChangeProduct(saOrder, updateOrder, userId, dto);
if (!resultR.isSuccess()) {
throw new BaseException(resultR.getMsg());
}
} else if (null != dto) {
if (null != dto) {
// 订单总价未变化，但是需要手续费
R resultR = iMemberAccountServiceApi.orderChangeProduct(null, null, userId, dto);
if (!resultR.isSuccess()) {
@ -701,12 +693,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 查询订单收货地址信息
SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
if (null == saOrder) {
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
}
// 订单支付日期 < 当前日期-7天
Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED);
return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
}
// 涉及会员ID列表
@ -751,24 +743,9 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
BigDecimal beforeAmount = saOrder.getOrderAmount().add(saOrder.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
// 修改后的订单金额 + 邮费
BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
// 对比修改前后订单价格处理是否补差价
if (beforeAmount.compareTo(afterAmount) < 0) {
// 存在差额
// 封装订单数据
SaOrder updateOrder = BeanUtil.copyProperties(saOrder, SaOrder.class);
updateOrder.setPkId(saOrder.getPkId());
updateOrder.setOrderAmount(afterData.getOrderAmount());
updateOrder.setOrderAchieve(afterData.getOrderAchieve());
updateOrder.setOrderAssAchieve(afterData.getOrderAssAchieve());
updateOrder.setPostage(param.getPostage());
updateOrder.setPkModified(userId);
updateOrder.setModifiedTime(nowDate);
// 校验订单支付金额是否足够
R resultR = iMemberAccountServiceApi.orderChangeProductPre(saOrder, updateOrder);
if (!resultR.isSuccess()) {
return resultR.getMsg();
}
//校验订单原订单价格和调换完货之后的价格不相同不进行换货
if (beforeAmount.compareTo(afterAmount) != 0) {
return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
}
if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@ -782,7 +759,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
}
return submitStr;
}
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED);
return CommonMsgConstants.OPERATION_FAILED;
}
@Transactional(rollbackFor = Exception.class)

5
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java
View File

@ -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";
/**
* 会员级差计算表
*/

4
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java
View File

@ -172,5 +172,9 @@ public class SaOrderMsgConstants {
* 商品预售数量不足
*/
public static final String WARES_PRE_SALE_QUANTITY_LACK = "商品预售数量不足";
/**
* 原订单价格和调换完货之后的价格不相同 -- 不允许货物调换
*/
public static final String PRODUCT_CONFIRM_PRICE = "原订单价格和调换完货之后的价格不相同";
}

163
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailDetail.java Normal file
View File

@ -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;
}

12
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java
View File

@ -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;

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java
View File

@ -72,11 +72,6 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange {
*/
private BigDecimal coachRatio;
/**
* 县级名称
*/
private String countryName;
/**
* 团队累计消费pv（不管激活，全累计） -- 日结使用
*/

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderItemsExt.java
View File

@ -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<WaresRangeTmp> waresRangeTmpList;
}

23
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresRangeTmp.java
View File

@ -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;
}

6
code-util/src/test/java/com/CodeGenerator.java
View File

@ -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);