forked from angelo/java-retail-app
				
			## Fix - 配送区域为伞下时,增加查询配送区域的日结并缓存->新增查单独用户的方法
This commit is contained in:
		
							parent
							
								
									e7e974b024
								
							
						
					
					
						commit
						9d728ad71a
					
				| 
						 | 
				
			
			@ -28,6 +28,7 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
 | 
			
		|||
     * 根据会员查询会员上的所有网体
 | 
			
		||||
     */
 | 
			
		||||
    List<CuMemberRetailRangeExt> queryCuMemberRetailRangeParent(@Param("tableName") String tableName, @Param("saOrderExtList") List<?> saOrderExtList);
 | 
			
		||||
    CuMemberRetailRangeExt queryCuMemberRetailRangeByMemberId(@Param("tableName") String tableName, @Param("memberId") Long memberId);
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 批量更新网体
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -802,8 +802,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
 | 
			
		|||
        if (null != retailRegion) {
 | 
			
		||||
            CuMemberRetailRangeExt targetMemberRangeExt = memberRangeExtMap.get(retailRegion.getPkMember());
 | 
			
		||||
            if(ObjectUtil.isEmpty(targetMemberRangeExt)){
 | 
			
		||||
                List<CuMemberRetailRangeExt> memberRetailRangeExtList = cuMemberRetailRangeMapper.queryCuMemberRetailRangeParent(rangeTableName, Arrays.asList(retailRegion.getPkMember()));
 | 
			
		||||
                targetMemberRangeExt = memberRetailRangeExtList.stream().filter(e -> e.getPkMember().equals(retailRegion.getPkMember())).findFirst().get();
 | 
			
		||||
                targetMemberRangeExt = cuMemberRetailRangeMapper.queryCuMemberRetailRangeByMemberId(rangeTableName, retailRegion.getPkMember());
 | 
			
		||||
                memberRangeExtMap.put(retailRegion.getPkMember(), targetMemberRangeExt);
 | 
			
		||||
            }
 | 
			
		||||
            // 复购配送区域收益
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -203,5 +203,57 @@
 | 
			
		|||
            where ba.del_flag = 0
 | 
			
		||||
        </foreach>
 | 
			
		||||
    </select>
 | 
			
		||||
    <select id="queryCuMemberRetailRangeByMemberId"
 | 
			
		||||
            resultType="com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt">
 | 
			
		||||
        SELECT
 | 
			
		||||
            a.pk_member,
 | 
			
		||||
            a.member_code,
 | 
			
		||||
            a.member_name,
 | 
			
		||||
            a.pk_parent,
 | 
			
		||||
            a.pk_settle_country,
 | 
			
		||||
            a.category,
 | 
			
		||||
            a.account_status,
 | 
			
		||||
            a.pk_grade,
 | 
			
		||||
            a.income_status,
 | 
			
		||||
            a.pay_time,
 | 
			
		||||
            a.pk_rate,
 | 
			
		||||
            a.system_type,
 | 
			
		||||
            a.income_status,
 | 
			
		||||
            a.pk_country,
 | 
			
		||||
            a.pk_settle_country,
 | 
			
		||||
            a.enable_status,
 | 
			
		||||
            new_box_num,
 | 
			
		||||
            consume_box_num,
 | 
			
		||||
            month_box_num,
 | 
			
		||||
            new_consume_pv,
 | 
			
		||||
            consume_pv,
 | 
			
		||||
            month_consume_pv,
 | 
			
		||||
            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,
 | 
			
		||||
            recommend_num,
 | 
			
		||||
            team_num,
 | 
			
		||||
            ba.grade_value,
 | 
			
		||||
            ba.grade_name,
 | 
			
		||||
            a.big_box_num,
 | 
			
		||||
            a.small_box_num,
 | 
			
		||||
            a.big_team_pv,
 | 
			
		||||
            a.small_team_pv,
 | 
			
		||||
            br.name country_name
 | 
			
		||||
        FROM
 | 
			
		||||
            ${tableName} a
 | 
			
		||||
                INNER JOIN bd_grade ba ON a.pk_grade = ba.pk_id
 | 
			
		||||
                LEFT JOIN bd_area br ON br.pk_id = a.region_address
 | 
			
		||||
                AND br.del_flag = 0
 | 
			
		||||
        WHERE
 | 
			
		||||
            ba.del_flag = 0
 | 
			
		||||
          and a.pk_member = #{memberId}
 | 
			
		||||
    </select>
 | 
			
		||||
 | 
			
		||||
</mapper>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue