From 38910b22fc2e9e543c4a2c3fd17acb4f8f4178bd Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 20 Jun 2025 17:04:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(CuMember):=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=A7=BB=E9=99=A4=E5=A5=96=E9=A1=B9=E5=8F=8A?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E5=8C=BA=E5=9F=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/member/base/vo/RetailMemberVO.java | 42 ------------------- .../mapper/member/base/CuMemberMapper.xml | 38 +---------------- 2 files changed, 1 insertion(+), 79 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java index 39db0474..46745306 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java @@ -64,28 +64,6 @@ public class RetailMemberVO implements Serializable { @Excel(name = "推荐姓名") private String parMemberName; - /** - * 当月奖衔 - */ - private Integer pkAwards; - @Excel(name = "当月奖衔") - private String pkAwardsVal; - - /** - * 分红奖衔 - */ - private Integer pkRangeAwards; - @Excel(name = "分红奖衔") - private String pkRangeAwardsVal; - - /** - * 荣誉奖衔 - */ - private Integer pkMaxAwards; - @Excel(name = "荣誉奖衔") - private String pkMaxAwardsVal; - - /** * 订单来源 (1=实单注册,2=空单注册)订单状态 EOrderSource */ @@ -161,26 +139,6 @@ public class RetailMemberVO implements Serializable { private String memberAccountVal; @Excel(name = "收益状态") private String incomeStatusVal; - /** - * 省 - */ - @Excel(name = "收益区省") - private String giftProvince; - - private Integer province; - - /** - * 市 - */ - @Excel(name = "收益区市") - private String giftCity; - private Integer city; - /** - * 县（区） - */ - @Excel(name = "收益区县(区)") - private String giftCounty; - private Integer county; /** * 创建时间 */ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index ae36b406..664a902c 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2293,25 +2293,13 @@ cmt.team_name as teamName, gr.grade_name as pkRegisterGradeVal, grr.grade_name as pkSettleGradeVal, - awa.awards_name as pkAwardsVal, - awar.awards_name as pkRangeAwardsVal, - awm.awards_name as pkMaxAwardsVal, par.member_code parMemberCode, - par.member_name parMemberName, - pr.NAME giftProvince, - cty.NAME giftCity, - con.NAME giftCounty + par.member_name parMemberName FROM cu_member cm inner join CU_MEMBER_ACCOUNT cma on cm.pk_id = cma.PK_MEMBER left join cu_member par ON par.pk_id = cm.pk_parent - left join bd_awards awa - on awa.pk_id = cm.pk_awards - left join bd_awards awar - on awar.pk_id = cm.pk_range_awards - left join bd_awards awm - on awm.pk_id = cm.pk_max_awards left join bd_grade gr on gr.pk_id = cm.PK_REGISTER_GRADE left join bd_grade grr @@ -2322,12 +2310,6 @@ on cmt.pk_id = cm.pk_team_code left join CU_MEMBER_RETAIL_REGION cmrr on cm.pk_id = cmrr.PK_MEMBER and cmrr.effective = 0 and cmrr.del_flag = 0 - left join BD_AREA pr - on pr.pk_id = cmrr.PROVINCE - left join BD_AREA cty - on cty.pk_id = cmrr.CITY - left join BD_AREA con - on con.pk_id = cmrr.COUNTY WHERE cm.del_flag = 0 and cm.pk_id in ( SELECT cm.PK_ID @@ -2417,15 +2399,6 @@ and cm.pk_settle_grade = #{pkSettleGrade} - - and cm.pk_awards = #{pkAwards} - - - and cm.pk_range_awards = #{pkRangeAwards} - - - and cm.pk_max_awards = #{pkMaxAwards} - and cm.DIRECT_PUSH_NUMBER=#{directPushNumber} @@ -2450,15 +2423,6 @@ and cma.IS_CONSUME=#{isConsume} - - and cmrr.PROVINCE=#{province} - - - and cmrr.CITY=#{city} - - - and cmrr.COUNTY=#{county} - and ver.pk_member in From f71826c676916bdbe655b8dffbe231bfad2286b9 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sat, 21 Jun 2025 09:21:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?##=20=E6=B3=A8=E5=86=8C=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=AE=A2=E5=8D=95=E7=AD=89=E7=BA=A7=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/sale/order/service/impl/SaOrderServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 2ca1299d..f68af9b8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2660,9 +2660,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (null == memberGrade) { // 注册处理 - // 去掉 V4,V5 升级盒数小于购买盒数的最大一个等级为注册等级 + // 小于V4等级 并且 升级盒数小于购买盒数的最大一个等级为注册等级 return gradeList.stream() - .filter(tmpGrade -> tmpGrade.getGradeValue() != EGrade.VIP.getValue() && tmpGrade.getGradeValue() != EGrade.S_VIP.getValue() && tmpGrade.getBoxNumber() <= boxTotal) + .filter(tmpGrade -> tmpGrade.getGradeValue() < EGrade.VIP.getValue() && tmpGrade.getBoxNumber() <= boxTotal) .max(Comparator.comparingInt(BdGrade::getGradeValue)).get(); } else { // 非注册处理