From db1479a922415f045b0c6c1f2262b2837622fa12 Mon Sep 17 00:00:00 2001 From: wxy Date: Sat, 30 Mar 2024 13:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/product/domain/Resp/ProductResp.java | 112 ++++++++++++++++++ .../product/domain/req/ProductInfoReq.java | 30 ----- .../muyu/product/domain/req/ProductReq.java | 18 +-- .../product/domain/req/ProductSkuNew.java | 34 ++++++ .../product/domain/req/ProductSkuReq.java | 18 --- .../product/domain/req/QueryProductReq.java | 37 ++++++ .../product/domain/vo/ProductCategoryVo.java | 28 +++++ .../controller/ArgumentController.java | 36 ++++++ .../product/controller/ProductController.java | 25 ++-- .../muyu/product/mapper/ArgumentMapper.java | 5 + .../muyu/product/mapper/ProductMapper.java | 9 ++ .../muyu/product/mapper/ProductSkuMapper.java | 8 ++ .../muyu/product/service/ArgumentService.java | 12 ++ .../muyu/product/service/ProductService.java | 6 +- .../service/impl/ArgumentServiceImpl.java | 24 ++++ .../service/impl/ProductServiceImpl.java | 46 ++++++- .../mapper/product/ArgumentMapper.xml | 5 + .../mapper/product/ProductMapper.xml | 90 ++++++-------- .../mapper/product/ProductSkuMapper.xml | 11 ++ 19 files changed, 431 insertions(+), 123 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/Resp/ProductResp.java delete mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductInfoReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuNew.java delete mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/QueryProductReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/vo/ProductCategoryVo.java create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductSkuMapper.java create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductSkuMapper.xml diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/Resp/ProductResp.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/Resp/ProductResp.java new file mode 100644 index 0000000..25da95c --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/Resp/ProductResp.java @@ -0,0 +1,112 @@ +package com.muyu.product.domain.Resp; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/30 12:27 + */ + +@Data +public class ProductResp { + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "名称") + @NotEmpty(message = "名称不能为空") + private String productName; + + @ApiModelProperty(value = "货号") + @NotNull(message = "货号不能为空") + private String productNumber; + + @ApiModelProperty(value = "审核状态 (1:通过, 2:驳回)") + private Integer productExamine; + + @ApiModelProperty(value = "品牌") + @NotNull(message = "品牌不能不选择") + private Integer brandId; + + @ApiModelProperty(value = "商品类型") + @NotNull(message = "商品类型不能不选择") + private Integer typeId; + + @ApiModelProperty(value = "副标题") + private String productSubheading; + + @ApiModelProperty(value = "商品介绍") + private String productInformation; + + @ApiModelProperty(value = "单位") + private String productUnit; + + @ApiModelProperty(value = "重量") + private Double productWeight; + + @ApiModelProperty(value = "排序") + private Integer productSort; + + @ApiModelProperty(value = "促销表id") + private Integer promotionId; + + @ApiModelProperty(value = "积分") + private Integer productPoints; + + @ApiModelProperty(value = "成长值") + private Integer productGrowth; + + @ApiModelProperty(value = "最大积分值") + private Integer productMaxPoints; + + @ApiModelProperty(value = "预告商品 (1：是, 2：否)") + private Integer productForeknow; + + @ApiModelProperty(value = "上下架状态 (1：上架, 2：下架)") + private Integer productStatus; + + @ApiModelProperty(value = "新品 (1：是, 2：否)") + private Integer productNew; + + @ApiModelProperty(value = "推荐 (1：是, 2：否)") + private Integer productRecommended; + + @ApiModelProperty(value = "详情标题") + private String detailsTitle; + + @ApiModelProperty(value = "详情描述") + private String detailsInformation; + + @ApiModelProperty(value = "关键字") + private String detailsKeyWord; + + @ApiModelProperty(value = "备注") + private String detailsRemark; + + @ApiModelProperty(value = "优惠方法") + @NotNull(message = "优惠方式不能不选择") + private Integer methodType; + + @ApiModelProperty(value = "优惠Id") + private Integer methodId; + + @ApiModelProperty(value = "移动端信息") + private String moveInformation; + + @ApiModelProperty(value = "PC端信息") + private String pcInformation; + + @ApiModelProperty(value = "售价") + private Double salePrice; + + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "类型名称") + private String typeName; + +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductInfoReq.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductInfoReq.java deleted file mode 100644 index 49b795c..0000000 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductInfoReq.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.muyu.product.domain.req; - -import lombok.Data; - -import java.util.List; -import java.util.Set; - -/** - * @Author: wangxinyuan - * @Date: 2024/3/29 10:23 - */ -@Data - -public class ProductInfoReq { - - - private Integer id; - - public List getSkuList(ProductInfoReq productInfoReq) { - return null; - } - - public Set keySet() { - return null; - } - - public Object get(Object key) { - return null; - } -} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductReq.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductReq.java index 39240d8..148bd30 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductReq.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductReq.java @@ -1,9 +1,8 @@ package com.muyu.product.domain.req; -import com.muyu.product.domain.*; + import com.muyu.product.domain.DTO.*; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -22,11 +21,12 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @ApiModel(value = "ProductReq", description = "商品添加接收信息") -public class ProductReq extends HashMap { +public class ProductReq { @ApiModelProperty(value = "商品") @Valid private Product product; + @ApiModelProperty(value = "商品图片列表") private List productImages; @@ -37,26 +37,18 @@ public class ProductReq extends HashMap { private List serviceIds; @ApiModelProperty(value = "阶梯优惠") - @Valid - private Ladder ladder; + private List ladder; @ApiModelProperty(value = "会员信息") - @Valid private Member member; @ApiModelProperty(value = "优惠信息") - @Valid private Preference preference; @ApiModelProperty(value = "价格信息") - @Valid - private Price price; + private List price; - @ApiModelProperty(value = "分页参数") - private Integer pageNum = 1; - @ApiModelProperty(value = "分页参数") - private Integer pageSize = 10; } diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuNew.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuNew.java new file mode 100644 index 0000000..1867486 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuNew.java @@ -0,0 +1,34 @@ +package com.muyu.product.domain.req; + +import com.muyu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/29 20:00 + */ +@Data +public class ProductSkuNew extends BaseEntity { + + @ApiModelProperty(value = "SKUId") + private long id; + + @ApiModelProperty(value = "销售价格") + private Double salePrice; + + @ApiModelProperty(value = "促销价格") + private Double promotionPrice; + + @ApiModelProperty(value = "库存") + private Integer stock; + + @ApiModelProperty(value = "预警库存") + private Integer stockAlert; + + @ApiModelProperty(value = "商品Id") + private Integer productId; + + @ApiModelProperty(value = "SKU背景图地址") + private String bgImg; +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuReq.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuReq.java deleted file mode 100644 index dbe8325..0000000 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/ProductSkuReq.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.product.domain.req; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.HashMap; - -/** - * @Author: wangxinyuan - * @Date: 2024/3/29 10:32 - */ -@Data -@ApiModel(description = "") -public class ProductSkuReq extends HashMap { - - - private Integer productId; -} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/QueryProductReq.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/QueryProductReq.java new file mode 100644 index 0000000..a8d0e84 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/req/QueryProductReq.java @@ -0,0 +1,37 @@ +package com.muyu.product.domain.req; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/29 19:58 + */ +@Data +public class QueryProductReq { + + @ApiModelProperty(value = "名称") + private String productName; + + @ApiModelProperty(value = "货号") + private String productNumber; + + @ApiModelProperty(value = "上下架状态 (1：上架, 2：下架)") + private Integer productStatus; + + @ApiModelProperty(value = "审核状态 (1:通过, 2:驳回)") + private Integer productExamine; + + @ApiModelProperty(value = "品牌") + private Integer brandId; + + @ApiModelProperty(value = "商品类型") + private Integer typeId; + + @ApiModelProperty(value = "分页参数") + private Integer pageNum = 1; + + @ApiModelProperty(value = "分页参数") + private Integer pageSize = 10; + +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/vo/ProductCategoryVo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/vo/ProductCategoryVo.java new file mode 100644 index 0000000..b6b475d --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/vo/ProductCategoryVo.java @@ -0,0 +1,28 @@ +package com.muyu.product.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/30 12:57 + */ +@Data +@ApiModel(description = "商品类别") +public class ProductCategoryVo { + + @ApiModelProperty(value = "类别ID") + private Integer id; + + @ApiModelProperty(value = "类别名称") + private String name; + + @ApiModelProperty(value = "父类别ID") + private Integer parentId; + + @ApiModelProperty(value = "子类别列表") + private List childrenList; +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java index 338910a..fa06aba 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java @@ -1,10 +1,22 @@ package com.muyu.product.controller; +import com.muyu.common.core.domain.AjaxResult; +import com.muyu.product.domain.DTO.Brand; +import com.muyu.product.domain.DTO.Services; +import com.muyu.product.domain.util.R; +import com.muyu.product.domain.vo.ProductCategoryVo; +import com.muyu.product.service.ArgumentService; import io.swagger.annotations.Api; import lombok.extern.log4j.Log4j2; +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; + +import static com.muyu.common.core.domain.AjaxResult.success; + /** * @Author: wangxinyuan * @Date: 2024/3/29 17:09 @@ -13,4 +25,28 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("argument") @Api(value = "下拉框管理") public class ArgumentController { + + + @Autowired + private ArgumentService argumentService; + + @GetMapping("/queryBrand") + public AjaxResult queryBrand(){ + Listlist = argumentService.queryBrand(); + return success(list); + } + + + @GetMapping("/queryService") + public AjaxResult queryService(){ + Listlist=argumentService.queryService(); + return success(list); + } + + @GetMapping("/queryCategory") + public R>queryCategory(){ + return R.ok(argumentService.queryCategory()); + } } + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java index fd8fd17..3477c62 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java @@ -4,15 +4,18 @@ import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.AjaxResult; import com.muyu.common.system.remote.RemoteFileService; import com.muyu.product.domain.DTO.Product; +import com.muyu.product.domain.Resp.ProductResp; import com.muyu.product.domain.req.ProductReq; +import com.muyu.product.domain.req.QueryProductReq; +import com.muyu.product.domain.util.R; import com.muyu.product.service.ProductService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; import static com.muyu.common.core.domain.AjaxResult.success; @@ -31,11 +34,19 @@ public class ProductController { @Autowired private RemoteFileService remoteFileService; - @ApiModelProperty("查询商品信息") + @ApiOperation("查询商品信息") @GetMapping("/queryProduct") - public AjaxResult queryProduct(@RequestBody ProductReq req){ - PageInfo list = productService.queryProduct(req); + public AjaxResult queryProduct(QueryProductReq req){ + PageInfo list = productService.queryProduct(req); return success(list); } + @ApiOperation("添加商品") + @PostMapping("/productInsert") + public RproductInsert(@Valid @RequestBody ProductReq productReq){ + productService.productInsert(productReq); + return R.ok(); + } + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java index d6fccfa..28e3699 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java @@ -1,8 +1,13 @@ package com.muyu.product.mapper; +import com.muyu.product.domain.DTO.Brand; + +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/3/29 17:07 */ public interface ArgumentMapper { + List queryBrand(); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java index f6156f0..e756eb7 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java @@ -1,8 +1,17 @@ package com.muyu.product.mapper; +import com.muyu.product.domain.DTO.Product; +import com.muyu.product.domain.Resp.ProductResp; +import com.muyu.product.domain.req.ProductReq; +import com.muyu.product.domain.req.QueryProductReq; + +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/3/29 17:06 */ public interface ProductMapper { + + List queryProduct(QueryProductReq productReq); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductSkuMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductSkuMapper.java new file mode 100644 index 0000000..c36fea7 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductSkuMapper.java @@ -0,0 +1,8 @@ +package com.muyu.product.mapper; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/29 17:29 + */ +public interface ProductSkuMapper { +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java index 4f5bda6..50482e8 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java @@ -1,8 +1,20 @@ package com.muyu.product.service; +import com.muyu.product.domain.DTO.Brand; +import com.muyu.product.domain.DTO.Services; +import com.muyu.product.domain.vo.ProductCategoryVo; + +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/3/29 17:05 */ public interface ArgumentService { + List queryBrand(); + + List queryService(); + + List queryCategory(); + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java index ececa23..e7f96f5 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java @@ -2,12 +2,16 @@ package com.muyu.product.service; import com.github.pagehelper.PageInfo; import com.muyu.product.domain.DTO.Product; +import com.muyu.product.domain.Resp.ProductResp; import com.muyu.product.domain.req.ProductReq; +import com.muyu.product.domain.req.QueryProductReq; /** * @Author: wangxinyuan * @Date: 2024/3/29 17:05 */ public interface ProductService { - PageInfo queryProduct(ProductReq req); + PageInfo queryProduct(QueryProductReq req); + + void productInsert(ProductReq productReq); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java index deb9d50..2c227f6 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java @@ -1,12 +1,36 @@ package com.muyu.product.service.impl; +import com.muyu.product.domain.DTO.Brand; +import com.muyu.product.domain.DTO.Services; +import com.muyu.product.domain.vo.ProductCategoryVo; +import com.muyu.product.mapper.ArgumentMapper; import com.muyu.product.service.ArgumentService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/3/29 17:06 */ @Service public class ArgumentServiceImpl implements ArgumentService { + + @Autowired + private ArgumentMapper argumentMapper; + @Override + public List queryBrand() { + return argumentMapper.queryBrand(); + } + + @Override + public List queryService() { + return null; + } + + @Override + public List queryCategory() { + return null; + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java index d0db206..aad0b40 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java @@ -1,12 +1,24 @@ package com.muyu.product.service.impl; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.muyu.product.domain.DTO.Product; +import com.muyu.product.domain.Resp.ProductResp; import com.muyu.product.domain.req.ProductReq; +import com.muyu.product.domain.req.QueryProductReq; +import com.muyu.product.mapper.ProductMapper; +import com.muyu.product.mapper.ProductSkuMapper; +import com.muyu.product.mapper.PromotionMapper; import com.muyu.product.service.ProductService; +import com.muyu.product.service.ServiceService; import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import javax.management.Query; +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/3/29 17:06 @@ -18,8 +30,38 @@ public class ProductServiceImpl implements ProductService { private final Integer min = 0; private final Integer max = 5; + + @Resource + private ProductMapper productMapper; + + @Autowired + private ServiceService serviceService; + + @Resource + private PromotionMapper promotionMapper; + + @Autowired + private ProductSkuMapper productSkuMapper; + + @Override - public PageInfo queryProduct(ProductReq req) { - return null; + public PageInfo queryProduct(QueryProductReq productReq) { + PageHelper.startPage(productReq.getPageNum(),productReq.getPageSize()); + Listproducts=productMapper.queryProduct(productReq); + PageInfo pageInfo = new PageInfo<>(products); + return pageInfo; + } + + @Override + public void productInsert(ProductReq productReq) { + long start =System.currentTimeMillis(); + + insertProduct(productReq.getProduct()); + + + } + + private void insertProduct(Product product) { + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml index 3131cc5..0705e74 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml @@ -5,4 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml index f7ba741..2a8c179 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml @@ -5,59 +5,45 @@ - - INSERT INTO `cargo`.`t_product` ( - `product_name`, - `product_number`, - `brand_id`, - `type_id`, - `product_subheading`, - `product_information`, - `product_unit`, - `product_weight`, - `product_sort`, - `product_points`, - `product_growth`, - `product_max_points`, - `product_foreknow`, - `product_staus`, - `product_new`, - `product_recommended`, - `details_title`, - `details_information`, - `details_key_word`, - `details_remark`, - `method_type`, - `create_by`, - `create_time` - ) - VALUES - ( - #{productName}, - #{productNumber}, - #{brandId}, - #{typeId}, - #{productSubheading}, - #{productInformation}, - #{productUnit}, - #{productWeight}, - #{productSort}, - #{productPoints}, - #{productGrowth}, - #{productForeknow}, - #{productStatus}, - #{productNew}, - #{productRecommended}, - #{detailsTitle}, - #{detailsInformation}, - #{detailsKeyWord}, - #{detailsRemark}, - #{methodType}, - #{createBy}, - now() - ); - + + t_product.id,product_name,product_number,brand_id,type_id,product_subheading,product_examine, + product_information,product_unit,product_weight,product_sort,product_points, + product_growth,product_max_points,product_foreknow,product_status,product_new, + product_recommended,details_title,details_information,details_key_word,details_remark, + method_type,t_product_brand.brand_name,t_product_type.type_name,sale_price + + + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductSkuMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductSkuMapper.xml new file mode 100644 index 0000000..f10ab56 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductSkuMapper.xml @@ -0,0 +1,11 @@ + + + + + + + + +