From 6ed1e2ebda4cd04099fbf61e4469a94b9990495d Mon Sep 17 00:00:00 2001 From: axindata <1851789500@qq.com> Date: Thu, 20 Feb 2025 10:42:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/buy507/mall/model/PmsProduct.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java b/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java index 6e345a2..96d86d5 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/PmsProduct.java @@ -188,6 +188,9 @@ public class PmsProduct implements Serializable { @ApiModelProperty(value = "会员中心：1->店长; 2->代理; 3->市代理") private Integer vipCenter; + + @ApiModelProperty(value = "商品积分价格") + private Integer intergrationPrice; public List getProductAttribute() { @@ -661,6 +664,10 @@ public class PmsProduct implements Serializable { public void setVipCenter(Integer vipCenter) {this.vipCenter = vipCenter;} + public Integer getintergrationPrice() {return intergrationPrice;} + + public void setIntergrationPrice(Integer intergrationPrice) {this.intergrationPrice = intergrationPrice;} + @Override public String toString() { StringBuilder sb = new StringBuilder(); From c4cb4a5a4a432de0c45338a38bda79e44d19f786 Mon Sep 17 00:00:00 2001 From: axindata <1851789500@qq.com> Date: Thu, 20 Feb 2025 15:19:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall-admin/pom.xml | 7 +------ .../mall/portal}/controller/VipCenterController.java | 12 ++---------- mall-portal/src/main/resources/application-prod.yml | 8 +++++++- 3 files changed, 10 insertions(+), 17 deletions(-) rename {mall-admin/src/main/java/com/buy507/mall => mall-portal/src/main/java/com/buy507/mall/portal}/controller/VipCenterController.java (93%) diff --git a/mall-admin/pom.xml b/mall-admin/pom.xml index c53622c..b6422fd 100644 --- a/mall-admin/pom.xml +++ b/mall-admin/pom.xml @@ -95,12 +95,7 @@ jaxb-runtime 2.3.1 - - com.buy507.mall - mall-portal - 1.0-SNAPSHOT - compile - + diff --git a/mall-admin/src/main/java/com/buy507/mall/controller/VipCenterController.java b/mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java similarity index 93% rename from mall-admin/src/main/java/com/buy507/mall/controller/VipCenterController.java rename to mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java index 3884bea..f72f46c 100644 --- a/mall-admin/src/main/java/com/buy507/mall/controller/VipCenterController.java +++ b/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; diff --git a/mall-portal/src/main/resources/application-prod.yml b/mall-portal/src/main/resources/application-prod.yml index 912b88e..9fbc383 100644 --- a/mall-portal/src/main/resources/application-prod.yml +++ b/mall-portal/src/main/resources/application-prod.yml @@ -104,4 +104,10 @@ alipay: # 成为vip金额 becomeVipAmount: 899 # 同等级分润比例 -sameLevelProfit: 10 \ No newline at end of file +sameLevelProfit: 10 +#店长升级金额 +storeManagerAmount: 1000 +#代理升级金额 +agentAmount: 1000 +#市代理升级金额 +cityAgentAmount: 1000 \ No newline at end of file