diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java index 19d5e8b6..c297789c 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java @@ -53,12 +53,12 @@ public interface CuMemberRetailRangeMapper extends BaseMapper queryCuMemberRetailRangeParent(@Param("tableName") String tableName, @Param("saOrderExtList") List saOrderExtList); /** - * 根据会员ID查询会员数据 + * 根据会员ID查询会员数据 -- 众康使用中 */ List listCuMemberRetailRange(@Param("tableName") String tableName, @Param("pkMemberList") List pkMemberList); @@ -117,7 +117,7 @@ public interface CuMemberRetailRangeMapper extends BaseMapper listChildRetail(@Param("rangeTableName") String rangeTableName, @Param("pkParentList") List pkParentList); 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 855397d4..d3a108fe 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 @@ -359,7 +359,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - // 只有五折专区需要处理阶段收益 + // 需要处理阶段收益 Set findMemberDetailSet = orderList.stream().filter(tmpOrder -> EOrderType.RETAIL_REGISTER.getValue() == tmpOrder.getOrderType() || EOrderType.RETAIL_UPGRADE.getValue() == tmpOrder.getOrderType() 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 817d539e..ea54e8c2 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 @@ -751,17 +751,17 @@ rep_pv_balance, gift_point, gift_pay_time, - bw.awards_value, - bw.awards_name, - bg.grade_value + nvl(bw.awards_value, 0) awards_value, + nvl(bw.awards_name, '无') awards_name, + nvl(bg.grade_value, 30) grade_value from ( select * from ${tableName} start with pk_member = #{item} connect by pk_member = prior pk_parent ) a - inner join bd_awards bw + left join bd_awards bw on bw.pk_id = a.pk_awards - inner join bd_grade bg + left join bd_grade bg on bg.pk_id = a.pk_grade left join bd_vertex bv on bv.pk_id = a.pk_vertex @@ -815,11 +815,14 @@ rep_pv_balance, gift_point, gift_pay_time, - bw.awards_value, - bw.awards_name + nvl(bw.awards_value, 0) awards_value, + nvl(bw.awards_name, '无') awards_name, + nvl(bg.grade_value, 30) grade_value from ${tableName} a - inner join bd_awards bw + left join bd_awards bw on bw.pk_id = a.pk_awards + left join bd_grade bg + on bg.pk_id = a.pk_grade left join bd_vertex bv on bv.pk_id = a.pk_vertex where a.pk_member in @@ -1005,11 +1008,14 @@ rep_pv_balance, gift_point, gift_pay_time, - bw.awards_value, - bw.awards_name + nvl(bw.awards_value, 0) awards_value, + nvl(bw.awards_name, '无') awards_name, + nvl(bg.grade_value, 30) grade_value from ${rangeTableName} a - inner join bd_awards bw + left join bd_awards bw on bw.pk_id = a.pk_awards + left join bd_grade bg + on bg.pk_id = a.pk_grade left join bd_vertex bv on bv.pk_id = a.pk_vertex where a.pk_parent in