angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

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

This commit is contained in:
sangelxiu1 2025-09-05 10:02:13 +08:00
parent 422a887fe6 b12010689f
commit 6cf6ae2cc9
4 changed files with 97 additions and 25 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/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -212,6 +212,8 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
BigDecimal boxNum = saOrderExt.getBoxNum();
// 个人累计消费pv
BigDecimal orderAchieve = saOrderExt.getOrderAchieve();
// 个人累计消费金额
BigDecimal orderAmount = saOrderExt.getOrderAmount();
// 复购、重消，盒数、业绩算个人累计数据（盒数、业绩）
sourceMemberRangeExt.setNewBoxNum(sourceMemberRangeExt.getNewBoxNum().add(boxNum));
sourceMemberRangeExt.setConsumeBoxNum(sourceMemberRangeExt.getConsumeBoxNum().add(boxNum));
@ -219,6 +221,15 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
sourceMemberRangeExt.setNewConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getNewConsumePv(), orderAchieve));
sourceMemberRangeExt.setConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getConsumePv(), orderAchieve));
sourceMemberRangeExt.setMonthConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthConsumePv(), orderAchieve));
sourceMemberRangeExt.setNewConsumeAmount(ComputeUtil.computeAdd(sourceMemberRangeExt.getNewConsumeAmount(), orderAmount));
sourceMemberRangeExt.setConsumeAmount(ComputeUtil.computeAdd(sourceMemberRangeExt.getConsumeAmount(), orderAmount));
sourceMemberRangeExt.setMonthConsumeAmount(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthConsumeAmount(), orderAmount));
if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) {
// 复购
sourceMemberRangeExt.setMonthRepBoxNum(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthRepBoxNum(), boxNum));
sourceMemberRangeExt.setMonthRepConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthRepConsumePv(), orderAchieve));
sourceMemberRangeExt.setMonthRepConsumeAmount(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthRepConsumeAmount(), orderAmount));
}
if (EYesNo.NO.getIntValue() == sourceMemberRangeExt.getEnableStatus()
&& activateMap.containsKey(sourceMemberRangeExt.getPkMember())) {
// 存在手动激活

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

@ -62,30 +62,36 @@
<update id="mergeMemberRetailRangeInit">
update ${rangeTableName}
set new_box_num = 0,
consume_box_num = 0,
month_box_num = 0,
new_consume_pv = 0,
consume_pv = 0,
month_consume_pv = 0,
team_new_box_num = 0,
team_box_num = 0,
team_month_box_num = 0,
team_new_pv = 0,
team_consume_pv = 0,
team_month_pv = 0,
team_new_amount = 0,
team_consume_amount = 0,
team_month_amount = 0,
recommend_num = 0,
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_box_num = 0,
small_box_num = 0,
big_team_pv = 0,
small_team_pv = 0
set new_box_num = 0,
consume_box_num = 0,
month_box_num = 0,
new_consume_pv = 0,
consume_pv = 0,
month_consume_pv = 0,
new_consume_amount = 0,
consume_amount = 0,
month_consume_amount = 0,
team_new_box_num = 0,
team_box_num = 0,
team_month_box_num = 0,
team_new_pv = 0,
team_consume_pv = 0,
team_month_pv = 0,
team_new_amount = 0,
team_consume_amount = 0,
team_month_amount = 0,
month_rep_box_num = 0,
month_rep_consume_pv = 0,
month_rep_consume_amount = 0,
recommend_num = 0,
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_box_num = 0,
small_box_num = 0,
big_team_pv = 0,
small_team_pv = 0
</update>
<update id="mergeMemberRetailRangeByYesterday">
@ -94,9 +100,11 @@
select pk_member, pk_grade, pk_awards, pk_share_awards, enable_status,
new_box_num, consume_box_num, month_box_num,
new_consume_pv, consume_pv, month_consume_pv,
new_consume_amount, consume_amount, month_consume_amount,
team_new_box_num, team_box_num, team_month_box_num,
team_new_pv, team_consume_pv, team_month_pv,
team_new_amount, team_consume_amount, team_month_amount,
month_rep_box_num, month_rep_consume_pv, month_rep_consume_amount,
recommend_num, team_num,
big_box_num, small_box_num, big_team_pv, small_team_pv
from ${yesterdayRangeTableName}
@ -106,6 +114,7 @@
update set
a.consume_box_num = b.consume_box_num,
a.consume_pv = b.consume_pv,
a.consume_amount = b.consume_amount,
a.team_box_num = b.team_box_num,
a.team_consume_pv = b.team_consume_pv,
a.team_consume_amount = b.team_consume_amount,
@ -117,9 +126,13 @@
<if test="isSameMonth == 0">
,a.month_box_num = b.month_box_num
,a.month_consume_pv = b.month_consume_pv
,a.month_consume_amount = b.month_consume_amount
,a.team_month_box_num = b.team_month_box_num
,a.team_month_pv = b.team_month_pv
,a.team_month_amount = b.team_month_amount
,a.month_rep_box_num = b.month_rep_box_num
,a.month_rep_consume_pv = b.month_rep_consume_pv
,a.month_rep_consume_amount = b.month_rep_consume_amount
</if>
</update>
@ -130,9 +143,11 @@
select #{item.pkMember} pk_member, #{item.pkGrade} pk_grade,
#{item.newBoxNum} new_box_num, #{item.consumeBoxNum} consume_box_num, #{item.monthBoxNum} month_box_num,
#{item.newConsumePv} new_consume_pv, #{item.consumePv} consume_pv, #{item.monthConsumePv} month_consume_pv,
#{item.newConsumeAmount} new_consume_amount, #{item.consumeAmount} consume_amount, #{item.monthConsumeAmount} month_consume_amount,
#{item.teamNewBoxNum} team_new_box_num, #{item.teamBoxNum} team_box_num, #{item.teamMonthBoxNum} team_month_box_num,
#{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.monthRepBoxNum} month_rep_box_num, #{item.monthRepConsumePv} month_rep_consume_pv, #{item.monthRepConsumeAmount} month_rep_consume_amount,
#{item.recommendNum} recommend_num, #{item.teamNum} team_num, #{item.enableStatus} enable_status
from dual
</foreach>
@ -142,9 +157,11 @@
update set a.pk_grade = b.pk_grade,
a.new_box_num = b.new_box_num, a.consume_box_num = b.consume_box_num, a.month_box_num = b.month_box_num,
a.new_consume_pv = b.new_consume_pv, a.consume_pv = b.consume_pv, a.month_consume_pv = b.month_consume_pv,
a.new_consume_amount = b.new_consume_amount, a.consume_amount = b.consume_amount, a.month_consume_amount = b.month_consume_amount,
a.team_new_box_num = b.team_new_box_num, a.team_box_num = b.team_box_num, a.team_month_box_num = b.team_month_box_num,
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.month_rep_box_num = b.month_rep_box_num, a.month_rep_consume_pv = b.month_rep_consume_pv, a.month_rep_consume_amount = b.month_rep_consume_amount,
a.recommend_num = b.recommend_num, a.team_num = b.team_num, a.enable_status = b.enable_status
</update>
@ -172,6 +189,9 @@
new_consume_pv,
consume_pv,
month_consume_pv,
new_consume_amount,
consume_amount,
month_consume_amount,
team_new_box_num,
team_box_num,
team_month_box_num,
@ -181,6 +201,9 @@
team_new_amount,
team_consume_amount,
team_month_amount,
month_rep_box_num,
month_rep_consume_pv,
month_rep_consume_amount,
recommend_num,
team_num,
ba.grade_value,

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

@ -440,6 +440,9 @@
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_box_num number(10,2) default 0 not null,
team_box_num number(10,2) default 0 not null,
team_month_box_num number(10,2) default 0 not null,
@ -455,7 +458,10 @@
big_box_num number(10,2) default 0 not null,
small_box_num number(10,2) default 0 not null,
big_team_pv number(17,6) default 0 not null,
small_team_pv number(17,6) default 0 not null
small_team_pv number(17,6) default 0 not null,
month_rep_box_num number(17,6) default 0 not null,
month_rep_consume_pv number(17,6) default 0 not null,
month_rep_consume_amount number(17,6) default 0 not null
)
</update>

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

@ -145,6 +145,38 @@ public class CuMemberRetailRange extends BaseEntity {
@TableField("MONTH_CONSUME_PV")
private BigDecimal monthConsumePv;
/**
* 本人当天新消费金额
*/
@TableField("NEW_CONSUME_AMOUNT")
private BigDecimal newConsumeAmount;
/**
* 本人累计消费金额
*/
@TableField("CONSUME_AMOUNT")
private BigDecimal consumeAmount;
/**
* 本人月累计消费金额
*/
@TableField("MONTH_CONSUME_AMOUNT")
private BigDecimal monthConsumeAmount;
/**
* 本人月复购累计盒数
*/
@TableField("MONTH_REP_BOX_NUM")
private BigDecimal monthRepBoxNum;
/**
* 本人月复购累计消费pv
*/
@TableField("MONTH_REP_CONSUME_PV")
private BigDecimal monthRepConsumePv;
/**
* 本人月复购累计消费金额
*/
@TableField("MONTH_REP_CONSUME_AMOUNT")
private BigDecimal monthRepConsumeAmount;
// @TableField("own_box_num")
// private Integer ownBoxNum;