cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

积分列表添加返回积分字段

Browse Source
This commit is contained in:
xuwenbo
2021-02-22 17:05:52 +08:00
parent df0aae91eb
commit 0bb8893eff
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductDto.java
View File

@ -6,6 +6,7 @@
package co.yixiang.modules.product.service.dto; package co.yixiang.modules.product.service.dto;
import co.yixiang.modules.category.service.dto.YxStoreCategorySmallDto; import co.yixiang.modules.category.service.dto.YxStoreCategorySmallDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -126,5 +127,8 @@ public class YxStoreProductDto implements Serializable {
/** 淘宝京东1688类型 */ /** 淘宝京东1688类型 */
private String soureLink; private String soureLink;
@ApiModelProperty(value = "是否开启积分兑换")
private Integer isIntegral;
private YxStoreCategorySmallDto storeCategory; private YxStoreCategorySmallDto storeCategory;
} }

1
yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
View File

@ -548,6 +548,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
yxStoreProduct.setPrice(BigDecimal.valueOf(resultDTO.getMinPrice())); yxStoreProduct.setPrice(BigDecimal.valueOf(resultDTO.getMinPrice()));
yxStoreProduct.setOtPrice(BigDecimal.valueOf(resultDTO.getMinOtPrice())); yxStoreProduct.setOtPrice(BigDecimal.valueOf(resultDTO.getMinOtPrice()));
yxStoreProduct.setCost(BigDecimal.valueOf(resultDTO.getMinCost())); yxStoreProduct.setCost(BigDecimal.valueOf(resultDTO.getMinCost()));
yxStoreProduct.setIntegral(resultDTO.getMinIntegral());
yxStoreProduct.setStock(resultDTO.getStock()); yxStoreProduct.setStock(resultDTO.getStock());
yxStoreProduct.setSliderImage(String.join(",", storeProductDto.getSliderImage())); yxStoreProduct.setSliderImage(String.join(",", storeProductDto.getSliderImage()));

4
yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
View File

@ -153,4 +153,8 @@ public class YxStoreProductQueryVo implements Serializable {
@ApiModelProperty(value = "是否开启积分兑换") @ApiModelProperty(value = "是否开启积分兑换")
private Integer isIntegral; private Integer isIntegral;
/** 需要多少积分*/
@ApiModelProperty(value = "需要多少积分")
private Integer integral;
} }

8
yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java
View File

@ -13,7 +13,6 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.api.YshopException; import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants; import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants; import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.enums.ShopCommonEnum; import co.yixiang.enums.ShopCommonEnum;
import co.yixiang.tools.domain.QiniuContent; import co.yixiang.tools.domain.QiniuContent;
import co.yixiang.tools.service.LocalStorageService; import co.yixiang.tools.service.LocalStorageService;
@ -24,20 +23,13 @@ import lombok.AllArgsConstructor;
import co.yixiang.logging.aop.log.Log; import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.canvas.domain.StoreCanvas; import co.yixiang.modules.canvas.domain.StoreCanvas;
import co.yixiang.modules.canvas.service.StoreCanvasService; 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.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import co.yixiang.domain.PageResult;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
/** /**