From 0bb8893eff3914d3de04a380178ca6cb4813cec3 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 22 Feb 2021 17:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=A7=AF=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/product/service/dto/YxStoreProductDto.java    | 4 ++++
 .../product/service/impl/YxStoreProductServiceImpl.java   | 1 +
 .../yixiang/modules/product/vo/YxStoreProductQueryVo.java | 4 ++++
 .../modules/canvas/rest/StoreCanvasController.java        | 8 --------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductDto.java
index fe2613ea..05d8b601 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductDto.java
@@ -6,6 +6,7 @@
 package co.yixiang.modules.product.service.dto;
 
 import co.yixiang.modules.category.service.dto.YxStoreCategorySmallDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -126,5 +127,8 @@ public class YxStoreProductDto implements Serializable {
     /** 淘宝京东1688类型 */
     private String soureLink;
 
+    @ApiModelProperty(value = "是否开启积分兑换")
+    private Integer isIntegral;
+
     private YxStoreCategorySmallDto storeCategory;
 }
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 a83d9b14..f6e14cdd 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
@@ -548,6 +548,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         yxStoreProduct.setPrice(BigDecimal.valueOf(resultDTO.getMinPrice()));
         yxStoreProduct.setOtPrice(BigDecimal.valueOf(resultDTO.getMinOtPrice()));
         yxStoreProduct.setCost(BigDecimal.valueOf(resultDTO.getMinCost()));
+        yxStoreProduct.setIntegral(resultDTO.getMinIntegral());
         yxStoreProduct.setStock(resultDTO.getStock());
         yxStoreProduct.setSliderImage(String.join(",", storeProductDto.getSliderImage()));
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
index 083e3077..387cf761 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
@@ -153,4 +153,8 @@ public class YxStoreProductQueryVo implements Serializable {
     @ApiModelProperty(value = "是否开启积分兑换")
     private Integer isIntegral;
 
+    /** 需要多少积分*/
+    @ApiModelProperty(value = "需要多少积分")
+    private Integer integral;
+
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java b/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java
index 26c59e31..df9bca94 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java
@@ -13,7 +13,6 @@ import cn.hutool.core.util.StrUtil;
 import co.yixiang.api.YshopException;
 import co.yixiang.constant.ShopConstants;
 import co.yixiang.constant.SystemConfigConstants;
-import co.yixiang.dozer.service.IGenerator;
 import co.yixiang.enums.ShopCommonEnum;
 import co.yixiang.tools.domain.QiniuContent;
 import co.yixiang.tools.service.LocalStorageService;
@@ -24,20 +23,13 @@ import lombok.AllArgsConstructor;
 import co.yixiang.logging.aop.log.Log;
 import co.yixiang.modules.canvas.domain.StoreCanvas;
 import co.yixiang.modules.canvas.service.StoreCanvasService;
-import co.yixiang.modules.canvas.service.dto.StoreCanvasQueryCriteria;
-import co.yixiang.modules.canvas.service.dto.StoreCanvasDto;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-import co.yixiang.domain.PageResult;
 import org.springframework.web.multipart.MultipartFile;
 
 /**