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

@@ -1509,8 +1509,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
         // 保存会员等级变动
         saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, 0);
 
-        if (EGrade.REGION.getValue() == gradeDTO.getGradeValue()) {
+        if (EGrade.VIP.getValue() == gradeDTO.getGradeValue()
-            // 代理级别，判断处理区域
+                || EGrade.REGION.getValue() == gradeDTO.getGradeValue()) {
+            // 店主、代理级别，判断处理区域
             if (null != saOrder.getRegionProvince()
                     && null != saOrder.getRegionCity()) {
                 iCuMemberRetailRegionService.mergeMemberRetailRegion(CuMemberRetailRegion.builder()
@@ -1531,14 +1532,18 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateRetailMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) {
-        // 会员新等级
+        // 更新会员信息
+        updateCuMember(cuMember);
+
+        // 会员等级
         GradeDTO gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
         if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) {
             // 保存会员等级变动（如果旧等级和新等级相同，则不记录）
             saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld());
 
-            if (EGrade.REGION.getValue() == gradeDTO.getGradeValue()) {
+            if (EGrade.VIP.getValue() == gradeDTO.getGradeValue()
-                // 代理级别，判断处理区域
+                    || EGrade.REGION.getValue() == gradeDTO.getGradeValue()) {
+                // 店主、代理级别，判断处理区域
                 if (null != saOrder.getRegionProvince()
                         && null != saOrder.getRegionCity()) {
                     iCuMemberRetailRegionService.mergeMemberRetailRegion(CuMemberRetailRegion.builder()
@@ -1549,16 +1554,11 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
                             .build());
                 }
             }
-
-            // 判断处理会员自己等级（下级有店主、代理，自己判断是否升级高级店主、董事代理）
-            this.handleSelfLevel(gradeDTO, cuMember, saOrder.getPayTime());
         }
-        // 更新会员信息
-        updateCuMember(cuMember);
 
-        // 判断处理推荐人等级（自己是店主、代理，判断推荐人是否升级高级店主、董事代理）
+        // 判断处理推荐人等级
         handleParentUpgrade(cuMember, saOrder, gradeDTO);
-        // 处理会员账户
+
         this.handleRetailMemberAccount(saOrder, cuMemberAccountExt);
     }
 
@@ -1677,41 +1677,11 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
         }
     }
 
-    /**
-     * 处理会员自己等级
-     *
-     * @param gradeDTO 新等级
-     * @param cuMember 会员自己
-     * @param payTime  订单支付时间（升级记录时间）
-     */
-    private void handleSelfLevel(GradeDTO gradeDTO, CuMember cuMember, Date payTime) {
-        if (null == gradeDTO) {
-            gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
-        }
-        if (gradeDTO.getGradeValue().equals(EGrade.REGION.getValue())) {
-            // 会员当前是区域代理，查询直推是否存在区域代理
-            SaOrder recommendOrder = iCuMemberService.listRecommendVipOrder(cuMember.getPkId(), null, EGrade.REGION.getValue());
-            if (null != recommendOrder) {
-                recommendOrder.setPayTime(payTime);
-                cuMember.setPkSettleGrade(iGradeServiceApi.getGradeByGradeValue(EGrade.DIRECTOR.getValue(), cuMember.getPkSettleCountry()).getData().getPkId());
-                saveLevelUpgrade(cuMember, EUpgradeType.AUTO_UPGRADE.getValue(), recommendOrder, gradeDTO.getPkId());
-            }
-        } else if (gradeDTO.getGradeValue().equals(EGrade.VIP.getValue())) {
-            // 会员当前是博羚店主，查询直推是否存在博羚店主
-            SaOrder recommendOrder = iCuMemberService.listRecommendVipOrder(cuMember.getPkId(), null, EGrade.VIP.getValue());
-            if (null != recommendOrder) {
-                recommendOrder.setPayTime(payTime);
-                cuMember.setPkSettleGrade(iGradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), cuMember.getPkSettleCountry()).getData().getPkId());
-                saveLevelUpgrade(cuMember, EUpgradeType.AUTO_UPGRADE.getValue(), recommendOrder, gradeDTO.getPkId());
-            }
-        }
-    }
-
     /**
      * 处理推荐人等级
      *
-     * @param saOrder         升级订单
+     * @param saOrder
-     * @param currentDateTime 当前时间
+     * @param currentDateTime
      */
     private void handleParentLevel(SaOrderExt saOrder, Date currentDateTime) {
         // 注册、升级订单，需要判断是否有推荐人升级的

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

@@ -2418,12 +2418,9 @@
         <if test="orderCode != null and orderCode != ''">
             and so.order_code != #{orderCode}
         </if>
-        and bg.grade_value >= #{gradeValue}
+        and bg.grade_value >= #{gradeValue}) so
-        order by so.pay_time
-        ) so
         where rownum = 1
     </select>
-
     <select id="getMemberCountWithGradeAndParent" resultType="java.lang.Integer">
         select
             count(cu.PK_ID)

bd-third/src/main/java/com/hzs/third/pay/controller/manage/OnlinePayConfigController.java

@@ -14,7 +14,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * 在线支付配置
+ * @Description: 在线支付配置
+ * @Author: jiang chao
+ * @Time: 2023/3/23 16:15
+ * @Classname: OnlinePayConfigController
+ * @PackageName: com.hzs.third.pay.controller.manage
  */
 @RestController
 @RequestMapping("/manage/online-config")
@@ -36,16 +40,6 @@ public class OnlinePayConfigController {
         OnlinePayConfigVO payConfigVO = new OnlinePayConfigVO();
 
         // 各支付方式： true=显示，false=隐藏
-        // 京东收银台（H5）
-        String pay5 = String.format(PayConfigConstants.PAY_CONFIG_5, pkCountry);
-        if (redisTemplate.hasKey(pay5)) {
-            payConfigVO.setPay5((Boolean) redisTemplate.opsForValue().get(pay5));
-        }
-        // 京东收银台（PC）
-        String pay6 = String.format(PayConfigConstants.PAY_CONFIG_6, pkCountry);
-        if (redisTemplate.hasKey(pay6)) {
-            payConfigVO.setPay6((Boolean) redisTemplate.opsForValue().get(pay6));
-        }
 
         // 新汇付PC微信扫码支付
         String pay81 = String.format(PayConfigConstants.PAY_CONFIG_81, pkCountry);