## 兼容迁移会员，订单没迁移问题；

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

@@ -551,6 +551,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
             for (SaOrderExt saOrderExt : retailOrderList) {
                 // 计算自消费奖衔
                 CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember());
+                if (null == sourceMemberRangeExt) {
+                    continue;
+                }
 
                 // 订单指定产品盒数（计算等级使用）
                 BigDecimal boxNum = saOrderExt.getBoxNum();

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java

@@ -141,7 +141,7 @@ public class RetailMemberController extends BaseController {
                 BigDecimal totalBoxNum = result.getTotalBoxNum();
                 BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
                 CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
-                if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){
+                if(RetailConstants.VERTEX_PK_ID.equals(memberExt.getPkVertex())){
 //                    BigDecimal bigBoxNum = result.getBigRangeTotalBoxNum();
                     if(ObjectUtil.isNotEmpty(totalBoxNum)
                             && totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0

bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml

@@ -208,7 +208,8 @@
                     </if>
                 </if>
             </foreach>
-            order by creation_time desc, batch_number, deliver_code desc, order_code desc
+            order by creation_time desc, batch_number, deliver_code desc, order_code desc,
+            bp.wms_code, sdi.specs_name
         </if>
         <if test="param.pkDeliverList == null or param.pkDeliverList.size == 0">
             <!-- 原始查询逻辑 -->
@@ -377,7 +378,8 @@
             <if test="param.pkVertex != null">
                 and cm.pk_vertex = #{param.pkVertex}
             </if>
-            order by sd.creation_time desc, sd.batch_number, sd.deliver_code desc, so.order_code desc
+            order by sd.creation_time desc, sd.batch_number, sd.deliver_code desc, so.order_code desc,
+            bp.wms_code, sdi.specs_name
         </if>
     </select>
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java

@@ -45,7 +45,9 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
         if(ObjectUtil.isEmpty(cuMember)){
             queryWrapper.isNull(BdAdvertBanner::getPkVertex);
         }else{
-            queryWrapper.and(qw ->  qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
+            queryWrapper.and(qw ->  qw.isNull(BdAdvertBanner::getPkVertex)
+                    .or()
+                    .eq(ObjectUtil.isNotEmpty(cuMember.getPkVertex()), BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
         }
         queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY);
         queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date());