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

## 结算查询会员兼容等级或者奖衔为空情况（正常应该不会有）；

This commit is contained in:
cabbage 2025-10-30 09:49:35 +08:00
parent a1a8edc76b
commit a96e090780
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
View File

@ -53,12 +53,12 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
void mergeMemberRetailGradeByMember(@Param("rangeTableName") String rangeTableName, @Param("pkMember") Long pkMember, @Param("isToday") Integer isToday); void mergeMemberRetailGradeByMember(@Param("rangeTableName") String rangeTableName, @Param("pkMember") Long pkMember, @Param("isToday") Integer isToday);
/** /**
* 根据会员查询会员上的所有网体 * 根据会员查询会员上的所有网体 -- 众康使用中
*/ */
List<CuMemberRetailRangeExt> queryCuMemberRetailRangeParent(@Param("tableName") String tableName, @Param("saOrderExtList") List<?> saOrderExtList); List<CuMemberRetailRangeExt> queryCuMemberRetailRangeParent(@Param("tableName") String tableName, @Param("saOrderExtList") List<?> saOrderExtList);
/** /**
* 根据会员ID查询会员数据 * 根据会员ID查询会员数据 -- 众康使用中
*/ */
List<CuMemberRetailRangeExt> listCuMemberRetailRange(@Param("tableName") String tableName, @Param("pkMemberList") List<Long> pkMemberList); List<CuMemberRetailRangeExt> listCuMemberRetailRange(@Param("tableName") String tableName, @Param("pkMemberList") List<Long> pkMemberList);
@ -117,7 +117,7 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
void initMemberRetailSecondRange(@Param("tableName") String tableName, @Param("member") CuMemberExt memberList); void initMemberRetailSecondRange(@Param("tableName") String tableName, @Param("member") CuMemberExt memberList);
/** /**
* 查询直推会员数据 * 查询直推会员数据 -- 众康使用中
*/ */
List<CuMemberRetailRangeExt> listChildRetail(@Param("rangeTableName") String rangeTableName, List<CuMemberRetailRangeExt> listChildRetail(@Param("rangeTableName") String rangeTableName,
@Param("pkParentList") List<Long> pkParentList); @Param("pkParentList") List<Long> pkParentList);

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

@ -359,7 +359,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
} }
} }
// 只有五折专区需要处理阶段收益 // 需要处理阶段收益
Set<Long> findMemberDetailSet = orderList.stream().filter(tmpOrder -> Set<Long> findMemberDetailSet = orderList.stream().filter(tmpOrder ->
EOrderType.RETAIL_REGISTER.getValue() == tmpOrder.getOrderType() EOrderType.RETAIL_REGISTER.getValue() == tmpOrder.getOrderType()
|| EOrderType.RETAIL_UPGRADE.getValue() == tmpOrder.getOrderType() || EOrderType.RETAIL_UPGRADE.getValue() == tmpOrder.getOrderType()

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

@ -751,17 +751,17 @@
rep_pv_balance, rep_pv_balance,
gift_point, gift_point,
gift_pay_time, gift_pay_time,
bw.awards_value, nvl(bw.awards_value, 0) awards_value,
bw.awards_name, nvl(bw.awards_name, '无') awards_name,
bg.grade_value nvl(bg.grade_value, 30) grade_value
from ( from (
select * from ${tableName} select * from ${tableName}
start with pk_member = #{item} start with pk_member = #{item}
connect by pk_member = prior pk_parent connect by pk_member = prior pk_parent
) a ) a
inner join bd_awards bw left join bd_awards bw
on bw.pk_id = a.pk_awards on bw.pk_id = a.pk_awards
inner join bd_grade bg left join bd_grade bg
on bg.pk_id = a.pk_grade on bg.pk_id = a.pk_grade
left join bd_vertex bv left join bd_vertex bv
on bv.pk_id = a.pk_vertex on bv.pk_id = a.pk_vertex
@ -815,11 +815,14 @@
rep_pv_balance, rep_pv_balance,
gift_point, gift_point,
gift_pay_time, gift_pay_time,
bw.awards_value, nvl(bw.awards_value, 0) awards_value,
bw.awards_name nvl(bw.awards_name, '无') awards_name,
nvl(bg.grade_value, 30) grade_value
from ${tableName} a from ${tableName} a
inner join bd_awards bw left join bd_awards bw
on bw.pk_id = a.pk_awards on bw.pk_id = a.pk_awards
left join bd_grade bg
on bg.pk_id = a.pk_grade
left join bd_vertex bv left join bd_vertex bv
on bv.pk_id = a.pk_vertex on bv.pk_id = a.pk_vertex
where a.pk_member in where a.pk_member in
@ -1005,11 +1008,14 @@
rep_pv_balance, rep_pv_balance,
gift_point, gift_point,
gift_pay_time, gift_pay_time,
bw.awards_value, nvl(bw.awards_value, 0) awards_value,
bw.awards_name nvl(bw.awards_name, '无') awards_name,
nvl(bg.grade_value, 30) grade_value
from ${rangeTableName} a from ${rangeTableName} a
inner join bd_awards bw left join bd_awards bw
on bw.pk_id = a.pk_awards on bw.pk_id = a.pk_awards
left join bd_grade bg
on bg.pk_id = a.pk_grade
left join bd_vertex bv left join bd_vertex bv
on bv.pk_id = a.pk_vertex on bv.pk_id = a.pk_vertex
where a.pk_parent in where a.pk_parent in