From 34a1a4ad1f6a981f9db83e378dd0445fe282865f Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Mon, 18 May 2020 18:53:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shop/domain/YxStoreProduct.java | 4 +++ .../shop/rest/StoreProductController.java | 4 +-- .../shop/service/YxStoreProductService.java | 4 +++ .../shop/service/dto/YxStoreProductDto.java | 2 ++ .../impl/YxStoreProductServiceImpl.java | 30 +++++++++++++++---- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java index edf0828b..25174271 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java @@ -7,6 +7,7 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.shop.domain; +import co.yixiang.annotation.Query; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import cn.hutool.core.bean.BeanUtil; @@ -167,6 +168,9 @@ public class YxStoreProduct implements Serializable { /** 淘宝京东1688类型 */ private String soureLink; + @TableField(exist = false) + private YxStoreCategory storeCategory; + public void copy(YxStoreProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java index bbd92bf4..161b98ac 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java @@ -63,7 +63,7 @@ public class StoreProductController { resources.setAddTime(OrderUtil.getSecondTimestampTwo()); if(ObjectUtil.isEmpty(resources.getGiveIntegral())) resources.setGiveIntegral(BigDecimal.ZERO); if(ObjectUtil.isEmpty(resources.getCost())) resources.setCost(BigDecimal.ZERO); - return new ResponseEntity(yxStoreProductService.save(resources),HttpStatus.CREATED); + return new ResponseEntity(yxStoreProductService.saveProduct(resources),HttpStatus.CREATED); } @Log("修改商品") @@ -73,7 +73,7 @@ public class StoreProductController { @PreAuthorize("@el.check('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreProduct resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStoreProductService.saveOrUpdate(resources); + yxStoreProductService.updateProduct(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java index ce674cc5..fabcff2d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java @@ -47,6 +47,8 @@ public interface YxStoreProductService extends BaseService{ */ void download(List all, HttpServletResponse response) throws IOException; + YxStoreProduct saveProduct(YxStoreProduct storeProduct); + void recovery(Integer id); void onSale(Integer id, int status); @@ -60,4 +62,6 @@ public interface YxStoreProductService extends BaseService{ void setResult(Map map,Integer id); String getStoreProductAttrResult(Integer id); + + void updateProduct(YxStoreProduct resources); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java index 628d5459..bff7a172 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java @@ -126,4 +126,6 @@ public class YxStoreProductDto implements Serializable { /** 淘宝京东1688类型 */ private String soureLink; + + private YxStoreCategorySmallDto storeCategory; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 088a8e36..45fd1f5e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -17,9 +17,7 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; -import co.yixiang.modules.shop.service.YxStoreProductAttrResultService; -import co.yixiang.modules.shop.service.YxStoreProductAttrService; -import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; +import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.service.dto.*; import co.yixiang.utils.*; import com.alibaba.fastjson.JSON; @@ -29,8 +27,8 @@ import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.service.mapper.StoreProductMapper; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -60,6 +58,8 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl queryAll(YxStoreProductQueryCriteria criteria){ - return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreProduct.class, criteria)); + List yxStoreProductList = baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreProduct.class, criteria)); + List storeProductList = yxStoreProductList.stream().map(i ->{ + YxStoreProduct yxStoreProduct = new YxStoreProduct(); + BeanUtils.copyProperties(i,yxStoreProduct); + yxStoreProduct.setStoreCategory(yxStoreCategoryService.getById(i.getCateId())); + return yxStoreProduct; + }).collect(Collectors.toList()); + return storeProductList; } @@ -129,6 +136,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl