diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-common/pom.xml b/muyu-modules/muyu-activity/muyu-activity-common/pom.xml similarity index 84% rename from muyu-modules/muyu-group-buy/muyu-group-buy-common/pom.xml rename to muyu-modules/muyu-activity/muyu-activity-common/pom.xml index 5662a02..fc6c38b 100644 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-common/pom.xml +++ b/muyu-modules/muyu-activity/muyu-activity-common/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-group-buy + muyu-activity 3.6.3 - muyu-group-buy-common + muyu-activity-common 17 @@ -18,10 +18,9 @@ - com.muyu muyu-common-core - + \ No newline at end of file diff --git a/muyu-modules/muyu-activity/muyu-activity-common/src/main/java/com/muyu/domain/ActivityTeamInfo.java b/muyu-modules/muyu-activity/muyu-activity-common/src/main/java/com/muyu/domain/ActivityTeamInfo.java new file mode 100644 index 0000000..c102b36 --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-common/src/main/java/com/muyu/domain/ActivityTeamInfo.java @@ -0,0 +1,129 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; +import com.muyu.domain.resp.ActivityTeamInfoResp; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.w3c.dom.Text; + +import java.util.Date; + +/** + * @Author：cuifubo + * @Package：com.muyu.domain + * @Project：cloud-server + * @name：ActivityTeaminfo + * @Date：2024.11.19 09:25 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ActivityTeamInfo extends Wrapper { + /** + * 主键 + */ + private Integer id; + /** + * 拼团名称 + */ + private String name; + /** + * 商品ID + */ + private Integer productId; + /** + * 商品活动图 + */ + private String productImage; + /** + * 活动介绍 + */ + private Text introduction; + /** + * 单位 + */ + private String unit; + /** + * 轮播图 + */ + private Text imageList; + /** + * 活动结束时间 + */ + private Date endTime; + /** + * 活动排序 + */ + private String sort; + /** + * 活动详情 + */ + private Text content; + /** + * 活动状态 + */ + private String status; + /** + * 策略类型 + */ + private String strategyType; + /** + * 策略ID + */ + private Integer strategyId; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 修改人 + */ + private String updateBy; + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 查询构造器 + */ + public static ActivityTeamInfo queryBuild(ActivityTeamInfoResp activityTeamInfoResp){ + return ActivityTeamInfo.builder() + .name(activityTeamInfoResp.getName()) + .status(activityTeamInfoResp.getStatus()) + .build(); + } + + + @Override + public ActivityTeamInfo getEntity() { + return null; + } + + @Override + public MergeSegments getExpression() { + return null; + } + + @Override + public void clear() { + + } + + @Override + public String getSqlSegment() { + return null; + } +} diff --git a/muyu-modules/muyu-activity/muyu-activity-common/src/main/java/com/muyu/domain/resp/ActivityTeamInfoResp.java b/muyu-modules/muyu-activity/muyu-activity-common/src/main/java/com/muyu/domain/resp/ActivityTeamInfoResp.java new file mode 100644 index 0000000..e59c38b --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-common/src/main/java/com/muyu/domain/resp/ActivityTeamInfoResp.java @@ -0,0 +1,43 @@ +package com.muyu.domain.resp; + +import com.muyu.domain.ActivityTeamInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：cuifubo + * @Package：com.muyu.domain.resp + * @Project：cloud-server + * @name：ActivityTeamInfoResp + * @Date：2024.11.19 10:00 + */ + +/** + * 商品拼团信息表对象 activity_team_info + * + * @author DongZeLiang + * @date 2024-11-19 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ActivityTeamInfoQueryReq", description = "商品拼团信息表") +public class ActivityTeamInfoResp extends ActivityTeamInfo { + private static final long serialVersionUID = 1L; + + /** + * 拼团名称 + */ + private String name; + + /** + * 活动状态 + */ + private String status; + +} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/pom.xml b/muyu-modules/muyu-activity/muyu-activity-remote/pom.xml similarity index 77% rename from muyu-modules/muyu-group-buy/muyu-group-buy-remote/pom.xml rename to muyu-modules/muyu-activity/muyu-activity-remote/pom.xml index d45335c..61195e2 100644 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/pom.xml +++ b/muyu-modules/muyu-activity/muyu-activity-remote/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-group-buy + muyu-activity 3.6.3 - muyu-group-buy-remote + muyu-activity-remote 17 @@ -18,10 +18,11 @@ - com.muyu - muyu-product-common + muyu-activity-common + 3.6.3 - + + \ No newline at end of file diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/pom.xml b/muyu-modules/muyu-activity/muyu-activity-server/pom.xml similarity index 78% rename from muyu-modules/muyu-group-buy/muyu-group-buy-server/pom.xml rename to muyu-modules/muyu-activity/muyu-activity-server/pom.xml index 340ef25..dd080ec 100644 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/pom.xml +++ b/muyu-modules/muyu-activity/muyu-activity-server/pom.xml @@ -5,27 +5,18 @@ 4.0.0 com.muyu - muyu-group-buy + muyu-activity 3.6.3 - muyu-group-buy-server + muyu-activity-server 17 17 UTF-8 - - - - - - com.muyu - muyu-group-buy-common - - com.alibaba.cloud @@ -57,24 +48,24 @@ ${swagger.fox.version} + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + com.mysql mysql-connector-j - - - com.muyu - muyu-common-datasource - - - - - com.muyu - muyu-common-datascope - - com.muyu @@ -88,13 +79,7 @@ com.muyu - muyu-group-buy-common - 3.6.3 - compile - - - com.muyu - muyu-group-buy-common + muyu-activity-common 3.6.3 compile @@ -124,4 +109,4 @@ - + \ No newline at end of file diff --git a/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/controller/ActivityController.java b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/controller/ActivityController.java new file mode 100644 index 0000000..67b727c --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/controller/ActivityController.java @@ -0,0 +1,60 @@ +package com.muyu.controller; + +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.domain.ActivityTeamInfo; +import com.muyu.domain.resp.ActivityTeamInfoResp; +import com.muyu.service.ActivityService; +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 javax.naming.ldap.PagedResultsControl; +import java.util.List; + +import static com.muyu.common.core.utils.PageUtils.startPage; + +/** + * @Author：cuifubo + * @Package：com.muyu.controller + * @Project：cloud-server + * @name：ActivityController + * @Date：2024.11.19 09:58 + */ +@RestController +@RequestMapping("/activity") +public class ActivityController { + @Autowired + private ActivityService activityService; + + /** + * 查询商品拼团信息表列表 + */ + @ApiOperation("获取商品拼团信息表列表") + @RequiresPermissions("activity:activity:list") + @GetMapping("/list") + public Result> list(ActivityTeamInfoResp activityTeamInfoResp) { + startPage(); + List list = activityService.list(ActivityTeamInfo.queryBuild(activityTeamInfoResp)); + return getDataTable(list); + } + + + + + + + private Result> getDataTable(List list) { + + return null; + } + + +} diff --git a/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/mapper/ActivityMapper.java b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/mapper/ActivityMapper.java new file mode 100644 index 0000000..0881047 --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/mapper/ActivityMapper.java @@ -0,0 +1,17 @@ +package com.muyu.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.ActivityTeamInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：cuifubo + * @Package：com.muyu.mapper + * @Project：cloud-server + * @name：Activity + * @Date：2024.11.19 09:34 + */ +@Mapper +public interface ActivityMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/service/ActivityService.java b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/service/ActivityService.java new file mode 100644 index 0000000..b57e486 --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/service/ActivityService.java @@ -0,0 +1,19 @@ +package com.muyu.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.domain.ActivityTeamInfo; +import com.muyu.domain.resp.ActivityTeamInfoResp; + +import java.util.List; + +/** + * @Author：cuifubo + * @Package：com.muyu.service + * @Project：cloud-server + * @name：ActivityService + * @Date：2024.11.19 09:38 + */ +public interface ActivityService extends IService { + +} diff --git a/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/service/impl/ActivityServiceImpl.java b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/service/impl/ActivityServiceImpl.java new file mode 100644 index 0000000..1801484 --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/java/com/muyu/service/impl/ActivityServiceImpl.java @@ -0,0 +1,19 @@ +package com.muyu.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.domain.ActivityTeamInfo; +import com.muyu.mapper.ActivityMapper; +import com.muyu.service.ActivityService; +import org.springframework.beans.factory.annotation.Autowired; + +/** +*@Author：cuifubo +*@Package：com.muyu.service.impl +*@Project：cloud-server +*@name：ActivityServiceImpl +*@Date：2024.11.19 09:44 +*/ +public class ActivityServiceImpl extends ServiceImpl implements ActivityService { + +} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/banner.txt b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/banner.txt rename to muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/bootstrap.yml similarity index 84% rename from muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/bootstrap.yml index 3e7c168..0829088 100644 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/bootstrap.yml @@ -1,12 +1,12 @@ # Tomcat server: - port: 9308 + port: 9209 # Spring spring: application: # 应用名称 - name: muyu-group-buy + name: muyu-activity profiles: # 环境配置 active: dev @@ -23,6 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.product.mapper: DEBUG diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/logback.xml b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/logback.xml similarity index 98% rename from muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/logback.xml rename to muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/logback.xml index 69fb68b..0eebcc4 100644 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/logback.xml +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/mapper/ActivityMapper.xml b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/mapper/ActivityMapper.xml new file mode 100644 index 0000000..b636e7d --- /dev/null +++ b/muyu-modules/muyu-activity/muyu-activity-server/src/main/resources/mapper/ActivityMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, name, product_id, product_image, introduction, unit, image_list, end_time, sort, content, status, strategy_type, strategy_id, remark, create_by, create_time, update_by, update_time from activity_team_info + + \ No newline at end of file diff --git a/muyu-modules/muyu-activity/pom.xml b/muyu-modules/muyu-activity/pom.xml new file mode 100644 index 0000000..645b7a8 --- /dev/null +++ b/muyu-modules/muyu-activity/pom.xml @@ -0,0 +1,24 @@ + + + + com.muyu + muyu-modules + 3.6.3 + + pom + + muyu-activity-common + muyu-activity-remote + muyu-activity-server + + 4.0.0 + + muyu-activity + + + muyu-activity 商品拼团信息任务 + + + diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/GroupBuy.java b/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/GroupBuy.java deleted file mode 100644 index 41f3671..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/GroupBuy.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.muyu.product.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.annotation.Excel; -import com.muyu.product.domain.req.GroupBuyQueryReq; -import com.muyu.product.domain.req.GroupBuySaveReq; -import com.muyu.product.domain.req.GroupBuyEditReq; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 拼团对象 group_buy - * - * @author DongZeLiang - * @date 2024-11-14 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("group_buy") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "GroupBuy", description = "拼团") -public class GroupBuy extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 主键 */ - @TableId(value = "id",type = IdType.AUTO) - @ApiModelProperty(name = "主键", value = "主键") - private Long id; - - /** 外键，关联商品 */ - @Excel(name = "外键，关联商品") - @ApiModelProperty(name = "外键，关联商品", value = "外键，关联商品") - private Long projectId; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "开始时间", value = "开始时间") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "结束时间", value = "结束时间") - private Date endTime; - - /** 最小成团人数 */ - @Excel(name = "最小成团人数") - @ApiModelProperty(name = "最小成团人数", value = "最小成团人数") - private String minMembers; - - /** 活动状态 */ - @Excel(name = "活动状态") - @ApiModelProperty(name = "活动状态", value = "活动状态") - private String status; - - /** - * 查询构造器 - */ - public static GroupBuy queryBuild( GroupBuyQueryReq groupBuyQueryReq){ - return GroupBuy.builder() - .projectId(groupBuyQueryReq.getProjectId()) - .startTime(groupBuyQueryReq.getStartTime()) - .endTime(groupBuyQueryReq.getEndTime()) - .minMembers(groupBuyQueryReq.getMinMembers()) - .status(groupBuyQueryReq.getStatus()) - .build(); - } - - /** - * 添加构造器 - */ - public static GroupBuy saveBuild(GroupBuySaveReq groupBuySaveReq){ - return GroupBuy.builder() - .projectId(groupBuySaveReq.getProjectId()) - .startTime(groupBuySaveReq.getStartTime()) - .endTime(groupBuySaveReq.getEndTime()) - .minMembers(groupBuySaveReq.getMinMembers()) - .status(groupBuySaveReq.getStatus()) - .build(); - } - - /** - * 修改构造器 - */ - public static GroupBuy editBuild(Long id, GroupBuyEditReq groupBuyEditReq){ - return GroupBuy.builder() - .id(id) - .projectId(groupBuyEditReq.getProjectId()) - .startTime(groupBuyEditReq.getStartTime()) - .endTime(groupBuyEditReq.getEndTime()) - .minMembers(groupBuyEditReq.getMinMembers()) - .status(groupBuyEditReq.getStatus()) - .build(); - } - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuyEditReq.java b/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuyEditReq.java deleted file mode 100644 index 48642ea..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuyEditReq.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.muyu.product.domain.req; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 拼团对象 group_buy - * - * @author DongZeLiang - * @date 2024-11-14 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "GroupBuyEditReq", description = "拼团") -public class GroupBuyEditReq extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 外键，关联商品 */ - @ApiModelProperty(name = "外键，关联商品", value = "外键，关联商品") - private Long projectId; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "开始时间", value = "开始时间") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "结束时间", value = "结束时间") - private Date endTime; - - /** 最小成团人数 */ - @ApiModelProperty(name = "最小成团人数", value = "最小成团人数") - private String minMembers; - - /** 活动状态 */ - @ApiModelProperty(name = "活动状态", value = "活动状态") - private String status; - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuyQueryReq.java b/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuyQueryReq.java deleted file mode 100644 index 76e3ec8..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuyQueryReq.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.muyu.product.domain.req; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 拼团对象 group_buy - * - * @author DongZeLiang - * @date 2024-11-14 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "GroupBuyQueryReq", description = "拼团") -public class GroupBuyQueryReq extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 外键，关联商品 */ - @ApiModelProperty(name = "外键，关联商品", value = "外键，关联商品") - private Long projectId; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "开始时间", value = "开始时间") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "结束时间", value = "结束时间") - private Date endTime; - - /** 最小成团人数 */ - @ApiModelProperty(name = "最小成团人数", value = "最小成团人数") - private String minMembers; - - /** 活动状态 */ - @ApiModelProperty(name = "活动状态", value = "活动状态") - private String status; - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuySaveReq.java b/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuySaveReq.java deleted file mode 100644 index e8a9cdb..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-common/src/main/java/com/muyu/product/domain/req/GroupBuySaveReq.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.muyu.product.domain.req; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 拼团对象 group_buy - * - * @author DongZeLiang - * @date 2024-11-14 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "GroupBuySaveReq", description = "拼团") -public class GroupBuySaveReq extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 主键 */ - - @ApiModelProperty(name = "主键", value = "主键") - private Long id; - - /** 外键，关联商品 */ - - @ApiModelProperty(name = "外键，关联商品", value = "外键，关联商品") - private Long projectId; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "开始时间", value = "开始时间") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "结束时间", value = "结束时间") - private Date endTime; - - /** 最小成团人数 */ - - @ApiModelProperty(name = "最小成团人数", value = "最小成团人数") - private String minMembers; - - /** 活动状态 */ - - @ApiModelProperty(name = "活动状态", value = "活动状态") - private String status; - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java deleted file mode 100644 index fd88ca8..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.muyu.product.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectInfo; -import com.muyu.product.remote.factory.RemoteProjectInfoFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -/** - * @author DongZl - * @description: 规格远程调用业务层 - * @Date 2024-4-7 上午 10:58 - */ -@FeignClient( - contextId = "remoteProjectInfoService", - value = ServiceNameConstants.PRODUCT_SERVICE, - fallbackFactory = RemoteProjectInfoFactory.class, - path = "/info" -) -public interface RemoteProjectInfoService { - /** - * 获取商品信息详细信息 - */ - @GetMapping(value = "/{id}") - public Result getInfo(@PathVariable("id") Long id) ; - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java deleted file mode 100644 index 177ced8..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.muyu.product.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.remote.factory.RemoteProjectSkuFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @author DongZl - * @description: 远程调用业务层 - * @Date 2024-4-7 上午 10:58 - */ -@FeignClient( - contextId = "remoteProjectSkuService", - value = ServiceNameConstants.PRODUCT_SERVICE, - fallbackFactory = RemoteProjectSkuFactory.class, - path = "/sku" -) -public interface RemoteProjectSkuService { - - /** - * 通过商品ID和SKU获取SKU信息 - * @param projectId 商品ID - * @param projectSku 商品SKU - * @return 商品SKU信息 - */ - @GetMapping("/info/{projectId}/{projectSku}") - public Result getInfoByProjectIdAndSku(@PathVariable("projectId") Long projectId, - @PathVariable("projectSku") String projectSku); - /** - * 通过商品ID和SKU获取SKU信息 - * @param projectId 商品ID - * @return 商品SKU信息 - */ - @GetMapping("/list/{projectId}") - public Result> listByProjectId(@PathVariable("projectId") Long projectId); -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java deleted file mode 100644 index 6268dd2..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.product.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.domain.RuleAttrInfo; -import com.muyu.product.remote.factory.RemoteProjectSkuFactory; -import com.muyu.product.remote.factory.RemoteRuleAttrFactory; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @author DongZl - * @description: 规格信息远程调用业务层 - * @Date 2024-4-7 上午 10:58 - */ -@FeignClient( - contextId = "remoteRuleAttrService", - value = ServiceNameConstants.PRODUCT_SERVICE, - fallbackFactory = RemoteRuleAttrFactory.class, - path = "/ruleAttr" -) -public interface RemoteRuleAttrService { - /** - * 获取规格详情详细信息 - */ - @GetMapping(value = "/list/ruleId/{ruleId}") - public Result> getInfoByRuleId(@PathVariable("ruleId") Long id); -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java deleted file mode 100644 index 14a5ad3..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.product.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.domain.RuleInfo; -import com.muyu.product.remote.factory.RemoteProjectSkuFactory; -import com.muyu.product.remote.factory.RemoteRuleFactory; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -/** - * @author DongZl - * @description: 规格远程调用业务层 - * @Date 2024-4-7 上午 10:58 - */ -@FeignClient( - contextId = "remoteRuleService", - value = ServiceNameConstants.PRODUCT_SERVICE, - fallbackFactory = RemoteRuleFactory.class, - path = "/rule" -) -public interface RemoteRuleService { - /** - * 获取商品规格详细信息 - */ - @GetMapping(value = "/{id}") - public Result getInfo(@PathVariable("id") Long id); -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java deleted file mode 100644 index e07d42f..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.muyu.product.remote.factory; - -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectInfo; -import com.muyu.product.domain.RuleInfo; -import com.muyu.product.remote.RemoteProjectInfoService; -import com.muyu.product.remote.RemoteRuleService; -import org.springframework.cloud.openfeign.FallbackFactory; - -/** - * @author DongZl - * @description: 规格远程调熔断器 - * @Date 2024-4-7 上午 10:59 - */ -public class RemoteProjectInfoFactory implements FallbackFactory { - @Override - public RemoteProjectInfoService create (Throwable cause) { - return new RemoteProjectInfoService() { - - /** - * 获取商品规格详细信息 - * - * @param id - */ - @Override - public Result getInfo (Long id) { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java deleted file mode 100644 index 78fab1b..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.product.remote.factory; - -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.remote.RemoteProjectSkuService; -import org.springframework.cloud.openfeign.FallbackFactory; - -import java.util.List; - -/** - * @author DongZl - * @description: 远程调熔断器 - * @Date 2024-4-7 上午 10:59 - */ -public class RemoteProjectSkuFactory implements FallbackFactory { - @Override - public RemoteProjectSkuService create (Throwable cause) { - return new RemoteProjectSkuService() { - @Override - public Result getInfoByProjectIdAndSku (Long projectId, String projectSku) { - return Result.error(cause.getMessage()); - } - - /** - * 通过商品ID和SKU获取SKU信息 - * - * @param projectId 商品ID - * - * @return 商品SKU信息 - */ - @Override - public Result> listByProjectId (Long projectId) { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java deleted file mode 100644 index 2a11137..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.product.remote.factory; - -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.domain.RuleAttrInfo; -import com.muyu.product.remote.RemoteProjectSkuService; -import com.muyu.product.remote.RemoteRuleAttrService; -import com.muyu.product.remote.RemoteRuleService; -import org.springframework.cloud.openfeign.FallbackFactory; - -import java.util.List; - -/** - * @author DongZl - * @description: 规格详情远程调熔断器 - * @Date 2024-4-7 上午 10:59 - */ -public class RemoteRuleAttrFactory implements FallbackFactory { - @Override - public RemoteRuleAttrService create (Throwable cause) { - return new RemoteRuleAttrService() { - - /** - * 获取规格详情详细信息 - * - * @param id - */ - @Override - public Result> getInfoByRuleId (Long id) { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java deleted file mode 100644 index 9a99497..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.muyu.product.remote.factory; - -import com.muyu.common.core.domain.Result; -import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.domain.RuleInfo; -import com.muyu.product.remote.RemoteProjectSkuService; -import com.muyu.product.remote.RemoteRuleService; -import org.springframework.cloud.openfeign.FallbackFactory; - -/** - * @author DongZl - * @description: 规格远程调熔断器 - * @Date 2024-4-7 上午 10:59 - */ -public class RemoteRuleFactory implements FallbackFactory { - @Override - public RemoteRuleService create (Throwable cause) { - return new RemoteRuleService() { - - /** - * 获取商品规格详细信息 - * - * @param id - */ - @Override - public Result getInfo (Long id) { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 2d16640..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,4 +0,0 @@ -com.muyu.product.remote.factory.RemoteProjectSkuFactory -com.muyu.product.remote.factory.RemoteRuleAttrFactory -com.muyu.product.remote.factory.RemoteRuleFactory -com.muyu.product.remote.factory.RemoteProjectInfoFactory diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/MuYuGroupBuyApplication.java b/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/MuYuGroupBuyApplication.java deleted file mode 100644 index 35d0577..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/MuYuGroupBuyApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.product; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author DongZl - * @description: 商品启动类 - * @Date 2024-2-26 下午 04:07 - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class MuYuGroupBuyApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuGroupBuyApplication.class, args); - } - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/controller/GroupBuyController.java b/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/controller/GroupBuyController.java deleted file mode 100644 index 9c7566d..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/controller/GroupBuyController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.muyu.product.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.product.domain.GroupBuy; -import com.muyu.product.domain.req.GroupBuyQueryReq; -import com.muyu.product.domain.req.GroupBuySaveReq; -import com.muyu.product.domain.req.GroupBuyEditReq; -import com.muyu.product.service.GroupBuyService; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 拼团Controller - * - * @author DongZeLiang - * @date 2024-11-14 - */ -@Api(tags = "拼团") -@RestController -@RequestMapping("/buy") -public class GroupBuyController extends BaseController { - @Autowired - private GroupBuyService groupBuyService; - - /** - * 查询拼团列表 - */ - @ApiOperation("获取拼团列表") - @RequiresPermissions("product:buy:list") - @GetMapping("/list") - public Result> list(GroupBuyQueryReq groupBuyQueryReq) { - startPage(); - List list = groupBuyService.list(GroupBuy.queryBuild(groupBuyQueryReq)); - return getDataTable(list); - } - - /** - * 导出拼团列表 - */ - @ApiOperation("导出拼团列表") - @RequiresPermissions("product:buy:export") - @Log(title = "拼团", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, GroupBuy groupBuy) { - List list = groupBuyService.list(groupBuy); - ExcelUtil util = new ExcelUtil(GroupBuy.class); - util.exportExcel(response, list, "拼团数据"); - } - - /** - * 获取拼团详细信息 - */ - @ApiOperation("获取拼团详细信息") - @RequiresPermissions("product:buy:query") - @GetMapping(value = "/{id}") - @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) - public Result getInfo(@PathVariable("id") Long id) { - return Result.success(groupBuyService.getById(id)); - } - - /** - * 新增拼团 - */ - @RequiresPermissions("product:buy:add") - @Log(title = "拼团", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("新增拼团") - public Result add(@RequestBody GroupBuySaveReq groupBuySaveReq) { - return toAjax(groupBuyService.save(GroupBuy.saveBuild(groupBuySaveReq))); - } - - /** - * 修改拼团 - */ - @RequiresPermissions("product:buy:edit") - @Log(title = "拼团", businessType = BusinessType.UPDATE) - @PutMapping("/{id}") - @ApiOperation("修改拼团") - public Result edit(@PathVariable Long id, @RequestBody GroupBuyEditReq groupBuyEditReq) { - return toAjax(groupBuyService.updateById(GroupBuy.editBuild(id,groupBuyEditReq))); - } - - /** - * 删除拼团 - */ - @RequiresPermissions("product:buy:remove") - @Log(title = "拼团", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - @ApiOperation("删除拼团") - @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") - public Result remove(@PathVariable List ids) { - return toAjax(groupBuyService.removeBatchByIds(ids)); - } -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/mapper/GroupBuyMapper.java b/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/mapper/GroupBuyMapper.java deleted file mode 100644 index 602bdf3..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/mapper/GroupBuyMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.product.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.product.domain.GroupBuy; - -/** - * 拼团Mapper接口 - * - * @author DongZeLiang - * @date 2024-11-14 - */ -public interface GroupBuyMapper extends BaseMapper { - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/service/GroupBuyService.java b/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/service/GroupBuyService.java deleted file mode 100644 index 8fbd093..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/service/GroupBuyService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.product.service; - -import java.util.List; -import com.muyu.product.domain.GroupBuy; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 拼团Service接口 - * - * @author DongZeLiang - * @date 2024-11-14 - */ -public interface GroupBuyService extends IService { - /** - * 查询拼团列表 - * - * @param groupBuy 拼团 - * @return 拼团集合 - */ - public List list(GroupBuy groupBuy); - -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/service/impl/GroupBuyServiceImpl.java b/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/service/impl/GroupBuyServiceImpl.java deleted file mode 100644 index 541cf82..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/java/com/muyu/product/service/impl/GroupBuyServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.product.service.impl; - -import java.util.List; - -import com.muyu.common.core.utils.ObjUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import com.muyu.product.mapper.GroupBuyMapper; -import com.muyu.product.domain.GroupBuy; -import com.muyu.product.service.GroupBuyService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -/** - * 拼团Service业务层处理 - * - * @author DongZeLiang - * @date 2024-11-14 - */ -@Slf4j -@Service -public class GroupBuyServiceImpl extends ServiceImpl implements GroupBuyService { - - /** - * 查询拼团列表 - * - * @param groupBuy 拼团 - * @return 拼团 - */ - @Override - public List list(GroupBuy groupBuy) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - - if (ObjUtils.notNull(groupBuy.getProjectId())){ - queryWrapper.eq(GroupBuy::getProjectId, groupBuy.getProjectId()); - } - - if (ObjUtils.notNull(groupBuy.getStartTime())){ - queryWrapper.eq(GroupBuy::getStartTime, groupBuy.getStartTime()); - } - - if (ObjUtils.notNull(groupBuy.getEndTime())){ - queryWrapper.eq(GroupBuy::getEndTime, groupBuy.getEndTime()); - } - - if (ObjUtils.notNull(groupBuy.getMinMembers())){ - queryWrapper.eq(GroupBuy::getMinMembers, groupBuy.getMinMembers()); - } - - if (ObjUtils.notNull(groupBuy.getStatus())){ - queryWrapper.eq(GroupBuy::getStatus, groupBuy.getStatus()); - } - return list(queryWrapper); - } -} diff --git a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/mapper/GroupBuyMapper.xml b/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/mapper/GroupBuyMapper.xml deleted file mode 100644 index 47f117d..0000000 --- a/muyu-modules/muyu-group-buy/muyu-group-buy-server/src/main/resources/mapper/GroupBuyMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - select id, project_id, start_time, end_time, min_members, status from group_buy - - diff --git a/muyu-modules/muyu-group-buy/pom.xml b/muyu-modules/muyu-group-buy/pom.xml deleted file mode 100644 index 2ac62ca..0000000 --- a/muyu-modules/muyu-group-buy/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu-modules - 3.6.3 - - - muyu-group-buy - pom - - muyu-group-buy-common - muyu-group-buy-remote - muyu-group-buy-server - - - - 17 - 17 - UTF-8 - - - diff --git a/muyu-modules/muyu-group-buy/结构 b/muyu-modules/muyu-group-buy/结构 deleted file mode 100644 index f4f14d7..0000000 --- a/muyu-modules/muyu-group-buy/结构 +++ /dev/null @@ -1,26 +0,0 @@ -{ 基本信息: { - name: "", - introduction: "", - mianType: "", - parentType: "", - type: "", - image: "", - carouselImages: "", - status: "", - ruleId: "", - branId: "", - remark: "" - }, - 品类属性: [ { - id: "", - value: "", - } ………… - ], - 商品规格: [ { - SKU: "",(所有的规格属性拼接而成) - "images": "", - 库存: "", - 价格: "", - } ………… - ] -} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java index 8a77303..e7f2714 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java @@ -30,6 +30,7 @@ public class CategoryInfoSaveModel extends TreeEntity { private static final long serialVersionUID = 1L; + private Long id; /** 品类名称 */ private String name; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java index a5536ab..180f8a7 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java @@ -24,6 +24,7 @@ import java.util.List; public class CategoryInfoEditReq extends TreeEntity { private static final long serialVersionUID = 1L; + private Long id; /** 品类名称 */ @ApiModelProperty(name = "品类名称", value = "品类名称", required = true) @@ -43,11 +44,11 @@ public class CategoryInfoEditReq extends TreeEntity { /** * 商品属性组关联ID */ - private List attributeGroupIdList; + private List attributeIdList; /** * 商品属性关联ID */ - private List attributeIdList; + private List attributeGroupIdList; /** * 商品品牌组关联ID diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoReq.java new file mode 100644 index 0000000..4082f87 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoReq.java @@ -0,0 +1,62 @@ +package com.muyu.product.domain.req; + +import com.muyu.product.domain.*; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author：cuifubo + * @Package：com.muyu.product.domain.req + * @Project：cloud-server + * @name：CategoryInfoReq + * @Date：2024.11.17 21:37 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CategoryInfoReq { + /** 主键 */ + + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 品类名称 */ + + @ApiModelProperty(name = "品类名称", value = "品类名称", required = true) + private String name; + + /** 图片 */ + + @ApiModelProperty(name = "图片", value = "图片", required = true) + private String image; + + /** 是否启用 */ + + @ApiModelProperty(name = "是否启用", value = "是否启用", required = true) + private String start; + + /** 介绍 */ + + @ApiModelProperty(name = "介绍", value = "介绍") + private String introduction; + + /** + * 商品属性组关联ID + */ + private List attributeGroupIdList; + /** + * 商品属性关联ID + */ + private List attributeInfoIdList; + + /** + * 商品品牌组关联ID + */ + private List brandInfoIdList; +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index dfa0f59..8646fc0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java @@ -10,6 +10,7 @@ import com.muyu.product.domain.AttributeGroup; import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.BrandInfo; import com.muyu.product.domain.model.CategoryInfoSaveModel; +import com.muyu.product.domain.req.CategoryInfoReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; import io.swagger.annotations.*; @@ -101,6 +102,17 @@ public class CategoryInfoController extends BaseController { return Result.success(categoryInfoService.getTemplateAttributeByCateGoryId(cateGoryId)); } + /** + * 获取品类信息详细信息 + */ + @ApiOperation("获取品类信息共有属性信息") + @RequiresPermissions("product:category:query") + @GetMapping(value = "/getTemplateAttributeId/{id}") + @ApiImplicitParam(name = "cateGoryId", value = "cateGoryId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getTemplateAttributeByCateGory(@PathVariable("id") Long id) { + CategoryInfoReq updById = categoryInfoService.getUpdIdById(id); + return Result.success(updById); + } /** * 新增品类信息 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java index 8924a61..3e4d428 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java @@ -2,7 +2,7 @@ package com.muyu.product.service; import java.util.List; -import com.muyu.common.core.domain.Result; + import com.muyu.product.domain.AttributeGroup; import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.BrandInfo; @@ -10,6 +10,7 @@ import com.muyu.product.domain.CategoryInfo; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.req.CategoryInfoEditReq; +import com.muyu.product.domain.req.CategoryInfoReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; @@ -76,4 +77,7 @@ public interface CategoryInfoService extends IService { int removeBatchById(Long id); + + + CategoryInfoReq getUpdIdById(Long cateGoryId); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java index c3320c4..5753bbb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java @@ -13,6 +13,7 @@ import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.model.TemplateAttributeGroupModel; import com.muyu.product.domain.model.TemplateAttributeModel; import com.muyu.product.domain.req.CategoryInfoEditReq; +import com.muyu.product.domain.req.CategoryInfoReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; import com.muyu.product.mapper.CategoryInfoMapper; @@ -291,12 +292,12 @@ public class CategoryInfoServiceImpl extends ServiceImpl AsCategoryAttributeGroup.categoryBuild(categoryGoryAttributeGroupId,id)) .toList() ); asCategoryBrandService.saveBatch( - categoryInfoEditReq.getAttributeIdList().stream() + categoryInfoEditReq.getBrandIdList().stream() .map(categoryBrandId -> AsCategoryBrand.categoryBuild(categoryBrandId,id)) .toList() ); @@ -324,6 +325,49 @@ public class CategoryInfoServiceImpl extends ServiceImpl GroupQueryWrapper = new LambdaQueryWrapper<>(); + GroupQueryWrapper.eq(AsCategoryAttributeGroup::getCategoryId,id); + List groupList = asCategoryAttributeGroupService.list(GroupQueryWrapper); + List cateGroupId = groupList.stream() + .map(AsCategoryAttributeGroup::getAttributeGroupId) + .toList(); + List attributeGroupList = asCategoryAttributeGroupService.listByIds(cateGroupId); + + LambdaQueryWrapper BrandQueryWrapper = new LambdaQueryWrapper<>(); + BrandQueryWrapper.eq(AsCategoryAttribute::getCategoryId,id); + List grandList = asCategoryAttributeService.list(BrandQueryWrapper); + List attributeId = grandList.stream() + .map(AsCategoryAttribute::getAttributeId) + .toList(); + + List attributeInfoList = asCategoryAttributeService.listByIds(attributeId); + + LambdaQueryWrapper brandQueryWrapper = new LambdaQueryWrapper<>(); + brandQueryWrapper.eq(AsCategoryBrand::getCategoryId,id); + List brandList = asCategoryBrandService.list(brandQueryWrapper); + List BrandId = brandList.stream() + .map(AsCategoryBrand::getBrandId) + .toList(); + + List brandInfoList = asCategoryBrandService.listByIds(BrandId); + + return CategoryInfoReq.builder() + .id(byId.getId()) + .name(byId.getName()) + .start(byId.getStart()) + .image(byId.getImage()) + .introduction(byId.getIntroduction()) + .attributeGroupIdList(attributeGroupList) + .attributeInfoIdList(attributeInfoList) + .brandInfoIdList(brandInfoList) + .build(); + + } + /** * 通过品类ID获取父级以上的属性、属性组、品牌集合 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java index 448a3d9..fcce8a9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java @@ -1,7 +1,6 @@ package com.muyu.product.service.impl; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import com.muyu.common.core.utils.ObjUtils; diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 9cb767e..ed9266d 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -12,11 +12,10 @@ muyu-system muyu-gen muyu-job + muyu-activity muyu-file muyu-product muyu-shop-cart - muyu-group-buy - muyu-modules