From 9055ac837fdbc7c1ac5dd16927cd230c4b389da9 Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 29 Mar 2024 17:02:47 +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 --- .../product/domain/DTO/ServiceMiddle.java | 24 ++++++++ .../com/muyu/product/domain/DTO/Services.java | 21 +++++++ .../product/domain/DTO}/ValidationResult.java | 4 +- .../com/muyu/product/domain/ShopLadder.java | 57 ------------------- .../com/muyu/product/domain/ShopMember.java | 55 ------------------ .../muyu/product/domain/SpecialOffers.java | 56 ------------------ .../muyu/product/mapper/ServiceMapper.java | 14 ----- .../muyu/product/service/ServiceService.java | 12 ---- .../service/impl/ServiceServiceImpl.java | 24 -------- 9 files changed, 47 insertions(+), 220 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ServiceMiddle.java create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/Services.java rename muyu-modules/muyu-product/{muyu-product-server/src/main/java/com/muyu/product/handel => muyu-product-commo/src/main/java/com/muyu/product/domain/DTO}/ValidationResult.java (86%) delete mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopLadder.java delete mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopMember.java delete mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/SpecialOffers.java delete mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ServiceMapper.java delete mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ServiceService.java delete mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ServiceServiceImpl.java diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ServiceMiddle.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ServiceMiddle.java new file mode 100644 index 0000000..dbc2f48 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ServiceMiddle.java @@ -0,0 +1,24 @@ +package com.muyu.product.domain.DTO; + +import com.muyu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/29 16:59 + */ +@Data +@ApiModel(value = "ServiceMiddle", description = "服务与商品关联信息") +public class ServiceMiddle extends BaseEntity { + + @ApiModelProperty(value = "Id") + private Integer id; + + @ApiModelProperty(value = "商品Id") + private Integer productId; + + @ApiModelProperty(value = "服务Id") + private Integer serviceId; +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/Services.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/Services.java new file mode 100644 index 0000000..9a483ea --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/Services.java @@ -0,0 +1,21 @@ +package com.muyu.product.domain.DTO; + +import com.muyu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: wangxinyuan + * @Date: 2024/3/29 17:00 + */ +@Data +@ApiModel(value = "Services", description = "服务信息") +public class Services extends BaseEntity { + + @ApiModelProperty(value = "服务Id") + private Integer id; + + @ApiModelProperty(value = "服务名称") + private String serviceName; +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/handel/ValidationResult.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ValidationResult.java similarity index 86% rename from muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/handel/ValidationResult.java rename to muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ValidationResult.java index 361d77c..14ec081 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/handel/ValidationResult.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/DTO/ValidationResult.java @@ -1,8 +1,8 @@ -package com.muyu.product.handel; +package com.muyu.product.domain.DTO; /** * @Author: wangxinyuan - * @Date: 2024/3/27 20:08 + * @Date: 2024/3/29 17:01 */ public class ValidationResult { diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopLadder.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopLadder.java deleted file mode 100644 index 57bd38e..0000000 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopLadder.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.muyu.product.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.HashMap; - -/** - * 阶梯价格对象 t_shop_ladder - * @Author: wangxinyuan - * @Date: 2024/3/26 19:00 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName("t_shop_ladder") -@ApiModel(value = "shopLadder", description = "阶梯价格对象") -public class ShopLadder extends HashMap { - - - private static final long serialVersionUID = 1L; - - private Long id; - - - - /** 阶梯数量 */ - @Excel(name = "阶梯数量") - @ApiModelProperty(name = "阶梯数量",value = "阶梯数量") - private Long ladderNum; - - /** 阶梯折扣 */ - @Excel(name = "阶梯折扣") - @ApiModelProperty(name = "阶梯折扣",value = "阶梯折扣") - private Long ladderDiscount; - - /** 商品ID */ - @Excel(name = "商品ID") - @ApiModelProperty(name = "商品ID",value = "商品ID") - private Long shopId; - - /** 是否删除 */ - @Excel(name = "是否删除") - private Long isDelete; - - - -} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopMember.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopMember.java deleted file mode 100644 index 31fe6c5..0000000 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/ShopMember.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.muyu.product.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.HashMap; - -/** - *会员价格对象 t_shop_member - * @Author: wangxinyuan - * @Date: 2024/3/26 19:03 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName("t_shop_member") -@ApiModel(value = "shopMember", description = "会员价格对象") -public class ShopMember extends HashMap { - - - private static final long serialVersionUID = 1L; - - /** ID */ - private Long id; - - /** 会员类型ID */ - @Excel(name = "会员类型ID") - @ApiModelProperty(name = "会员类型ID",value = "会员类型ID") - private Long memberTypeId; - - /** 优惠价格 */ - @Excel(name = "优惠价格") - @ApiModelProperty(name = "优惠价格",value = "优惠价格") - private BigDecimal offersPrice; - - /** 商品ID */ - @Excel(name = "商品ID") - @ApiModelProperty(name = "商品ID",value = "商品ID") - private Long shopId; - - /** 是否删除 */ - @Excel(name = "是否删除") - private Long isDelete; - -} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/SpecialOffers.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/SpecialOffers.java deleted file mode 100644 index 95976a0..0000000 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/muyu/product/domain/SpecialOffers.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.product.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashMap; - -/** - * 特惠促销对象 t_special_offers - * @Author: wangxinyuan - * @Date: 2024/3/26 19:06 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName("t_shop_member") -@ApiModel(value = "shopMember", description = "会员价格对象") -public class SpecialOffers extends HashMap { - - private static final long serialVersionUID = 1L; - - private Long id; - - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 优惠价格 */ - @Excel(name = "优惠价格") - @ApiModelProperty(name = "优惠价格",value = "优惠价格") - private BigDecimal offersPrice; - - /** 是否删除 */ - @Excel(name = "是否删除") - private Long isDelete; - -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ServiceMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ServiceMapper.java deleted file mode 100644 index 8cbae6e..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ServiceMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu.product.mapper; - -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @Author: wangxinyuan - * @Date: 2024/3/28 15:28 - */ -@Mapper -public interface ServiceMapper { - int insertProductService(Integer productId, List serviceIds); -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ServiceService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ServiceService.java deleted file mode 100644 index 980300e..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ServiceService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.muyu.product.service; - -import java.util.List; - -/** - * @Author: wangxinyuan - * @Date: 2024/3/28 15:25 - */ -public interface ServiceService { - - int insertProductService(Integer productId, List serviceIds); -} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ServiceServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ServiceServiceImpl.java deleted file mode 100644 index 64d84c3..0000000 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ServiceServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.product.service.impl; - -import com.muyu.product.mapper.ServiceMapper; -import com.muyu.product.service.ServiceService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author: wangxinyuan - * @Date: 2024/3/28 15:26 - */ -@Service -public class ServiceServiceImpl implements ServiceService { - - - @Autowired - private ServiceMapper serviceMapper; - @Override - public int insertProductService(Integer productId, List serviceIds) { - return serviceMapper.insertProductService(productId,serviceIds); - } -}