## 博羚购买博羚以上升高级；区域购买区域升董事；

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java

@@ -604,7 +604,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      *
      * @return
      */
-    CuMember getShopkeeperMember(@Param("pkMember") Long pkMember);
+    CuMember getShopkeeperMember(@Param("pkMember") Long pkMember, @Param("gradeValue") Integer gradeValue);
 
     /**
      * 查询高级店主

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java

@@ -873,7 +873,7 @@ public interface ICuMemberService extends IService<CuMember> {
      *
      * @return
      */
-    CuMember getShopkeeperMember(Long pkMember);
+    CuMember getShopkeeperMember(Long pkMember, Integer gradeValue);
 
     /**
      * 查询高级店主

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java

@@ -918,7 +918,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
         // 处理推荐人等级
         this.handleParentLevel(saOrder, currentDateTime);
 
-        // 部分撤单 todo  发货后邮费不退，未发货退邮费
         if (saOrder.getPayType().equals(EOrderPayType.WALLET.getValue())) {
             // 钱包支付，则需要回退金额
             // 部分撤单
@@ -1606,9 +1605,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
         if (null == gradeDTO) {
             gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
         }
-        if (EGrade.VIP.getValue() == gradeDTO.getGradeValue()) {
+        if (gradeDTO.getGradeValue() >= EGrade.VIP.getValue()) {
-            // 会员等级为 博羚店主，推荐人如果也是博羚店主，需要升级为高级店主
+            // 会员等级大于等于 博羚店主，推荐人如果也是博羚店主，需要升级为高级店主
-            CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent());
+            CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent(), EGrade.VIP.getValue());
             if (null != parentMember) {
                 // 记录升级历史
                 GradeDTO upgradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), cuMember.getPkSettleCountry()).getData();
@@ -1624,6 +1623,31 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
                 cuMemberLevel.setPkCreator(cuMember.getPkId());
                 iCuMemberLevelService.save(cuMemberLevel);
 
+                LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.set(CuMember::getPkSettleGrade, upgradeDTO.getPkId());
+                updateWrapper.eq(CuMember::getPkId, parentMember.getPkId());
+                updateWrapper.set(CuMember::getPkModified, cuMember.getPkId());
+                updateWrapper.set(CuMember::getModifiedTime, new Date());
+                iCuMemberService.update(updateWrapper);
+            }
+        } else if (gradeDTO.getGradeValue() >= EGrade.REGION.getValue())  {
+            // 会员等级大于等于 区域代理，推荐人如果也是区域代理，需要升级为董事代理
+            CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent(), EGrade.REGION.getValue());
+            if (null != parentMember) {
+                // 记录升级历史
+                GradeDTO upgradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.DIRECTOR.getValue(), cuMember.getPkSettleCountry()).getData();
+                CuMemberLevel cuMemberLevel = CuMemberLevel.builder()
+                        .pkMember(parentMember.getPkId())
+                        .upType(EUpgradeType.AUTO_UPGRADE.getValue())
+                        .oldLevel(parentMember.getPkSettleGrade())
+                        .newLevel(upgradeDTO.getPkId())
+                        .upgradeTime(saOrder.getPayTime())
+                        .pkOrder(saOrder.getPkId())
+                        .build();
+                cuMemberLevel.setPkCountry(cuMember.getPkSettleCountry());
+                cuMemberLevel.setPkCreator(cuMember.getPkId());
+                iCuMemberLevelService.save(cuMemberLevel);
+
                 LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.set(CuMember::getPkSettleGrade, upgradeDTO.getPkId());
                 updateWrapper.eq(CuMember::getPkId, parentMember.getPkId());

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java

@@ -116,7 +116,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
     @Autowired
     private ICuSettleCountryDetailedService iCuSettleCountryDetailedService;
     @Autowired
-    private ICuMemberBusinessService cuMemberBusinessService;
+    private ICuMemberBusinessService iCuMemberBusinessService;
 
     @Autowired
     private RabbitTemplate rabbitTemplate;
@@ -2292,7 +2292,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         cuMember.setPkRegisterGrade(gradeDTO.getPkId());
         cuMember.setPkSettleGrade(gradeDTO.getPkId());
         cuMember.setPkAwards(gradeDTO.getPkAwards());
-        cuMemberBusinessService.saveShareMember(cuMember);
+        iCuMemberBusinessService.saveShareMember(cuMember);
         return cuMember;
     }
 
@@ -3139,8 +3139,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
     }
 
     @Override
-    public CuMember getShopkeeperMember(Long pkMember) {
+    public CuMember getShopkeeperMember(Long pkMember, Integer gradeValue) {
-        return baseMapper.getShopkeeperMember(pkMember);
+        return baseMapper.getShopkeeperMember(pkMember, gradeValue);
     }
 
     @Override

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -2379,7 +2379,7 @@
                  left join bd_grade bg
                            on bg.pk_id = cm.pk_settle_grade
         where cm.pk_id = #{pkMember}
-          and bg.grade_value = 60
+          and bg.grade_value = #{gradeValue}
     </select>
 
     <!-- 查询高级店主 -->

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java

@@ -236,7 +236,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
                 }
             }
 
-            // TODO 2025.08.04 注册、升级专区，下单支付会员如果是分公司，订单不需要发货，直接放入提货中心
+            // 2025.08.04 注册、升级专区，下单支付会员如果是分公司，订单不需要发货，直接放入提货中心
             CuMember createMember = orderParam.getCreatorMember();
             if (null == createMember) {
                 createMember = iMemberServiceApi.getMember(orderParam.getPkCreator()).getData();
@@ -961,6 +961,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
         if (EYesNo.NO.getIntValue() == BdConfig.getProductSync()) {
             return;
         }
+        try {
             Map<Integer, BdProduct> productMap = iBdProductService.queryProductMap(saOrderExt.getOrderItemsList().stream().map(SaOrderItems::getPkProduct).collect(Collectors.toSet()), null);
             // 开启线程调用全网产品库存
             // 请求参数
@@ -1004,6 +1005,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
                             .build());
                 }
             });
+        } catch (Exception e) {
+            log.error("同步产品异常: ", e);
+        }
     }
 
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 public enum EUpgradeType {
 
     /**
-     * 1=自动升级 -- 目前只高级店主升级为自动升级
+     * 1=自动升级 -- 高级店主升级为自动升级、董事代理为自动升级
      */
     AUTO_UPGRADE(1, "自动升级", 0, EnumsPrefixConstants.UPGRADE_TYPE + 1),