## 调整等级；

bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/api/ApiIndexController.java

@@ -1,34 +0,0 @@
-package com.hzs.sale.index.controller.api;
-
-import com.hzs.common.core.web.domain.AjaxResult;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.sale.order.service.ISaOrderService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 会员首页
- */
-@Slf4j
-@RequestMapping("/api/order")
-@RestController
-public class ApiIndexController {
-
-    @Autowired
-    private ISaOrderService iSaOrderService;
-
-    /**
-     * 我的市场
-     *
-     * @return AjaxResult
-     */
-    @GetMapping("/index-myMarket")
-    public AjaxResult selectMyMarket() {
-        return AjaxResult.success(iSaOrderService.selectMyMarket(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
-    }
-
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/manage/IndexController.java

@@ -16,13 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/12/1 17:52
- * @Classname: IndexController
- * @PackageName: com.hzs.sale.index
- */
 @RestController
 @RequestMapping("/manager/index")
 public class IndexController extends BaseController {
@@ -36,7 +29,7 @@ public class IndexController extends BaseController {
      * 查询套组商品占比
      */
     @GetMapping("get-wares-scale")
-    public AjaxResult getWaresScale(){
+    public AjaxResult getWaresScale() {
         // 查询单品
         QueryWrapper<BdWares> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("IS_SINGLE", EYesNo.YES.getIntValue());
@@ -58,11 +51,11 @@ public class IndexController extends BaseController {
 
         JSONObject json = new JSONObject();
         //  总收益
-        json.put("priceSum",priceSum);
+        json.put("priceSum", priceSum);
         // 套组百分比占比
-        json.put("composeRatio",composeRatio);
+        json.put("composeRatio", composeRatio);
         // 单品百分比占比
-        json.put("singleRatio",singleRatio);
+        json.put("singleRatio", singleRatio);
         return AjaxResult.success(json);
     }
 
@@ -71,8 +64,8 @@ public class IndexController extends BaseController {
      * 产品销售比例
      */
     @GetMapping("get-product-scale")
-    public AjaxResult saleProductScale(){
+    public AjaxResult saleProductScale() {
-     //   productService.
+        //   productService.
         return AjaxResult.success();
     }
 }

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

@@ -11,12 +11,6 @@ import lombok.Getter;
 @Getter
 public enum EAwards {
 
-    /**
-     * -1=海粉
-     */
-    SEA_FLOUR(0, -1, "海粉", 1, EnumsPrefixConstants.AWARDS + "-1"),
-
-
     /**
      * 0=无
      */

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

@@ -25,36 +25,43 @@ public enum EGrade {
      */
     LOGGED_OUT(-2, 0, "已注销", 1, EnumsPrefixConstants.ENU_CAT + 2, MemberFrameworkConstants.LOG_OFF),
 
+    //////////////////////////////  //////////////////////////////
+
+    /**
+     * 顾客
+     */
+    START_UP(1, 20, "V0", 0, EnumsPrefixConstants.GRADE + "20", MemberFrameworkConstants.START_UP),
 
     /**
      * 会员
      */
-    START_UP(1, 20, "V0", 0, EnumsPrefixConstants.GRADE + "20", MemberFrameworkConstants.START_UP),
+    HAI_FAN(2, 30, "V1", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink),
     /**
      * VIP
      */
-    HAI_FAN(2, 30, "V1", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink),
+    YOU_KE(3, 40, "V2", 0, EnumsPrefixConstants.GRADE + "40", MemberFrameworkConstants.YOU_KE),
     /**
      * 合伙人
      */
-    YOU_KE(3, 40, "V2", 0, EnumsPrefixConstants.GRADE + "40", MemberFrameworkConstants.YOU_KE),
+    MAKER(4, 50, "V3", 0, EnumsPrefixConstants.GRADE + "50", MemberFrameworkConstants.MAKER),
 
     /**
      * 博羚店主
      */
-    MAKER(4, 50, "V3", 0, EnumsPrefixConstants.GRADE + "50", MemberFrameworkConstants.MAKER),
+    VIP(5, 60, "V4", 0, EnumsPrefixConstants.GRADE + "60", MemberFrameworkConstants.VIP),
     /**
      * 高级店主
      */
-    VIP(5, 60, "V4", 0, EnumsPrefixConstants.GRADE + "60", MemberFrameworkConstants.VIP),
+    S_VIP(6, 70, "V5", 0, EnumsPrefixConstants.GRADE + "70", MemberFrameworkConstants.S_VIP),
+
     /**
      * 分公司
      */
-    S_VIP(6, 70, "V5", 0, EnumsPrefixConstants.GRADE + "70", MemberFrameworkConstants.S_VIP),
+    BRANCH_COMPANY(7, 80, "V6", 0, EnumsPrefixConstants.GRADE + "80", MemberFrameworkConstants.COUNTY_AGENT),
     /**
-     * 总公司
+     * 公司
      */
-    COMPANY(7, 80, "V6", 0, EnumsPrefixConstants.GRADE + "80", MemberFrameworkConstants.COUNTY_AGENT),
+    COMPANY(8, 90, "V7", 0, EnumsPrefixConstants.GRADE + "90", MemberFrameworkConstants.CITY_AGENT),
 
     ;