From d6eab7adff7ae1c17633ce749b4b1bc419dffccb Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Mon, 4 Jan 2021 11:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/3.1升级3.2sql.sql | 3 ++ .../rest/StoreIntegralController.java | 39 +++++++++++++++++++ .../product/domain/YxStoreProduct.java | 5 +++ .../param/YxStoreProductQueryParam.java | 3 ++ .../product/service/dto/ProductResultDto.java | 3 ++ .../impl/YxStoreProductServiceImpl.java | 15 +++++-- 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java diff --git a/sql/3.1升级3.2sql.sql b/sql/3.1升级3.2sql.sql index 489bef6d..bdef2bf1 100644 --- a/sql/3.1升级3.2sql.sql +++ b/sql/3.1升级3.2sql.sql @@ -4,6 +4,9 @@ -- 字段修改 -- ---------------------------- ALTER TABLE yx_store_product ADD COLUMN is_integral tinyint(1) ZEROFILL NULL DEFAULT 0 COMMENT '是开启积分兑换' AFTER is_del; + +ALTER TABLE yx_store_product ADD COLUMN integral tinyint(1) ZEROFILL NULL DEFAULT 0 COMMENT '需要多少积分兑换' AFTER is_integral; + ALTER TABLE yx_store_product_attr_value ADD COLUMN integral INT(10) DEFAULT 0 COMMENT '需要多少积分兑换' AFTER seckill_price; ALTER TABLE yx_store_order ADD COLUMN `pay_integral` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '支付积分'; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java new file mode 100644 index 00000000..e16ccfe9 --- /dev/null +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java @@ -0,0 +1,39 @@ +package co.yixiang.modules.activity.rest; + +import co.yixiang.api.ApiResult; +import co.yixiang.modules.product.param.YxStoreProductQueryParam; +import co.yixiang.modules.product.service.YxStoreProductService; +import co.yixiang.modules.product.vo.YxStoreProductQueryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +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; + +import java.util.List; + +/** + * 积分兑换前端控制器 + * @author yshop + */ +@Slf4j +@RestController +@RequestMapping +@Api(value = "积分兑换", tags = "营销:积分兑换", description = "积分兑换") +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class StoreIntegralController { + + private final YxStoreProductService storeProductService; + + /** + * 获取积分产品列表 + */ + @GetMapping("/products") + @ApiOperation(value = "获取积分产品列表",notes = "获取积分产品列表") + public ApiResult> goodsList(YxStoreProductQueryParam productQueryParam){ + return ApiResult.ok(storeProductService.getGoodsList(productQueryParam)); + } +} diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java index 76e95e70..3513d0bf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java @@ -138,6 +138,11 @@ public class YxStoreProduct extends BaseDomain { private Integer stock; + /** 需要多少积分兑换 */ + @ApiModelProperty(value = "需要多少积分兑换 只在开启积分兑换时生效") + private Integer integral; + + /** 状态（0：未上架，1：上架） */ @ApiModelProperty(value = "状态（0：未上架，1：上架）") private Integer isShow; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/param/YxStoreProductQueryParam.java b/yshop-mall/src/main/java/co/yixiang/modules/product/param/YxStoreProductQueryParam.java index 0832d2ae..3ec842e3 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/param/YxStoreProductQueryParam.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/param/YxStoreProductQueryParam.java @@ -29,6 +29,9 @@ public class YxStoreProductQueryParam extends QueryParam { @ApiModelProperty(value = "是否新品") private String news; + @ApiModelProperty(value = "是否积分兑换商品") + private Integer isIntegral; + @ApiModelProperty(value = "价格排序") private String priceOrder; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductResultDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductResultDto.java index ff88bb35..7b614cdd 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductResultDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductResultDto.java @@ -1,5 +1,6 @@ package co.yixiang.modules.product.service.dto; +import io.swagger.models.auth.In; import lombok.Builder; import lombok.Getter; import lombok.Setter; @@ -20,4 +21,6 @@ public class ProductResultDto { private Double minCost; private Integer stock; + + private Integer minIntegral; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index cec4b18f..48dfc378 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -60,13 +60,11 @@ import co.yixiang.utils.ShopKeyUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.qiniu.util.StringUtils; -import lombok.val; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -79,8 +77,6 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import static co.yixiang.common.utils.QueryHelpPlus.humpToUnderline; - /** * @author hupeng @@ -237,6 +233,9 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl