mirror of
https://gitee.com/youlaitech/youlai-mall.git
synced 2024-12-23 05:00:25 +08:00
fix: 表结构调整关联问题修复
This commit is contained in:
parent
da866f2144
commit
7c9dabfc04
@ -71,9 +71,9 @@ youlai-mall
|
||||
├── mall-sms # 营销服务(Sales Management Service)
|
||||
├── sms-api # 营销服务-Feign客户端
|
||||
├── sms-boot # 营销服务-启动应用
|
||||
├── mall-pms # 商品服务(Product Management Service)
|
||||
├── pms-api # 商品服务-Feign客户端
|
||||
├── pms-boot # 商品服务-启动应用
|
||||
├── mall-product # 商品服务(Product Management Service)
|
||||
├── product-api # 商品服务-Feign客户端
|
||||
├── product-boot # 商品服务-启动应用
|
||||
├── mall-oms # 订单服务(Order Management Service)
|
||||
├── oms-api # 订单服务-Feign客户端
|
||||
├── oms-boot # 订单服务-启动应用
|
||||
|
@ -111,15 +111,15 @@ INSERT INTO `sys_menu` VALUES (5, 1, 1, '部门管理', 'dept', 'system/dept/ind
|
||||
INSERT INTO `sys_menu` VALUES (6, 1, 1, '字典管理', 'dict', 'system/dict/index', NULL, 'dict', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (9, 0, 2, '营销管理', '/sms', 'Layout', NULL, 'number', 5, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (10, 9, 1, '广告列表', 'advert', 'sms/advert/index', NULL, 'advert', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/pms', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/pms/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35');
|
||||
INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'pms/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/product', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/product/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35');
|
||||
INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'product/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (13, 0, 2, '订单管理', '/oms', 'Layout', NULL, 'el-icon-ShoppingCart', 3, 1, '/oms/order', '0', 1, 1, '2021-08-28 09:12:21', '2024-03-03 23:52:32');
|
||||
INSERT INTO `sys_menu` VALUES (14, 13, 1, '订单列表', 'order', 'oms/order/index', NULL, 'el-icon-Document', 1, 1, NULL, 'null,13', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:45:09');
|
||||
INSERT INTO `sys_menu` VALUES (15, 0, 1, '会员管理', '/ums', 'Layout', NULL, 'user', 4, 1, '/ums/member', NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (16, 15, 1, '会员列表', 'member', 'ums/member/index', NULL, 'peoples', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'pms/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'pms/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'pms/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'product/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'product/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'product/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (20, 0, 2, '多级菜单', '/multi-level', 'Layout', NULL, 'nested', 7, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:11:00', '2022-02-16 23:11:00');
|
||||
INSERT INTO `sys_menu` VALUES (21, 20, 1, '菜单一级', 'level1', 'demo/multi-level/level1', NULL, '', 1, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:13:38', '2022-02-16 23:13:38');
|
||||
INSERT INTO `sys_menu` VALUES (22, 21, 1, '菜单二级', 'level2', 'demo/multi-level/children/level2', NULL, '', 1, 1, '/nested/level1/level2/level3', NULL, NULL, NULL, '2022-02-16 23:14:23', '2022-02-16 23:14:23');
|
||||
|
@ -111,15 +111,15 @@ INSERT INTO `sys_menu` VALUES (5, 1, 1, '部门管理', 'dept', 'system/dept/ind
|
||||
INSERT INTO `sys_menu` VALUES (6, 1, 1, '字典管理', 'dict', 'system/dict/index', NULL, 'dict', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (9, 0, 2, '营销管理', '/sms', 'Layout', NULL, 'number', 5, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (10, 9, 1, '广告列表', 'advert', 'sms/advert/index', NULL, 'advert', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/pms', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/pms/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35');
|
||||
INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'pms/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/product', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/product/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35');
|
||||
INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'product/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (13, 0, 2, '订单管理', '/oms', 'Layout', NULL, 'el-icon-ShoppingCart', 3, 1, '/oms/order', '0', 1, 1, '2021-08-28 09:12:21', '2024-03-03 23:52:32');
|
||||
INSERT INTO `sys_menu` VALUES (14, 13, 1, '订单列表', 'order', 'oms/order/index', NULL, 'el-icon-Document', 1, 1, NULL, 'null,13', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:45:09');
|
||||
INSERT INTO `sys_menu` VALUES (15, 0, 1, '会员管理', '/ums', 'Layout', NULL, 'user', 4, 1, '/ums/member', NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (16, 15, 1, '会员列表', 'member', 'ums/member/index', NULL, 'peoples', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'pms/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'pms/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'pms/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'product/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'product/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'product/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21');
|
||||
INSERT INTO `sys_menu` VALUES (20, 0, 2, '多级菜单', '/multi-level', 'Layout', NULL, 'nested', 7, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:11:00', '2022-02-16 23:11:00');
|
||||
INSERT INTO `sys_menu` VALUES (21, 20, 1, '菜单一级', 'level1', 'demo/multi-level/level1', NULL, '', 1, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:13:38', '2022-02-16 23:13:38');
|
||||
INSERT INTO `sys_menu` VALUES (22, 21, 1, '菜单二级', 'level2', 'demo/multi-level/children/level2', NULL, '', 1, 1, '/nested/level1/level2/level3', NULL, NULL, NULL, '2022-02-16 23:14:23', '2022-02-16 23:14:23');
|
||||
|
@ -60,7 +60,7 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>com.youlai</groupId>
|
||||
<artifactId>pms-api</artifactId>
|
||||
<artifactId>product-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
@ -1,6 +1,6 @@
|
||||
package com.youlai.mall.oms;
|
||||
|
||||
import com.youlai.mall.pms.api.SkuFeignClient;
|
||||
import com.youlai.mall.product.api.SkuFeignClient;
|
||||
import com.youlai.mall.ums.api.MemberFeignClient;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
@ -23,9 +23,9 @@ public interface OrderConverter {
|
||||
@Mappings({
|
||||
@Mapping(target = "orderSn", source = "orderToken"),
|
||||
@Mapping(target = "totalQuantity",
|
||||
expression = "java(orderSubmitForm.getOrderItems().stream().map(OrderSubmitForm.OrderItem::getQuantity).reduce(0, Integer::sum))"),
|
||||
expression = "java(orderSubmitForm.getOrderItems().stream().map(OrderSubmitForm.OrderItem::getSkuQuantity).reduce(0, Integer::sum))"),
|
||||
@Mapping(target = "totalAmount",
|
||||
expression = "java(orderSubmitForm.getOrderItems().stream().map(item -> item.getPrice() * item.getQuantity()).reduce(0L, Long::sum))"),
|
||||
expression = "java(orderSubmitForm.getOrderItems().stream().map(item -> item.getSkuPrice() * item.getSkuQuantity()).reduce(0L, Long::sum))"),
|
||||
@Mapping(target = "source", expression = "java(orderSubmitForm.getOrderSource().getValue())"),
|
||||
})
|
||||
OmsOrder form2Entity(OrderSubmitForm orderSubmitForm);
|
||||
|
@ -40,9 +40,9 @@ import com.youlai.mall.oms.model.vo.OrderConfirmVO;
|
||||
import com.youlai.mall.oms.model.vo.OrderPageVO;
|
||||
import com.youlai.mall.oms.service.app.OrderItemService;
|
||||
import com.youlai.mall.oms.service.app.OrderService;
|
||||
import com.youlai.mall.pms.api.SkuFeignClient;
|
||||
import com.youlai.mall.pms.model.dto.LockSkuDTO;
|
||||
import com.youlai.mall.pms.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.product.api.SkuFeignClient;
|
||||
import com.youlai.mall.product.model.dto.LockSkuDTO;
|
||||
import com.youlai.mall.product.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.ums.api.MemberFeignClient;
|
||||
import com.youlai.mall.ums.dto.CartItemDTO;
|
||||
import com.youlai.mall.ums.dto.MemberAddressDTO;
|
||||
|
@ -1,22 +0,0 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.SkuSpecValue;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.mall.pms.model.bo.SkuSpecValueBO;
|
||||
import com.youlai.mall.pms.model.query.SkuSpecValuePageQuery;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* SKU规格值 Mapper 接口
|
||||
*
|
||||
* @author Ray Hao
|
||||
* @since 2024-04-14
|
||||
*/
|
||||
|
||||
@Mapper
|
||||
public interface SkuSpecValueMapper extends BaseMapper<SkuSpecValue> {
|
||||
|
||||
|
||||
|
||||
}
|
@ -1,40 +0,0 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
@Schema(description = "属性表单")
|
||||
public class PmsCategoryAttributeForm {
|
||||
|
||||
@Schema(description="分类ID")
|
||||
@NotNull
|
||||
private Long categoryId;
|
||||
|
||||
|
||||
@Schema(description="属性类型(1:规格;2:属性)")
|
||||
@NotNull
|
||||
private Integer type;
|
||||
|
||||
@Schema(description="属性集合")
|
||||
@NotEmpty
|
||||
private List<Attribute> attributes;
|
||||
|
||||
@Data
|
||||
public static class Attribute {
|
||||
|
||||
@Schema(description="属性ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description="属性名称")
|
||||
@NotBlank
|
||||
private String name;
|
||||
}
|
||||
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
package com.youlai.mall.pms.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.mall.pms.model.entity.Brand;
|
||||
|
||||
public interface BrandService extends IService<Brand> {
|
||||
|
||||
}
|
@ -1,22 +0,0 @@
|
||||
package com.youlai.mall.pms.service;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.SkuSpecValue;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.mall.pms.model.form.SkuSpecValueForm;
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.pms.model.query.SkuSpecValuePageQuery;
|
||||
import com.youlai.mall.pms.model.vo.SkuSpecValuePageVO;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* SKU规格值 服务类
|
||||
*
|
||||
* @author Ray Hao
|
||||
* @since 2024-04-14
|
||||
*/
|
||||
public interface SkuSpecValueService extends IService<SkuSpecValue> {
|
||||
|
||||
void saveSkuSpecValues(Long id, List<SpuForm.Attribute> specList);
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
package com.youlai.mall.pms.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.mall.pms.mapper.BrandMapper;
|
||||
import com.youlai.mall.pms.model.entity.Brand;
|
||||
import com.youlai.mall.pms.service.BrandService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements BrandService {
|
||||
}
|
@ -9,11 +9,11 @@
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>mall-pms</artifactId>
|
||||
<artifactId>mall-product</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>pms-api</module>
|
||||
<module>pms-boot</module>
|
||||
<module>product-api</module>
|
||||
<module>product-boot</module>
|
||||
</modules>
|
||||
</project>
|
@ -3,13 +3,13 @@
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>mall-pms</artifactId>
|
||||
<artifactId>mall-product</artifactId>
|
||||
<groupId>com.youlai</groupId>
|
||||
<version>3.2.1</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>pms-api</artifactId>
|
||||
<artifactId>product-api</artifactId>
|
||||
|
||||
<dependencies>
|
||||
|
@ -1,15 +1,15 @@
|
||||
package com.youlai.mall.pms.api;
|
||||
package com.youlai.mall.product.api;
|
||||
|
||||
import com.youlai.common.web.config.FeignDecoderConfig;
|
||||
import com.youlai.mall.pms.model.dto.LockSkuDTO;
|
||||
import com.youlai.mall.pms.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.product.model.dto.LockSkuDTO;
|
||||
import com.youlai.mall.product.model.dto.SkuInfoDto;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@FeignClient(value = "mall-pms", contextId = "sku", configuration = {FeignDecoderConfig.class})
|
||||
@FeignClient(value = "mall-product", contextId = "sku", configuration = {FeignDecoderConfig.class})
|
||||
public interface SkuFeignClient {
|
||||
|
||||
/**
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import com.youlai.common.base.BaseVO;
|
||||
import lombok.Builder;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -14,7 +14,7 @@ RUN echo "https://mirrors.ustc.edu.cn/alpine/v3.7/main/" > /etc/apk/repositories
|
||||
VOLUME /tmp
|
||||
|
||||
# 复制主机文件至镜像内,复制的目录需放置在 Dockerfile 文件同级目录下
|
||||
ADD target/pms-boot.jar app.jar
|
||||
ADD target/product-boot.jar app.jar
|
||||
|
||||
# 容器启动执行命令
|
||||
CMD java \
|
@ -3,13 +3,13 @@
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>mall-pms</artifactId>
|
||||
<artifactId>mall-product</artifactId>
|
||||
<groupId>com.youlai</groupId>
|
||||
<version>3.2.1</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>pms-boot</artifactId>
|
||||
<artifactId>product-boot</artifactId>
|
||||
|
||||
<properties>
|
||||
<service.port>8802</service.port>
|
||||
@ -53,7 +53,7 @@
|
||||
<!-- 商品feign客户端 -->
|
||||
<dependency>
|
||||
<groupId>com.youlai</groupId>
|
||||
<artifactId>pms-api</artifactId>
|
||||
<artifactId>product-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 会员feign客户端 -->
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms;
|
||||
package com.youlai.mall.product;
|
||||
|
||||
import com.youlai.mall.ums.api.MemberFeignClient;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
@ -9,8 +9,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
@SpringBootApplication
|
||||
@EnableDiscoveryClient
|
||||
@EnableFeignClients(basePackageClasses = {MemberFeignClient.class})
|
||||
public class PmsApplication {
|
||||
public class ProductApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(PmsApplication.class, args);
|
||||
SpringApplication.run(ProductApplication.class, args);
|
||||
}
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.constant;
|
||||
package com.youlai.mall.product.constant;
|
||||
|
||||
/**
|
||||
* 商品常量
|
@ -1,16 +1,12 @@
|
||||
package com.youlai.mall.pms.controller.admin;
|
||||
package com.youlai.mall.product.controller.admin;
|
||||
|
||||
import com.youlai.mall.pms.model.form.AttributeGroupForm;
|
||||
import com.youlai.mall.pms.model.query.AttributeGroupPageQuery;
|
||||
import com.youlai.mall.pms.model.vo.AttributeGroupPageVO;
|
||||
import com.youlai.mall.pms.service.AttributeGroupService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.youlai.mall.pms.model.form.AttributeForm;
|
||||
import com.youlai.mall.pms.model.query.AttributePageQuery;
|
||||
import com.youlai.mall.pms.model.vo.AttributePageVO;
|
||||
import com.youlai.mall.pms.service.AttributeService;
|
||||
import com.youlai.mall.product.model.form.AttributeForm;
|
||||
import com.youlai.mall.product.model.query.AttributePageQuery;
|
||||
import com.youlai.mall.product.model.vo.AttributePageVO;
|
||||
import com.youlai.mall.product.service.AttributeService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.youlai.common.result.PageResult;
|
||||
import com.youlai.common.result.Result;
|
@ -1,12 +1,12 @@
|
||||
package com.youlai.mall.pms.controller.admin;
|
||||
package com.youlai.mall.product.controller.admin;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.youlai.common.result.PageResult;
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.form.AttributeGroupForm;
|
||||
import com.youlai.mall.pms.model.query.AttributeGroupPageQuery;
|
||||
import com.youlai.mall.pms.model.vo.AttributeGroupPageVO;
|
||||
import com.youlai.mall.pms.service.AttributeGroupService;
|
||||
import com.youlai.mall.product.model.form.AttributeGroupForm;
|
||||
import com.youlai.mall.product.model.query.AttributeGroupPageQuery;
|
||||
import com.youlai.mall.product.model.vo.AttributeGroupPageVO;
|
||||
import com.youlai.mall.product.service.AttributeGroupService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
@ -1,13 +1,13 @@
|
||||
package com.youlai.mall.pms.controller.admin;
|
||||
package com.youlai.mall.product.controller.admin;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.common.result.PageResult;
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.entity.Brand;
|
||||
import com.youlai.mall.pms.model.query.BrandPageQuery;
|
||||
import com.youlai.mall.pms.service.BrandService;
|
||||
import com.youlai.mall.product.model.entity.Brand;
|
||||
import com.youlai.mall.product.model.query.BrandPageQuery;
|
||||
import com.youlai.mall.product.service.BrandService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@ -18,9 +18,9 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 品牌管理控制器
|
||||
* 品牌前端控制器
|
||||
*
|
||||
* @author <a href="mailto:xianrui0365@163.com">haoxr</a>
|
||||
* @author Ray Hao
|
||||
* @since 2022/7/2
|
||||
*/
|
||||
@Tag(name = "Admin-品牌接口")
|
||||
@ -55,9 +55,9 @@ public class BrandController {
|
||||
return Result.success(list);
|
||||
}
|
||||
|
||||
@Operation(summary = "品牌详情")
|
||||
@Operation(summary = "品牌表单数据")
|
||||
@GetMapping("/{id}")
|
||||
public Result listBrands(@PathVariable Integer id) {
|
||||
public Result getBrandDetail(@PathVariable Long id) {
|
||||
Brand brand = brandService.getById(id);
|
||||
return Result.success(brand);
|
||||
}
|
||||
@ -80,7 +80,9 @@ public class BrandController {
|
||||
|
||||
@Operation(summary = "删除品牌")
|
||||
@DeleteMapping("/{ids}")
|
||||
public Result deleteBrands(@Parameter(name = "品牌ID,多个以英文逗号(,)分割") @PathVariable("ids") String ids) {
|
||||
public Result deleteBrands(
|
||||
@Parameter(name = "品牌ID,多个以英文逗号(,)分割") @PathVariable("ids") String ids
|
||||
) {
|
||||
boolean status = brandService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.judge(status);
|
||||
}
|
@ -1,11 +1,11 @@
|
||||
package com.youlai.mall.pms.controller.admin;
|
||||
package com.youlai.mall.product.controller.admin;
|
||||
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.common.web.model.Option;
|
||||
import com.youlai.mall.pms.model.entity.Category;
|
||||
import com.youlai.mall.pms.model.form.CategoryForm;
|
||||
import com.youlai.mall.pms.model.vo.CategoryVO;
|
||||
import com.youlai.mall.pms.service.CategoryService;
|
||||
import com.youlai.mall.product.model.entity.Category;
|
||||
import com.youlai.mall.product.model.form.CategoryForm;
|
||||
import com.youlai.mall.product.model.vo.CategoryVO;
|
||||
import com.youlai.mall.product.service.CategoryService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
@ -1,8 +1,8 @@
|
||||
package com.youlai.mall.pms.controller.admin;
|
||||
package com.youlai.mall.product.controller.admin;
|
||||
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.entity.Sku;
|
||||
import com.youlai.mall.pms.service.SkuService;
|
||||
import com.youlai.mall.product.model.entity.Sku;
|
||||
import com.youlai.mall.product.service.SkuService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
@ -1,12 +1,12 @@
|
||||
package com.youlai.mall.pms.controller.admin;
|
||||
package com.youlai.mall.product.controller.admin;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.youlai.common.result.PageResult;
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.pms.model.query.SpuPageQuery;
|
||||
import com.youlai.mall.pms.model.vo.PmsSpuPageVO;
|
||||
import com.youlai.mall.pms.service.SpuService;
|
||||
import com.youlai.mall.product.model.form.SpuForm;
|
||||
import com.youlai.mall.product.model.query.SpuPageQuery;
|
||||
import com.youlai.mall.product.model.vo.PmsSpuPageVO;
|
||||
import com.youlai.mall.product.service.SpuService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
@ -1,8 +1,8 @@
|
||||
package com.youlai.mall.pms.controller.app;
|
||||
package com.youlai.mall.product.controller.app;
|
||||
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.vo.CategoryVO;
|
||||
import com.youlai.mall.pms.service.CategoryService;
|
||||
import com.youlai.mall.product.model.vo.CategoryVO;
|
||||
import com.youlai.mall.product.service.CategoryService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
@ -1,9 +1,9 @@
|
||||
package com.youlai.mall.pms.controller.app;
|
||||
package com.youlai.mall.product.controller.app;
|
||||
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.dto.LockSkuDTO;
|
||||
import com.youlai.mall.pms.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.pms.service.SkuService;
|
||||
import com.youlai.mall.product.model.dto.LockSkuDTO;
|
||||
import com.youlai.mall.product.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.product.service.SkuService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
@ -1,13 +1,13 @@
|
||||
package com.youlai.mall.pms.controller.app;
|
||||
package com.youlai.mall.product.controller.app;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.youlai.common.result.PageResult;
|
||||
import com.youlai.common.result.Result;
|
||||
import com.youlai.mall.pms.model.query.SpuPageQuery;
|
||||
import com.youlai.mall.pms.model.vo.SeckillingSpuVO;
|
||||
import com.youlai.mall.pms.model.vo.SpuDetailVO;
|
||||
import com.youlai.mall.pms.model.vo.SpuPageVO;
|
||||
import com.youlai.mall.pms.service.SpuService;
|
||||
import com.youlai.mall.product.model.query.SpuPageQuery;
|
||||
import com.youlai.mall.product.model.vo.SeckillingSpuVO;
|
||||
import com.youlai.mall.product.model.vo.SpuDetailVO;
|
||||
import com.youlai.mall.product.model.vo.SpuPageVO;
|
||||
import com.youlai.mall.product.service.SpuService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
@ -1,19 +1,18 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import org.mapstruct.*;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import com.youlai.mall.pms.model.dto.AttributeDTO;
|
||||
import com.youlai.mall.pms.model.entity.Attribute;
|
||||
import com.youlai.mall.pms.model.vo.AttributePageVO;
|
||||
import com.youlai.mall.pms.model.form.AttributeForm;
|
||||
import com.youlai.mall.pms.model.bo.AttributeBO;
|
||||
import com.youlai.mall.product.model.entity.Attribute;
|
||||
import com.youlai.mall.product.model.vo.AttributePageVO;
|
||||
import com.youlai.mall.product.model.form.AttributeForm;
|
||||
import com.youlai.mall.product.model.bo.AttributeBO;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface AttributeConverter{
|
||||
|
||||
@Mappings({
|
||||
@Mapping(target = "inputTypeLabel", expression = "java(com.youlai.common.base.IBaseEnum.getLabelByValue(bo.getInputType(), com.youlai.mall.pms.enums.AttributeInputTypeEnum.class))")
|
||||
@Mapping(target = "inputTypeLabel", expression = "java(com.youlai.common.base.IBaseEnum.getLabelByValue(bo.getInputType(), com.youlai.mall.product.enums.AttributeInputTypeEnum.class))")
|
||||
})
|
||||
AttributePageVO bo2PageVo(AttributeBO bo);
|
||||
|
@ -1,14 +1,13 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import com.youlai.mall.pms.model.dto.AttributeGroupDTO;
|
||||
import com.youlai.mall.pms.model.entity.AttributeGroup;
|
||||
import com.youlai.mall.pms.model.vo.AttributeGroupPageVO;
|
||||
import com.youlai.mall.pms.model.form.AttributeGroupForm;
|
||||
import com.youlai.mall.pms.model.bo.AttributeGroupBO;
|
||||
import com.youlai.mall.product.model.entity.AttributeGroup;
|
||||
import com.youlai.mall.product.model.vo.AttributeGroupPageVO;
|
||||
import com.youlai.mall.product.model.form.AttributeGroupForm;
|
||||
import com.youlai.mall.product.model.bo.AttributeGroupBO;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface AttributeGroupConverter{
|
@ -1,7 +1,7 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.Category;
|
||||
import com.youlai.mall.pms.model.form.CategoryForm;
|
||||
import com.youlai.mall.product.model.entity.Category;
|
||||
import com.youlai.mall.product.model.form.CategoryForm;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
|
@ -1,9 +1,9 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.bo.SkuBO;
|
||||
import com.youlai.mall.pms.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.pms.model.entity.Sku;
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.product.model.bo.SkuBO;
|
||||
import com.youlai.mall.product.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.product.model.entity.Sku;
|
||||
import com.youlai.mall.product.model.form.SpuForm;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
@ -1,17 +1,14 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.product.model.form.SpuForm;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import com.youlai.mall.pms.model.dto.SkuSpecValueDTO;
|
||||
import com.youlai.mall.pms.model.entity.SkuSpecValue;
|
||||
import com.youlai.mall.pms.model.vo.SkuSpecValuePageVO;
|
||||
import com.youlai.mall.pms.model.form.SkuSpecValueForm;
|
||||
import com.youlai.mall.pms.model.bo.SkuSpecValueBO;
|
||||
|
||||
import java.util.List;
|
||||
import com.youlai.mall.product.model.entity.SkuSpecValue;
|
||||
import com.youlai.mall.product.model.vo.SkuSpecValuePageVO;
|
||||
import com.youlai.mall.product.model.form.SkuSpecValueForm;
|
||||
import com.youlai.mall.product.model.bo.SkuSpecValueBO;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface SkuSpecValueConverter{
|
@ -1,12 +1,10 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import com.youlai.mall.pms.model.vo.SpecPageVO;
|
||||
import com.youlai.mall.pms.model.bo.SpuSpecBO;
|
||||
import com.youlai.mall.product.model.vo.SpecPageVO;
|
||||
import com.youlai.mall.product.model.bo.SpuSpecBO;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface SpecConverter{
|
@ -1,12 +1,10 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import com.youlai.mall.pms.model.vo.SpecValuePageVO;
|
||||
import com.youlai.mall.pms.model.form.SpecValueForm;
|
||||
import com.youlai.mall.pms.model.bo.SpuSpecValueBO;
|
||||
import com.youlai.mall.product.model.vo.SpecValuePageVO;
|
||||
import com.youlai.mall.product.model.bo.SpuSpecValueBO;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface SpecValueConverter{
|
@ -1,10 +1,8 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.SpuAttributeValue;
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.product.model.entity.SpuAttributeValue;
|
||||
import com.youlai.mall.product.model.form.SpuForm;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
import org.mapstruct.Mappings;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,8 +1,8 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.Spu;
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.pms.model.vo.SeckillingSpuVO;
|
||||
import com.youlai.mall.product.model.entity.Spu;
|
||||
import com.youlai.mall.product.model.form.SpuForm;
|
||||
import com.youlai.mall.product.model.vo.SeckillingSpuVO;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
|
@ -1,15 +1,14 @@
|
||||
package com.youlai.mall.pms.converter;
|
||||
package com.youlai.mall.product.converter;
|
||||
|
||||
import com.youlai.mall.pms.model.form.SpuForm;
|
||||
import com.youlai.mall.product.model.form.SpuForm;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
import com.youlai.mall.pms.model.dto.SpuImageDTO;
|
||||
import com.youlai.mall.pms.model.entity.SpuImage;
|
||||
import com.youlai.mall.pms.model.vo.SpuImagePageVO;
|
||||
import com.youlai.mall.pms.model.form.SpuImageForm;
|
||||
import com.youlai.mall.pms.model.bo.SpuImageBO;
|
||||
import com.youlai.mall.product.model.entity.SpuImage;
|
||||
import com.youlai.mall.product.model.vo.SpuImagePageVO;
|
||||
import com.youlai.mall.product.model.form.SpuImageForm;
|
||||
import com.youlai.mall.product.model.bo.SpuImageBO;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.enums;
|
||||
package com.youlai.mall.product.enums;
|
||||
|
||||
import com.youlai.common.base.IBaseEnum;
|
||||
import lombok.Getter;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.enums;
|
||||
package com.youlai.mall.product.enums;
|
||||
|
||||
import com.youlai.common.base.IBaseEnum;
|
||||
import lombok.Getter;
|
@ -1,8 +1,8 @@
|
||||
package com.youlai.mall.pms.listener;
|
||||
package com.youlai.mall.product.listener;
|
||||
|
||||
import com.rabbitmq.client.Channel;
|
||||
import com.youlai.common.rabbitmq.constant.RabbitMqConstants;
|
||||
import com.youlai.mall.pms.service.SkuService;
|
||||
import com.youlai.mall.product.service.SkuService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.amqp.core.Message;
|
@ -1,10 +1,10 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.AttributeGroup;
|
||||
import com.youlai.mall.product.model.entity.AttributeGroup;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.mall.pms.model.bo.AttributeGroupBO;
|
||||
import com.youlai.mall.pms.model.query.AttributeGroupPageQuery;
|
||||
import com.youlai.mall.product.model.bo.AttributeGroupBO;
|
||||
import com.youlai.mall.product.model.query.AttributeGroupPageQuery;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
@ -1,10 +1,10 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.Attribute;
|
||||
import com.youlai.mall.product.model.entity.Attribute;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.mall.pms.model.bo.AttributeBO;
|
||||
import com.youlai.mall.pms.model.query.AttributePageQuery;
|
||||
import com.youlai.mall.product.model.bo.AttributeBO;
|
||||
import com.youlai.mall.product.model.query.AttributePageQuery;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
@ -1,7 +1,7 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.mall.pms.model.entity.Brand;
|
||||
import com.youlai.mall.product.model.entity.Brand;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
@ -1,7 +1,7 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.mall.pms.model.entity.CategoryBrand;
|
||||
import com.youlai.mall.product.model.entity.CategoryBrand;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
@ -1,7 +1,7 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.mall.pms.model.entity.Category;
|
||||
import com.youlai.mall.product.model.entity.Category;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
@ -1,9 +1,9 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.mall.pms.model.bo.SkuBO;
|
||||
import com.youlai.mall.pms.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.pms.model.entity.Sku;
|
||||
import com.youlai.mall.product.model.bo.SkuBO;
|
||||
import com.youlai.mall.product.model.dto.SkuInfoDto;
|
||||
import com.youlai.mall.product.model.entity.Sku;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import java.util.List;
|
||||
|
@ -0,0 +1,19 @@
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.youlai.mall.product.model.entity.SkuSpecValue;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* SKU规格值 Mapper 接口
|
||||
*
|
||||
* @author Ray Hao
|
||||
* @since 2024-04-14
|
||||
*/
|
||||
|
||||
@Mapper
|
||||
public interface SkuSpecValueMapper extends BaseMapper<SkuSpecValue> {
|
||||
|
||||
|
||||
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.mall.pms.model.entity.SpuAttributeValue;
|
||||
import com.youlai.mall.product.model.entity.SpuAttributeValue;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
@ -1,10 +1,10 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.youlai.mall.pms.model.entity.SpuImage;
|
||||
import com.youlai.mall.product.model.entity.SpuImage;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.mall.pms.model.bo.SpuImageBO;
|
||||
import com.youlai.mall.pms.model.query.SpuImagePageQuery;
|
||||
import com.youlai.mall.product.model.bo.SpuImageBO;
|
||||
import com.youlai.mall.product.model.query.SpuImagePageQuery;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
@ -1,11 +1,11 @@
|
||||
package com.youlai.mall.pms.mapper;
|
||||
package com.youlai.mall.product.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.mall.pms.model.entity.Spu;
|
||||
import com.youlai.mall.pms.model.query.SpuPageQuery;
|
||||
import com.youlai.mall.pms.model.vo.PmsSpuPageVO;
|
||||
import com.youlai.mall.pms.model.vo.SpuPageVO;
|
||||
import com.youlai.mall.product.model.entity.Spu;
|
||||
import com.youlai.mall.product.model.query.SpuPageQuery;
|
||||
import com.youlai.mall.product.model.vo.PmsSpuPageVO;
|
||||
import com.youlai.mall.product.model.vo.SpuPageVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
@ -1,13 +1,12 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 属性
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,11 +1,10 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
||||
import java.io.Serializable;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* SKU规格值
|
@ -1,10 +1,8 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 商品图片
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.bo;
|
||||
package com.youlai.mall.product.model.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,10 +1,10 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* SKU规格值 DTO
|
||||
*
|
@ -1,10 +1,10 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 商品图片 DTO
|
||||
*
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
|
||||
import lombok.Getter;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.dto;
|
||||
package com.youlai.mall.product.model.dto;
|
||||
|
||||
|
||||
import lombok.Getter;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
||||
@ -28,7 +28,7 @@ public class Attribute extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 属性类型:1-规格,2-参数
|
||||
* @see com.youlai.mall.pms.enums.AttributeTypeEnum
|
||||
* @see com.youlai.mall.product.enums.AttributeTypeEnum
|
||||
*/
|
||||
private Integer type;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
@ -1,10 +1,9 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 品牌实体
|
||||
*
|
||||
@ -25,8 +24,23 @@ public class Brand extends BaseEntity {
|
||||
*/
|
||||
private String logoUrl;
|
||||
|
||||
/**
|
||||
* 品牌的首字母。
|
||||
*/
|
||||
private String firstLetter;
|
||||
|
||||
/**
|
||||
* 用于展示在列表中的排序权重,数值越小,排序越靠前。
|
||||
*/
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 是否显示[0-不显示,1-显示]
|
||||
*/
|
||||
private Integer visible;
|
||||
|
||||
/**
|
||||
* 品牌的简介
|
||||
*/
|
||||
private String description;
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
@ -1,9 +1,8 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.youlai.common.base.BaseEntity;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.entity;
|
||||
package com.youlai.mall.product.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
@ -1,8 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Getter;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
@ -1,8 +1,5 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
@ -1,8 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.form;
|
||||
package com.youlai.mall.product.model.form;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
@ -1,11 +1,8 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 属性组分页查询对象
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.query;
|
||||
package com.youlai.mall.product.model.query;
|
||||
|
||||
import com.youlai.common.base.BasePageQuery;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
@ -1,4 +1,4 @@
|
||||
package com.youlai.mall.pms.model.vo;
|
||||
package com.youlai.mall.product.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Getter;
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user