diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index c35f662e..aaf14a4e 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -86,7 +86,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { sourceMemberRangeExt.setConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getConsumePv(), orderAchieve)); sourceMemberRangeExt.setMonthConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthConsumePv(), orderAchieve)); // 累计业绩，不管激活不激活都处理，兼容不激活判断显示有问题 - sourceMemberRangeExt.setAllNewConsumePv(sourceMemberRangeExt.getAllNewConsumePv().add(orderAchieve)); +// sourceMemberRangeExt.setAllNewConsumePv(sourceMemberRangeExt.getAllNewConsumePv().add(orderAchieve)); // 会员奖衔升级记录 List cuMemberAwardsList = new ArrayList<>(); @@ -187,7 +187,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (isSecond) { // 当天 // 累计业绩，不管激活不激活都处理，兼容不激活判断显示有问题 - sourceMemberRangeExt.setAllNewConsumePv(sourceMemberRangeExt.getAllNewConsumePv().subtract(orderAchieve)); +// sourceMemberRangeExt.setAllNewConsumePv(sourceMemberRangeExt.getAllNewConsumePv().subtract(orderAchieve)); } // 会员奖衔map 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 43b607f0..73124e8f 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 @@ -461,20 +461,24 @@ - create table ${tableName} + CREATE TABLE ${tableName} ( - pk_member NUMBER(20) not null, - pk_parent NUMBER(20) not null, - pk_grade NUMBER(4) not null, - pk_awards number(4) default 10 not null, - pk_share_awards number(4) default 10 not null, - enable_status number(2) default 1 not null, - system_type NUMBER(2) default 2 not null, - new_consume_pv number(17,6) default 0 not null, - team_new_pv number(17,6) default 0 not null, - team_new_amount number(17,6) default 0 not null, - all_new_consume_pv number(17,6) default 0 not null, - all_team_new_pv number(17,6) default 0 not null + "PK_MEMBER" NUMBER(20,0) NOT NULL ENABLE, + "PK_PARENT" NUMBER(20,0) NOT NULL ENABLE, + "PK_GRADE" NUMBER(4,0) NOT NULL ENABLE, + "PK_AWARDS" NUMBER(4,0) DEFAULT 10 NOT NULL ENABLE, + "ALL_CONSUME_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "ALL_CONSUME_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "ALL_TEAM_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "ALL_TEAM_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_CONSUME_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_CONSUME_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_TEAM_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_TEAM_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_CONSUME_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_CONSUME_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_TEAM_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_TEAM_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE ) 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 616232ac..7b205f47 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 @@ -77,16 +77,6 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange { */ private String countryName; - /** - * 新増业绩（不管激活，全累计） -- 秒结使用 - */ - private BigDecimal allNewConsumePv; - - /** - * 团队新増业绩（不管激活，全累计） -- 秒结使用 - */ - private BigDecimal allTeamNewPv; - /** * 团队累计消费pv（不管激活，全累计） -- 日结使用 */ @@ -96,4 +86,55 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange { */ private BigDecimal allTeamMonthPv; + // 秒结 start + /** + * 本日-个人所有新增金额 + */ + private BigDecimal allConsumeNewAmount; + /** + * 本日-个人所有新增业绩 + */ + private BigDecimal allConsumeNewPv; + /** + * 本日-团队所有新增金额 + */ + private BigDecimal allTeamNewAmount; + /** + * 本日-团队所有新增业绩 + */ + private BigDecimal allTeamNewPv; + /** + * 本日-个人注册(精品专区)新增金额 + */ + private BigDecimal regConsumeNewAmount; + /** + * 本日-个人注册(精品专区)新增业绩 + */ + private BigDecimal regConsumeNewPv; + /** + * 本日-团队注册(精品专区)新增金额 + */ + private BigDecimal regTeamNewAmount; + /** + * 本日-团队注册(精品专区)新增业绩 + */ + private BigDecimal regTeamNewPv; + /** + * 本日-个人复购(商城专区)新增金额 + */ + private BigDecimal repConsumeNewAmount; + /** + * 本日-个人复购(商城专区)新增业绩 + */ + private BigDecimal repConsumeNewPv; + /** + * 本日-团队复购(商城专区)新增金额 + */ + private BigDecimal repTeamNewAmount; + /** + * 本日-团队复购(商城专区)新增业绩 + */ + private BigDecimal repTeamNewPv; + // 秒结 end + } diff --git a/sql/2025年9月9日_新秒结表.sql b/sql/2025年9月9日_新秒结表.sql new file mode 100644 index 00000000..4634b426 --- /dev/null +++ b/sql/2025年9月9日_新秒结表.sql @@ -0,0 +1,40 @@ +CREATE TABLE CU_MEMBER_RETAIL_S +( + "PK_MEMBER" NUMBER(20,0) NOT NULL ENABLE, + "PK_PARENT" NUMBER(20,0) NOT NULL ENABLE, + "PK_GRADE" NUMBER(4,0) NOT NULL ENABLE, + "PK_AWARDS" NUMBER(4,0) DEFAULT 10 NOT NULL ENABLE, + "ALL_CONSUME_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "ALL_CONSUME_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "ALL_TEAM_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "ALL_TEAM_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_CONSUME_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_CONSUME_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_TEAM_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REG_TEAM_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_CONSUME_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_CONSUME_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_TEAM_NEW_AMOUNT" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE, + "REP_TEAM_NEW_PV" NUMBER(17,6) DEFAULT 0 NOT NULL ENABLE +); + +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."PK_MEMBER" IS '会员ID'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."PK_PARENT" IS '推荐人ID'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."PK_GRADE" IS '会员等级'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."PK_AWARDS" IS '会员奖衔'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."ALL_CONSUME_NEW_AMOUNT" IS '本日-个人所有新增金额'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."ALL_CONSUME_NEW_PV" IS '本日-个人所有新增业绩'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."ALL_TEAM_NEW_AMOUNT" IS '本日-团队所有新增金额'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."ALL_TEAM_NEW_PV" IS '本日-团队所有新增业绩'; + +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REG_CONSUME_NEW_AMOUNT" IS '本日-个人注册(精品专区)新增金额'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REG_CONSUME_NEW_PV" IS '本日-个人注册(精品专区)新增业绩'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REG_TEAM_NEW_AMOUNT" IS '本日-团队注册(精品专区)新增金额'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REG_TEAM_NEW_PV" IS '本日-团队注册(精品专区)新增业绩'; + +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REP_CONSUME_NEW_AMOUNT" IS '本日-个人复购(商城专区)新增金额'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REP_CONSUME_NEW_PV" IS '本日-个人复购(商城专区)新增业绩'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REP_TEAM_NEW_AMOUNT" IS '本日-团队复购(商城专区)新增金额'; +COMMENT ON COLUMN CU_MEMBER_RETAIL_S."REP_TEAM_NEW_PV" IS '本日-团队复购(商城专区)新增业绩'; + +COMMENT ON TABLE "CU_MEMBER_RETAIL_S" IS '秒结表';