Merge pull request '修改bug' (#11) from main-cx into main

Reviewed-on: #11

mall-admin/pom.xml

@@ -95,12 +95,7 @@
             <artifactId>jaxb-runtime</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
+
-            <groupId>com.buy507.mall</groupId>
-            <artifactId>mall-portal</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
     <build>

mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java

@@ -1,7 +1,6 @@
-package com.buy507.mall.controller;
+package com.buy507.mall.portal.controller;
 
 import com.buy507.mall.common.api.CommonResult;
-import com.buy507.mall.dto.PmsProductParam;
 import com.buy507.mall.mapper.OmsOrderMapper;
 import com.buy507.mall.mapper.PmsProductMapper;
 import com.buy507.mall.mapper.UmsMemberMapper;
@@ -9,7 +8,7 @@ import com.buy507.mall.model.OmsOrder;
 import com.buy507.mall.model.UmsMember;
 import com.buy507.mall.portal.service.OmsPortalOrderService;
 import com.buy507.mall.portal.service.UmsMemberService;
-import com.buy507.mall.service.PmsProductService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,14 +43,7 @@ public class VipCenterController {
     @Autowired
     private UmsMemberService memberService;
 
-    @Autowired
-    private PmsProductMapper productMapper;
 
-    @Autowired
-    private PmsProductService productService;
-
-    @Autowired
-    private OmsPortalOrderService portalOrderService;
 
     @Autowired
     private OmsOrderMapper orderMapper;

mall-portal/src/main/resources/application-prod.yml

@@ -105,3 +105,9 @@ alipay:
 becomeVipAmount: 899
 # 同等级分润比例
 sameLevelProfit: 10
+#店长升级金额
+storeManagerAmount: 1000
+#代理升级金额
+agentAmount: 1000
+#市代理升级金额
+cityAgentAmount: 1000