12.4,第2版

# Conflicts:
#	muyu-auth/src/main/resources/bootstrap.yml
#	muyu-gateway/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-file/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-job/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-system/src/main/resources/bootstrap.yml
#	muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml

doc/团购修改数据结构.java

@@ -0,0 +1,38 @@
+   {
+        "活动ID": "Long",
+        "商品规格List": [
+        {
+        "规格id":"Logn"
+        "规格SKU": "String",
+        "拼团价格": "BigDecimal",
+        "拼团库存": "Long"
+        }
+        ],
+        "活动状态":"String"
+        }
+
+
+
+
+           {
+           "商品ID": "Long",
+           "商品图片": "String",
+           "活动名称": "String",
+           "活动简介": "String",
+           "商品单位": "String",
+           "商品的轮播图": [
+           "String", "String"
+           ],
+           "活动时间": "date",
+           "策略类型": "String",
+           "策略ID": "Long",
+           "商品规格List": [
+           {
+           "规格SKU": "String",
+           "拼团价格": "BigDecimal",
+           "拼团库存": "Long"
+           }
+           ],
+           "排序": "Integer",
+           "详情": "String"
+           }

doc/策略.md

@@ -0,0 +1,21 @@
+# 拼团策略功能划分
+# 1  拼团列表 
+     策略列表:
+      5人团 
+       百人团
+        团长免单团
+# 2. 点击拼团 进入商品列表
+# 3. 拼团详情  
+# 4. 拼团成功
+# 5  支付订单
+# 6. 拼团失败
+# 7  重新加入拼团
+
+
+
+
+# 商品列表
+# 参团列表
+# 购买
+# 评论
+

muyu-auth/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java

@@ -58,7 +58,7 @@ public class IpUtils {
             ip = request.getRemoteAddr();
         }
 
-        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "124.221.28.250" : getMultistageReverseProxyIp(ip);
     }
 
     /**
@@ -70,7 +70,7 @@ public class IpUtils {
      */
     public static boolean internalIp (String ip) {
         byte[] addr = textToNumericFormatV4(ip);
-        return internalIp(addr) || "127.0.0.1".equals(ip);
+        return internalIp(addr) || "124.221.28.250".equals(ip);
     }
 
     /**
@@ -197,7 +197,7 @@ public class IpUtils {
             return InetAddress.getLocalHost().getHostAddress();
         } catch (UnknownHostException e) {
         }
-        return "127.0.0.1";
+        return "124.221.28.250";
     }
 
     /**

muyu-gateway/src/main/java/com/muyu/gateway/config/CorsConfig.java

@@ -0,0 +1,58 @@
+package com.muyu.gateway.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.cors.reactive.CorsUtils;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
+
+/**
+ * 跨域配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+public class CorsConfig
+{
+    /**
+     * 这里为支持的请求头，如果有自定义的header字段请自己添加
+     */
+    private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token";
+    private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD";
+    private static final String ALLOWED_ORIGIN = "*";
+    private static final String ALLOWED_EXPOSE = "*";
+    private static final String MAX_AGE = "18000L";
+
+    @Bean
+    public WebFilter corsFilter()
+    {
+        return (ServerWebExchange ctx, WebFilterChain chain) -> {
+            ServerHttpRequest request = ctx.getRequest();
+            if (CorsUtils.isCorsRequest(request))
+            {
+                ServerHttpResponse response = ctx.getResponse();
+                HttpHeaders headers = response.getHeaders();
+                headers.add("Access-Control-Allow-Headers", ALLOWED_HEADERS);
+                headers.add("Access-Control-Allow-Methods", ALLOWED_METHODS);
+                headers.add("Access-Control-Allow-Origin", ALLOWED_ORIGIN);
+                headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE);
+                headers.add("Access-Control-Max-Age", MAX_AGE);
+                headers.add("Access-Control-Allow-Credentials", "true");
+                if (request.getMethod() == HttpMethod.OPTIONS)
+                {
+                    response.setStatusCode(HttpStatus.OK);
+                    return Mono.empty();
+                }
+            }
+            return chain.filter(ctx);
+        };
+    }
+}
+

muyu-gateway/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +33,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 120.46.147.226:8848
+            server-addr: 124.221.28.250:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

muyu-modules/muyu-file/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java

@@ -88,6 +88,7 @@ public class ActivityTeamInfo extends BaseEntity {
             .unit(activityTeamInfoAddModel.getUnit())
             .imageList(activityTeamInfoAddModel.getImageList())
             .endTime(activityTeamInfoAddModel.getEndTime())
+            .remark(activityTeamInfoAddModel.getRemark())
             .sort(activityTeamInfoAddModel.getSort())
             .content(activityTeamInfoAddModel.getContent())
             .status(activityTeamInfoAddModel.getStatus())

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyHundred.java

@@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "team_strategy_exemption_hundred", autoResultMap = true)
-public class TeamStrategyExemptionHundred extends BaseEntity {
+public class TeamStrategyHundred extends BaseEntity {
 
   /**
    * 主键

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyOrdinary.java

@@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true)
-public class TeamStrategyExemptionOrdinary extends BaseEntity {
+public class TeamStrategyOrdinary extends BaseEntity {
 
   /**
    * 主键

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamAddSkuInfo.java

@@ -0,0 +1,48 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ActivityTeamAddSkuInfo
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/27 20:30
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class ActivityTeamAddSkuInfo {
+    //        "添加商品规格List": [
+    //                "商品SKU": "String",
+    //                "商品价格": "BigDecimal",
+    //                "拼团价格": "BigDecimal",
+    //                "拼团库存": "Long"
+    //            ]
+    /**
+     * 商品SKU
+     */
+    private String productSku;
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamAddSkuInfo addSkuInfo(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){
+        return ActivityTeamAddSkuInfo.builder()
+                .productSku(activityTeamProductSkuInfo.getProductSku())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                .teamStock(activityTeamProductSkuInfo.getTeamStock())
+                .build();
+    }
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java

@@ -2,11 +2,10 @@ package com.muyu.marketing.domain.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
@@ -18,11 +17,12 @@ import java.util.function.Supplier;
  * @author DongZeLiang
  * @date 2024-11-26 09:38
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ActivityTeamInfoAddModel {
+public class ActivityTeamInfoAddModel extends BaseEntity {
 
     /**
      * 拼团名称
@@ -90,6 +90,7 @@ public class ActivityTeamInfoAddModel {
                 .imageList(activityTeamInfoSaveReq.getImageList())
                 .endTime(activityTeamInfoSaveReq.getEndTime())
                 .sort(activityTeamInfoSaveReq.getSort())
+                .remark(activityTeamInfoSaveReq.getRemark())
                 .content(activityTeamInfoSaveReq.getContent())
                 .status(activityTeamInfoSaveReq.getStatus())
                 .strategyType(activityTeamInfoSaveReq.getStrategyType())

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java

@@ -1,5 +1,6 @@
 package com.muyu.marketing.domain.model;
 
+import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.common.core.web.model.QueryModel;
 import com.muyu.marketing.domain.ActivityTeamInfo;
 import lombok.*;
@@ -16,10 +17,10 @@ import java.util.function.Function;
  * @date 2024-11-20 14:18:10
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ActivityTeamInfoListModel {
+public class ActivityTeamInfoListModel extends BaseEntity {
 
     /**
      * 拼团活动ID
@@ -33,6 +34,10 @@ public class ActivityTeamInfoListModel {
      * 参团人数
      */
     private Long addTeamNumber;
+    /**
+     * 商品简介
+     */
+    private String introduction;
     /**
      * 拼团人数
      */
@@ -69,21 +74,15 @@ public class ActivityTeamInfoListModel {
      * 团购库存
      */
     private Long teamStock;
-
+    private String remark;
 
     public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModel.ActivityTeamInfoListModelBuilder, ActivityTeamInfoListModel> function) {
         ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())
-//                .openTeamNumber(teamOpenTypeNumber)
-//                .addTeamNumber(teamInTypeNumber)
-//                .attendNumber(teamOpenTypeNumber + teamInTypeNumber)
-                .endTime(activityTeamInfo.getEndTime())
+                .remark(activityTeamInfo.getRemark())
                 .productImage(activityTeamInfo.getProductImage())
-//                .teamPrice(discountPrice.getTeamPrice())
-//                .productPrice(discountPrice.getProductPrice())
-//                .teamStock(teamProductStockModel.getTeamStock())
-//                .remainStock(teamProductStockModel.getRemainStock())
+                .introduction(activityTeamInfo.getIntroduction())
                 .status(activityTeamInfo.getStatus())
                 .build();
         return function.apply(
@@ -93,6 +92,8 @@ public class ActivityTeamInfoListModel {
                         .endTime(activityTeamInfo.getEndTime())
                         .productImage(activityTeamInfo.getProductImage())
                         .status(activityTeamInfo.getStatus())
+                        .introduction(activityTeamInfo.getIntroduction())
+
         );
     }
 

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java

@@ -1,5 +1,6 @@
 package com.muyu.marketing.domain.model;
 
+import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.common.core.web.model.QueryModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -28,5 +29,9 @@ public class ActivityTeamInfoListQueryModel extends QueryModel<ActivityTeamInfoL
      * 活动状态
      */
     private String status;
+    /**
+     * 商品简介
+     */
+    public String introduction;
 
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java

@@ -82,7 +82,6 @@ public class ActivityTeamInfoSaveModel {
                 .unit(activityTeamInfoAddModel.getUnit())
                 .imageList(activityTeamInfoAddModel.getImageList())
                 .endTime(activityTeamInfoAddModel.getEndTime())
-                .sort(activityTeamInfoAddModel.getSort())
                 .content(activityTeamInfoAddModel.getContent())
                 .status(activityTeamInfoAddModel.getStatus())
                 .strategyType(activityTeamInfoAddModel.getStrategyType())

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductListMode.java

@@ -0,0 +1,35 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @ClassName ActivityTeamProductListMode
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/12/3 15:01
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityTeamProductListMode {
+    /**
+     * 商品id
+     */
+    private Long productId;
+
+    /**
+     * 活动结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 活动状态
+     */
+    private String status;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelModel.java

@@ -0,0 +1,23 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @ClassName ActivityTeamProductSkuDelModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/27 19:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class ActivityTeamProductSkuDelModel {
+    /**
+     * 活动id
+     */
+    private Integer productSkuId;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuEchoModel.java

@@ -0,0 +1,55 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ActivityTeamProductSkuEchoModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 19:35
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class ActivityTeamProductSkuEchoModel {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long teamId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamProductSkuEchoModel modelBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){
+       return ActivityTeamProductSkuEchoModel.builder()
+                .teamId(activityTeamProductSkuInfo.getTeamId())
+                .sku(activityTeamProductSkuInfo.getProductSku())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                .teamStock(activityTeamProductSkuInfo.getRemainStock())
+                .build();
+    }
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdModel.java

@@ -0,0 +1,81 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.math3.stat.descriptive.summary.Product;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName ActivityTeamUpdModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/27 22:22
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityTeamUpdModel {
+
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU对象
+     */
+    private ProductSkuModel productSkuModel;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ProductSkuModel.java

@@ -0,0 +1,35 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @ClassName ProductSkuModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/27 22:24
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ProductSkuModel {
+    /**
+     * 修改商品规格List
+     */
+    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
+
+    /**
+     *删除商品规格IdList
+     */
+    private List<Long> productIdList;
+
+    /**
+     * 添加商品规格List
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamEchoModel.java

@@ -0,0 +1,92 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * @ClassName TeamEchoModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 22:14
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class TeamEchoModel {
+    /**
+     * 活动ID
+     */
+    private long id;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 轮播图
+     */
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private long sort;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private long strategyId;
+
+
+    public static TeamEchoModel echoModelBuild(ActivityTeamInfo teamEchoModel) {
+        return TeamEchoModel.builder()
+                .id(teamEchoModel.getId())
+                .name(teamEchoModel.getName())
+                .productId(teamEchoModel.getProductId())
+                .productImage(teamEchoModel.getProductImage())
+                .introduction(teamEchoModel.getIntroduction())
+                .unit(teamEchoModel.getUnit())
+                .imageList(teamEchoModel.getImageList())
+                .endTime(teamEchoModel.getEndTime())
+                .sort(teamEchoModel.getSort())
+                .content(teamEchoModel.getContent())
+                .strategyType(teamEchoModel.getStrategyType())
+                .strategyId(teamEchoModel.getStrategyId())
+                .build();
+            }
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java

@@ -21,7 +21,10 @@ public class TeamInfoListReq extends PageDomain {
      * 活动状态
      */
     private String status;
-
+    /**
+     * 活动介绍
+     */
+    private String introduction;
 
     /**
      * 通过当前对象构建业务查询模型
@@ -31,6 +34,7 @@ public class TeamInfoListReq extends PageDomain {
         return ActivityTeamInfoListQueryModel.builder()
                 .keyWord(this.keyWord)
                 .status(this.status)
+                .introduction(this.introduction)
                 .build()
                 .domainBuild(this);
     }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoEcho.java

@@ -0,0 +1,85 @@
+package com.muyu.marketing.domain.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName TeamInfoEcho
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 15:57
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class TeamInfoEcho extends BaseEntity {
+    /**
+     * 活动ID
+     */
+    private Long teamId;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<TeamProjectSkuInfoEchoResp> teamProjectSkuInfoEchoList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java

@@ -2,7 +2,6 @@ package com.muyu.marketing.domain.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java

@@ -64,7 +64,10 @@ public class TeamInfoListResp {
      * 团购库存
      */
     private Long teamStock;
-
+    /**
+     * 团购介绍
+     */
+    private String introduction;
     /**
      * 列表查询结果，构建为响应对象
      * @param activityTeamInfoListModel 列表数据查询结果
@@ -79,6 +82,7 @@ public class TeamInfoListResp {
                 .addTeamNumber(activityTeamInfoListModel.getAddTeamNumber())
                 .attendNumber(activityTeamInfoListModel.getAttendNumber())
                 .endTime(activityTeamInfoListModel.getEndTime())
+                .introduction(activityTeamInfoListModel.getIntroduction())
                 .teamPrice(activityTeamInfoListModel.getTeamPrice())
                 .productImage(activityTeamInfoListModel.getProductImage())
                 .productPrice(activityTeamInfoListModel.getProductPrice())

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamProjectSkuInfoEchoResp.java

@@ -0,0 +1,39 @@
+package com.muyu.marketing.domain.resp;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName TeamProjectSkuInfoEchoResp
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 15:59
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TeamProjectSkuInfoEchoResp {
+    /**
+     * 规格id
+     */
+    private Long productSkuId;
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+}

muyu-modules/muyu-marketing/marketing-remote/src/main/java/com/muyu/marketing/remote/product/ProductInfoRemote.java

@@ -0,0 +1,20 @@
+package com.muyu.marketing.remote.product;
+
+
+import com.muyu.common.core.domain.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @ClassName ProductInfoRemote
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/12/3 14:32
+ */
+
+@FeignClient("muyu-product")
+public interface ProductInfoRemote {
+    /**
+     * 获取商品信息详细信息
+     */
+;
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java

@@ -2,8 +2,6 @@ package com.muyu.marketing.team.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java

@@ -1,11 +1,10 @@
 package com.muyu.marketing.team.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.domain.TeamStrategyHundred;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface TeamStrategyExemptionHundredMapper extends BaseMapper<TeamStrategyExemptionHundred> {
+public interface TeamStrategyExemptionHundredMapper extends BaseMapper<TeamStrategyHundred> {
 
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java

@@ -1,11 +1,10 @@
 package com.muyu.marketing.team.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
+import com.muyu.marketing.domain.TeamStrategyOrdinary;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper<TeamStrategyExemptionOrdinary> {
+public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper<TeamStrategyOrdinary> {
 
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java

@@ -35,5 +35,10 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      */
     boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
-
+    /**
+     * 根据商品ID查询团购活动信息
+     * @param productId
+     * @return
+     */
+    public ActivityTeamProductListMode findProductList(Long productId);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java

@@ -3,7 +3,6 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import com.muyu.marketing.domain.model.*;
 
 import java.util.List;

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java

@@ -1,8 +0,0 @@
-package com.muyu.marketing.team.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
-
-public interface TeamStrategyExemptionHundredService extends IService<TeamStrategyExemptionHundred> {
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java

@@ -1,7 +0,0 @@
-package com.muyu.marketing.team.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
-
-public interface TeamStrategyExemptionOrdinaryService extends IService<TeamStrategyExemptionOrdinary> {
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java

@@ -2,7 +2,7 @@ package com.muyu.marketing.team.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
 
-public interface TeamStrategyExemptionService extends IService<TeamStrategyExemption> {
+public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService<TeamStrategyExemption> {
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java

@@ -0,0 +1,8 @@
+package com.muyu.marketing.team.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.marketing.domain.TeamStrategyHundred;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+
+public interface TeamStrategyHundredService extends ActivityTeamStrategy, IService<TeamStrategyHundred> {
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java

@@ -0,0 +1,8 @@
+package com.muyu.marketing.team.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.marketing.domain.TeamStrategyOrdinary;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+
+public interface TeamStrategyOrdinaryService extends ActivityTeamStrategy, IService<TeamStrategyOrdinary> {
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

@@ -34,6 +34,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         LambdaQueryWrapper<ActivityTeamInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getKeyWord()), ActivityTeamInfo::getName, activityTeamInfoListQueryModel.getKeyWord());
         queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getStatus()), ActivityTeamInfo::getStatus, activityTeamInfoListQueryModel.getStatus());
+        queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getIntroduction()),ActivityTeamInfo::getIntroduction,activityTeamInfoListQueryModel.getIntroduction());
 
         /**
          * Object<T> -> 创建对象的时候进行的占用
@@ -105,4 +106,11 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
         return update;
     }
+
+    @Override
+    public ActivityTeamProductListMode findProductList(Long productId) {
+        LambdaQueryWrapper<ActivityTeamInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ActivityTeamInfo::getProductId,productId);
+        return null;
+    }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java

@@ -13,10 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java

@@ -1,16 +0,0 @@
-package com.muyu.marketing.team.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import com.muyu.marketing.team.mapper.TeamStrategyExemptionHundredMapper;
-import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
-import com.muyu.marketing.team.service.TeamStrategyExemptionHundredService;
-import com.muyu.marketing.team.service.TeamStrategyExemptionService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TeamStrategyExemptionHundredServiceImpl extends ServiceImpl<TeamStrategyExemptionHundredMapper, TeamStrategyExemptionHundred>
-    implements TeamStrategyExemptionHundredService {
-    
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java

@@ -1,13 +0,0 @@
-package com.muyu.marketing.team.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
-import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper;
-import com.muyu.marketing.team.service.TeamStrategyExemptionOrdinaryService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TeamStrategyExemptionOrdinaryServiceImpl extends ServiceImpl<TeamStrategyExemptionOrdinaryMapper, TeamStrategyExemptionOrdinary>
-    implements TeamStrategyExemptionOrdinaryService {
-    
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java

@@ -4,10 +4,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.marketing.domain.TeamStrategyExemption;
 import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
 import com.muyu.marketing.team.service.TeamStrategyExemptionService;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("team-strategy-exemption")
+@Log4j2
 public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption>
     implements TeamStrategyExemptionService {
 
+    @Override
+    public void openTeam(Long activityTeamId) {
+       log.info("参加-免单团-[{}]",activityTeamId);
+
+    }
+
+    @Override
+    public void applyFor(Long teamId) {
+
+    }
+
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    @Override
+    public void settle(Long teamId) {
+
+    }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java

@@ -0,0 +1,39 @@
+package com.muyu.marketing.team.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.marketing.domain.TeamStrategyHundred;
+import com.muyu.marketing.team.mapper.TeamStrategyExemptionHundredMapper;
+import com.muyu.marketing.team.service.TeamStrategyHundredService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+@Service("team--strategy-hundred")
+@Log4j2
+public class TeamStrategyHundredServiceImpl extends ServiceImpl<TeamStrategyExemptionHundredMapper, TeamStrategyHundred>
+    implements TeamStrategyHundredService {
+
+    @Override
+    public void openTeam(Long activityTeamId) {
+        log.info("参加-百人团-[{}]",activityTeamId);
+    }
+
+    @Override
+    public void applyFor(Long teamId) {
+
+    }
+
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    @Override
+    public void settle(Long teamId) {
+
+    }
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java

@@ -0,0 +1,40 @@
+package com.muyu.marketing.team.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.marketing.domain.TeamStrategyOrdinary;
+import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper;
+import com.muyu.marketing.team.service.TeamStrategyOrdinaryService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+@Service("team-strategy-ordinary")
+@Log4j2
+public class TeamStrategyOrdinaryServiceImpl extends ServiceImpl<TeamStrategyExemptionOrdinaryMapper, TeamStrategyOrdinary>
+    implements TeamStrategyOrdinaryService {
+
+    @Override
+    public void openTeam(Long activityTeamId) {
+        log.info("参加-普通团-[{}]",activityTeamId);
+
+    }
+
+    @Override
+    public void applyFor(Long teamId) {
+
+    }
+
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    @Override
+    public void settle(Long teamId) {
+
+    }
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java

@@ -0,0 +1,40 @@
+package com.muyu.marketing.team.strategy;
+
+/**
+ * @ClassName ActivityTeamStrategy
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/29 17:11
+ */
+public interface ActivityTeamStrategy {
+    /**
+     * 开团
+     * @param activityTeamId 活动团id
+     */
+    public void openTeam(Long activityTeamId);
+
+    /**
+     * 申请参团
+     * @param teamId 团id
+     */
+    public void applyFor(Long teamId);
+
+    /**
+     * 参团
+     * @param teamId 团id
+     * @param orderNumber 订单号
+     */
+    public void addTeam(Long teamId,String orderNumber);
+
+    /**
+     * 退团
+     * @param teamId 团购ID
+     */
+    public void backTeam(Long teamId);
+
+    /**
+     * 结算团
+     * @param teamId
+     */
+    public void settle(Long teamId);
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java

@@ -0,0 +1,52 @@
+package com.muyu.marketing.team.strategy.impl;
+
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName ActivityTeamStrategyImpl
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/29 17:22
+ */
+@Service
+@Primary
+public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
+    @Override
+    public void openTeam(Long activityTeamId) {
+        String activityTeamType=null;
+        if (activityTeamId==null){
+            throw new RuntimeException("activityTeamId is null");
+        } else if (activityTeamId==0) {
+            //团长免单
+            activityTeamType = "team-strategy-exemption";
+        } else if (activityTeamId == 1) {
+            //普通团
+            activityTeamType = "team-strategy-ordinary";
+        } else if (activityTeamId == 2) {
+            //百人团
+            activityTeamType = "team--strategy-hundred";
+        }
+    }
+
+    @Override
+    public void applyFor(Long teamId) {
+
+    }
+
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    @Override
+    public void settle(Long teamId) {
+
+    }
+}

muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-buy
+    name: muyu-activity
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 124.221.28.250:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-product/muyu-product-common/pom.xml

@@ -23,5 +23,21 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-oas</artifactId>
+            <version>3.0.0</version>
+        </dependency>
     </dependencies>
 </project>

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java

@@ -49,6 +49,9 @@ public class AttributeGroup extends BaseEntity {
     @ApiModelProperty(name = "状态", value = "状态", required = true)
     private String states;
 
+    @ApiModelProperty(name = "备注" ,value = "状态" ,required = true)
+    private String remark;
+
 
     /**
     * 查询构造器
@@ -67,6 +70,7 @@ public class AttributeGroup extends BaseEntity {
         return AttributeGroup.builder()
                 .name(attributeGroupSaveReq.getName())
                 .states(attributeGroupSaveReq.getStates())
+                .remark(attributeGroupSaveReq.getRemark())
                 .build();
     }
 
@@ -78,6 +82,7 @@ public class AttributeGroup extends BaseEntity {
             .id(id)
                 .name(attributeGroupEditReq.getName())
                 .states(attributeGroupEditReq.getStates())
+                .remark(attributeGroupEditReq.getRemark())
                 .build();
     }
 

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java

@@ -17,6 +17,7 @@ import com.muyu.product.domain.req.CategoryInfoEditReq;
 import com.muyu.common.core.web.domain.TreeEntity;
 
 import java.util.Date;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -62,6 +63,56 @@ public class CategoryInfo extends TreeEntity {
     @ApiModelProperty(name = "介绍", value = "介绍")
     private String introduction;
 
+    @ApiModelProperty(name = "备注", value = "备注")
+    private String remark;
+
+    @Override
+    public Long getParentId() {
+        return super.getParentId() != null ? super.getParentId() : 0L;
+    }
+
+    /**
+     * 安全地获取父级ID
+     */
+    public Long getSafeParentId() {
+        return Optional.ofNullable(super.getParentId()).orElse(0L);
+    }
+
+    /**
+     * 判断是否有父级
+     */
+    public boolean hasParent() {
+        Long parentId = getParentId();
+        return parentId != null && parentId != 0;
+    }
+
+    // 修改构造器方法，添加对 parentId 的安全处理
+    public static CategoryInfo saveBuild(CategoryInfoSaveReq categoryInfoSaveReq, Supplier<String> supplier) {
+        return CategoryInfo.builder()
+                .name(categoryInfoSaveReq.getName())
+                .image(categoryInfoSaveReq.getImage())
+                .start(categoryInfoSaveReq.getStart())
+                .remark(categoryInfoSaveReq.getRemark())
+                .introduction(categoryInfoSaveReq.getIntroduction())
+                .parentId(Optional.ofNullable(categoryInfoSaveReq.getParentId()).orElse(0L))
+                .createBy(supplier.get())
+                .createTime(new Date())
+                .build();
+    }
+
+    public static CategoryInfo saveModelBuild(CategoryInfoSaveModel categoryInfoSaveModel) {
+        return CategoryInfo.builder()
+                .name(categoryInfoSaveModel.getName())
+                .image(categoryInfoSaveModel.getImage())
+                .start(categoryInfoSaveModel.getStart())
+                .remark(categoryInfoSaveModel.getRemark())
+                .introduction(categoryInfoSaveModel.getIntroduction())
+                .parentId(Optional.ofNullable(categoryInfoSaveModel.getParentId()).orElse(0L))
+                .createBy(categoryInfoSaveModel.getCreateBy())
+                .createTime(new Date())
+                .build();
+    }
+
     /**
     * 查询构造器
     */
@@ -74,43 +125,15 @@ public class CategoryInfo extends TreeEntity {
                 .build();
     }
 
-    /**
-    * 添加构造器
-    */
-    public static CategoryInfo saveBuild(CategoryInfoSaveReq categoryInfoSaveReq, Supplier<String> supplier){
-        return CategoryInfo.builder()
-                .name(categoryInfoSaveReq.getName())
-                .image(categoryInfoSaveReq.getImage())
-                .start(categoryInfoSaveReq.getStart())
-                .introduction(categoryInfoSaveReq.getIntroduction())
-                .parentId(categoryInfoSaveReq.getParentId())
-                .createBy(supplier.get())
-                .createTime(new Date())
-                .build();
-    }
-
-    /**
-    * 修改构造器
-    */
     public static CategoryInfo editBuild(Long id, CategoryInfoEditReq categoryInfoEditReq){
         return CategoryInfo.builder()
             .id(id)
                 .name(categoryInfoEditReq.getName())
                 .image(categoryInfoEditReq.getImage())
+                .remark(categoryInfoEditReq.getRemark())
                 .start(categoryInfoEditReq.getStart())
                 .introduction(categoryInfoEditReq.getIntroduction())
                 .build();
     }
 
-    public static CategoryInfo saveModelBuild(CategoryInfoSaveModel categoryInfoSaveModel) {
-        return CategoryInfo.builder()
-                .name(categoryInfoSaveModel.getName())
-                .image(categoryInfoSaveModel.getImage())
-                .start(categoryInfoSaveModel.getStart())
-                .introduction(categoryInfoSaveModel.getIntroduction())
-                .parentId(categoryInfoSaveModel.getParentId())
-                .createBy(categoryInfoSaveModel.getCreateBy())
-                .createTime(new Date())
-                .build();
-    }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java

@@ -91,6 +91,10 @@ public class ProjectInfo extends BaseEntity {
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
 
+    @ApiModelProperty(name = "备注", value = "备注")
+    private String remark;
+
+
     /**
     * 查询构造器
     */
@@ -148,4 +152,17 @@ public class ProjectInfo extends BaseEntity {
                 .build();
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ProjectInfo that = (ProjectInfo) o;
+        // 需要先判断 id 是否为 null
+        return (id != null && id.equals(that.id));
+    }
+
+    @Override
+    public int hashCode() {
+        return id != null ? id.hashCode() : 0;
+    }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java

@@ -66,16 +66,21 @@ public class ProjectSkuInfo extends BaseEntity {
     @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
     private String image;
 
+    @Excel(name = "规格值")
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String specValues;
+
     /**
     * 查询构造器
     */
-    public static ProjectSkuInfo queryBuild( ProjectSkuInfoQueryReq projectSkuInfoQueryReq){
+    public static ProjectSkuInfo queryBuild(ProjectSkuInfoQueryReq projectSkuInfoQueryReq){
         return ProjectSkuInfo.builder()
                 .projectId(projectSkuInfoQueryReq.getProjectId())
                 .sku(projectSkuInfoQueryReq.getSku())
                 .stock(projectSkuInfoQueryReq.getStock())
                 .price(projectSkuInfoQueryReq.getPrice())
                 .image(projectSkuInfoQueryReq.getImage())
+                .specValues(projectSkuInfoQueryReq.getSpecValues())
                 .build();
     }
 
@@ -89,6 +94,7 @@ public class ProjectSkuInfo extends BaseEntity {
                 .stock(projectSkuInfoSaveReq.getStock())
                 .price(projectSkuInfoSaveReq.getPrice())
                 .image(projectSkuInfoSaveReq.getImage())
+                .specValues(projectSkuInfoSaveReq.getSpecValues())
                 .build();
     }
 
@@ -103,6 +109,7 @@ public class ProjectSkuInfo extends BaseEntity {
                 .stock(projectSkuInfoEditReq.getStock())
                 .price(projectSkuInfoEditReq.getPrice())
                 .image(projectSkuInfoEditReq.getImage())
+                .specValues(projectSkuInfoEditReq.getSpecValues())
                 .build();
     }
 
@@ -113,6 +120,7 @@ public class ProjectSkuInfo extends BaseEntity {
                 .image(productSkuModel.getImage())
                 .stock(productSkuModel.getStock())
                 .price(productSkuModel.getPrice())
+                .specValues(productSkuModel.getSpecValues())
                 .build();
     }
 

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java

@@ -51,11 +51,8 @@ public class RuleInfo extends BaseEntity {
     @ApiModelProperty(name = "规格状态", value = "规格状态")
     private String status;
 
-    /** 规格状态 */
-    @Excel(name = "规格描述")
-    @ApiModelProperty(name = "规格描述", value = "规格描述")
+    @ApiModelProperty(name = "备注", value = "备注")
     private String remark;
-
     /**
     * 查询构造器
     */
@@ -63,6 +60,7 @@ public class RuleInfo extends BaseEntity {
         return RuleInfo.builder()
                 .name(ruleInfoQueryReq.getName())
                 .status(ruleInfoQueryReq.getStatus())
+                .remark(ruleInfoQueryReq.getRemark())
                 .build();
     }
 
@@ -72,6 +70,7 @@ public class RuleInfo extends BaseEntity {
     public static RuleInfo saveBuild(RuleInfoSaveReq ruleInfoSaveReq){
         return RuleInfo.builder()
                 .name(ruleInfoSaveReq.getName())
+                .remark(ruleInfoSaveReq.getRemark())
                 .status(ruleInfoSaveReq.getStatus())
                 .build();
     }
@@ -84,21 +83,19 @@ public class RuleInfo extends BaseEntity {
             .id(id)
                 .name(ruleInfoEditReq.getName())
                 .status(ruleInfoEditReq.getStatus())
+                .remark(ruleInfoEditReq.getRemark())
                 .build();
     }
 
-    /**
-     *
-     * @param ruleInfoAddModel 添加模型
-     * @param createBy 创建者
-     * @return 规格对象
-     */
-    public static RuleInfo addModelBuild (RuleInfoAddModel ruleInfoAddModel, Supplier<String> createBy) {
-        return RuleInfo.builder()
-                .name(ruleInfoAddModel.getName())
-                .status(ruleInfoAddModel.getStatus())
-                .createBy(createBy.get())
-                .createTime(new Date())
-                .build();
+    public static RuleInfo addModelBuild(RuleInfoAddModel model, Supplier<String> userNameSupplier) {
+        RuleInfo ruleInfo = new RuleInfo();
+        ruleInfo.setName(model.getName());
+        ruleInfo.setRemark(model.getRemark());
+        ruleInfo.setStatus(model.getStatus()); // 设置状态
+        ruleInfo.setCreateBy(userNameSupplier.get());
+        ruleInfo.setCreateTime(new Date());
+        ruleInfo.setUpdateBy(userNameSupplier.get());
+        ruleInfo.setUpdateTime(new Date());
+        return ruleInfo;
     }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/base/SwaggerConfig.java

@@ -0,0 +1,63 @@
+package com.muyu.product.domain.base;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import java.util.Collections;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * @ClassName SwaggerConfig
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/19 22:02
+ */
+@Configuration
+@EnableOpenApi
+public class SwaggerConfig {
+
+    @Bean
+    public Docket publicApi() {
+        return new Docket(DocumentationType.OAS_30)
+                .groupName("public-api")
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.muyu.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    @Bean
+    public Docket adminApi() {
+        return new Docket(DocumentationType.OAS_30)
+                .groupName("admin-api")
+                .apiInfo(adminApiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.muyu.admin"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("公共API")
+                .description("公共接口文档")
+                .version("1.0")
+                .build();
+    }
+
+    private ApiInfo adminApiInfo() {
+        return new ApiInfoBuilder()
+                .title("管理API")
+                .description("管理接口文档")
+                .version("1.0")
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java

@@ -43,6 +43,8 @@ public class CategoryInfoSaveModel extends TreeEntity {
     /** 介绍 */
     private String introduction;
 
+    private String remark;
+
     /**
      * 商品属性组关联ID
      */
@@ -65,6 +67,7 @@ public class CategoryInfoSaveModel extends TreeEntity {
                 .name(categoryInfoSaveReq.getName())
                 .image(categoryInfoSaveReq.getImage())
                 .start(categoryInfoSaveReq.getStart())
+                .remark(categoryInfoSaveReq.getRemark())
                 .introduction(categoryInfoSaveReq.getIntroduction())
                 .parentId(categoryInfoSaveReq.getParentId())
                 .attributeGroupIdList(categoryInfoSaveReq.getAttributeGroupIdList())

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProductSkuModel.java

@@ -1,12 +1,17 @@
 package com.muyu.product.domain.model;
 
 import com.muyu.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -18,21 +23,92 @@ import java.math.BigDecimal;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(value = "商品SKU模型", description = "商品SKU信息")
 public class ProductSkuModel {
 
-    /** sku */
-    @ApiModelProperty(name = "sku", value = "sku", required = true)
+    /** SKU编码 */
+    @NotBlank(message = "SKU编码不能为空")
+    @Excel(name = "SKU编码")
+    @ApiModelProperty(name = "sku", value = "SKU编码", required = true, example = "SP123456")
     private String sku;
 
     /** 商品库存 */
-    @ApiModelProperty(name = "商品库存", value = "商品库存", required = true)
+    @NotNull(message = "商品库存不能为空")
+    @Min(value = 0, message = "商品库存不能小于0")
+    @Excel(name = "商品库存")
+    @ApiModelProperty(name = "stock", value = "商品库存", required = true, example = "100")
     private Long stock;
 
-    /** 商品价格 */
-    @ApiModelProperty(name = "商品价格", value = "商品价格", required = true)
+    /** 销售价格 */
+    @NotNull(message = "销售价格不能为空")
+    @DecimalMin(value = "0.01", message = "销售价格必须大于0")
+    @Excel(name = "销售价格")
+    @ApiModelProperty(name = "price", value = "销售价格", required = true, example = "99.99")
     private BigDecimal price;
 
+    /** 市场价格 */
+    @Excel(name = "市场价格")
+    @ApiModelProperty(name = "marketPrice", value = "市场价格", example = "129.99")
+    private BigDecimal marketPrice;
+
+    /** 成本价格 */
+    @Excel(name = "成本价格")
+    @ApiModelProperty(name = "costPrice", value = "成本价格", example = "59.99")
+    private BigDecimal costPrice;
+
     /** 规格图片 */
-    @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
+    @NotBlank(message = "规格图片不能为空")
+    @Excel(name = "规格图片")
+    @ApiModelProperty(name = "image", value = "规格图片", required = true)
     private String image;
+
+    /** 规格值JSON */
+    @ApiModelProperty(name = "specValues", value = "规格值JSON", example = "{\"颜色\":\"红色\",\"尺寸\":\"XL\"}")
+    private String specValues;
+
+    /** 商品条形码 */
+    @Excel(name = "商品条形码")
+    @ApiModelProperty(name = "barcode", value = "商品条形码")
+    private String barcode;
+
+    /** 预警库存 */
+    @Min(value = 0, message = "预警库存不能小于0")
+    @Excel(name = "预警库存")
+    @ApiModelProperty(name = "lowStock", value = "预警库存", example = "10")
+    private Integer lowStock;
+
+    /** 锁定库存 */
+    @Excel(name = "锁定库存")
+    @ApiModelProperty(name = "lockStock", value = "锁定库存", example = "0")
+    private Integer lockStock;
+
+    /** 销量 */
+    @Excel(name = "销量")
+    @ApiModelProperty(name = "sales", value = "销量", example = "0")
+    private Integer sales;
+
+    /** 状态（0-禁用 1-启用） */
+    @Excel(name = "状态", readConverterExp = "0=禁用,1=启用")
+    @ApiModelProperty(name = "status", value = "状态（0-禁用 1-启用）", example = "1")
+    private String status;
+
+    /** SKU名称 */
+    @Excel(name = "SKU名称")
+    @ApiModelProperty(name = "skuName", value = "SKU名称")
+    private String skuName;
+
+    /** 重量(克) */
+    @Excel(name = "重量(克)")
+    @ApiModelProperty(name = "weight", value = "重量(克)")
+    private Double weight;
+
+    /** 体积(cm³) */
+    @Excel(name = "体积(cm³)")
+    @ApiModelProperty(name = "volume", value = "体积(cm³)")
+    private Double volume;
+
+    /** 排序号 */
+    @Excel(name = "排序号")
+    @ApiModelProperty(name = "sort", value = "排序号", example = "1")
+    private Integer sort;
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java

@@ -1,10 +1,16 @@
 package com.muyu.product.domain.model;
 
 import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.req.ProjectInfoEditReq;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 /**
  * @author DongZl
  * @description: 商品添加模型
@@ -17,43 +23,97 @@ import lombok.experimental.SuperBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class ProjectAddModel extends BaseEntity {
 
+    private Long id;
+
     /** 商品名称 */
-    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    @NotBlank(message = "商品名称不能为空")
+    @ApiModelProperty(name = "name", value = "商品名称", required = true)
     private String name;
 
     /** 商品描述 */
-    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    @ApiModelProperty(name = "introduction", value = "商品描述")
     private String introduction;
 
     /** 主类型 */
-    @ApiModelProperty(name = "主类型", value = "主类型")
+    @ApiModelProperty(name = "mianType", value = "主类型")
     private Long mianType;
 
     /** 父类型 */
-    @ApiModelProperty(name = "父类型", value = "父类型")
+    @ApiModelProperty(name = "parentType", value = "父类型")
     private Long parentType;
 
     /** 商品类型 */
-    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    @NotNull(message = "商品类型不能为空")
+    @ApiModelProperty(name = "type", value = "商品类型", required = true)
     private Long type;
 
-    /** 商品图片 */
-    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    /** 商品主图 */
+    @NotBlank(message = "商品主图不能为空")
+    @ApiModelProperty(name = "image", value = "商品主图", required = true)
     private String image;
 
     /** 商品轮播图 */
-    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    @ApiModelProperty(name = "carouselImages", value = "商品轮播图(多个图片用逗号分隔)")
     private String carouselImages;
 
-    /** 商品状态 */
-    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    /** 商品状态(0-下架 1-上架) */
+    @ApiModelProperty(name = "status", value = "商品状态(0-下架 1-上架)")
     private String status;
 
-    /** 规格 */
-    @ApiModelProperty(name = "规格", value = "规格")
+    /** 规格ID */
+    @ApiModelProperty(name = "ruleId", value = "规格ID")
     private Long ruleId;
 
-    /** 品牌 */
-    @ApiModelProperty(name = "品牌", value = "品牌")
+    /** 品牌ID */
+    @ApiModelProperty(name = "brandId", value = "品牌ID")
     private Long brandId;
+
+    /** SKU列表 */
+    @ApiModelProperty(name = "skuList", value = "SKU列表")
+    private List<ProductSkuModel> skuList;
+
+    /** 销售价格 */
+    @ApiModelProperty(name = "salePrice", value = "销售价格")
+    private Double salePrice;
+
+    /** 市场价格 */
+    @ApiModelProperty(name = "marketPrice", value = "市场价格")
+    private Double marketPrice;
+
+    /** 库存数量 */
+    @ApiModelProperty(name = "stock", value = "库存数量")
+    private Integer stock;
+
+    /** 排序号 */
+    @ApiModelProperty(name = "sort", value = "排序号")
+    private Integer sort;
+
+    /** 是否推荐(0-否 1-是) */
+    @ApiModelProperty(name = "isRecommend", value = "是否推荐(0-否 1-是)")
+    private String isRecommend;
+
+    /** 商品详情 */
+    @ApiModelProperty(name = "detail", value = "商品详情")
+    private String detail;
+
+    /** 规格属性JSON */
+    @ApiModelProperty(name = "specJson", value = "规格属性JSON")
+    private String specJson;
+
+
+    public static ProjectInfo editBuild(Long id, ProjectInfoEditReq projectInfoEditReq){
+        return ProjectInfo.builder()
+                .id(id)
+                .name(projectInfoEditReq.getProjectAddModel().getName())
+                .introduction(projectInfoEditReq.getProjectAddModel().getIntroduction())
+                .mianType(projectInfoEditReq.getProjectAddModel().getMianType())
+                .parentType(projectInfoEditReq.getProjectAddModel().getParentType())
+                .type(projectInfoEditReq.getProjectAddModel().getType())
+                .image(projectInfoEditReq.getProjectAddModel().getImage())
+                .carouselImages(projectInfoEditReq.getProjectAddModel().getCarouselImages())
+                .status(projectInfoEditReq.getProjectAddModel().getStatus())
+                .ruleId(projectInfoEditReq.getProjectAddModel().getRuleId())
+                .brandId(projectInfoEditReq.getProjectAddModel().getBrandId())
+                .build();
+    }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectModel.java

@@ -0,0 +1,21 @@
+package com.muyu.product.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName ProjectModel
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/19 21:45
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectModel {
+    private Long id;
+    private String value;
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectSKUModel.java

@@ -0,0 +1,25 @@
+package com.muyu.product.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ProjectSKUModel
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/19 21:45
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectSKUModel {
+    private String sku;
+    private Long stock;
+    private BigDecimal price;
+    private String image;
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java

@@ -33,8 +33,16 @@ public class RuleAttrAddModel extends BaseEntity {
     /**
      * 规格属性值集合
      */
+
+    private  String attrValue;
+
+    private String status = "Y";
+
+
     private List<String> valueList;
 
+//    private List<RuleAttrAddModel> ruleAttrList;
+
     public static RuleAttrAddModel infoBuild (RuleAttrInfo ruleAttrInfo) {
         return RuleAttrAddModel.builder()
                 .name(ruleAttrInfo.getName())

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAssModel.java

@@ -0,0 +1,36 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.product.domain.RuleAttrInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @ClassName RuleAttrAssModel
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/14 16:03
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class RuleAttrAssModel extends BaseEntity {
+    private String name;
+
+    private List<String> valueList;
+
+    public static RuleAttrAddModel infoBuild (RuleAttrInfo ruleAttrInfo) {
+        return RuleAttrAddModel.builder()
+                .name(ruleAttrInfo.getName())
+                .valueList(Arrays.stream(ruleAttrInfo.getAttrValue().split(",")).toList())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java

@@ -23,12 +23,16 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class RuleInfoAddModel extends BaseEntity {
 
+    private Long id;
+
     /** 规格名称 */
     private String name;
 
     /** 规格状态 */
     private String status;
 
+    private String remark;
+
     /**
      * 规格属性集合
      */
@@ -38,6 +42,7 @@ public class RuleInfoAddModel extends BaseEntity {
         return RuleInfoAddModel.builder()
                 .name(req.getName())
                 .status(req.getStatus())
+                .remark(req.getRemark())
                 .ruleAttrList(req.getRuleAttrList())
                 .build();
     }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java

@@ -35,6 +35,8 @@ public class TemplateAttributeModel extends BaseEntity {
      */
     private String code;
 
+    private String value;
+
     public static TemplateAttributeModel attributeInfoBuild(AttributeInfo attributeInfo){
         return TemplateAttributeModel.builder()
                 .id(attributeInfo.getId())

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java

@@ -1,7 +1,10 @@
 package com.muyu.product.domain.req;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.product.domain.AttributeInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -33,5 +36,10 @@ public class AttributeGroupEditReq extends BaseEntity {
     @ApiModelProperty(name = "状态", value = "状态", required = true)
     private String states;
 
+    @ApiModelProperty(name = "备注", value = "备注", required = true)
+    private String remark;
+
+    private List<AttributeInfoSaveReq> attributeList;
+
 
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java

@@ -8,7 +8,6 @@ import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.muyu.common.core.web.domain.TreeEntity;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -44,7 +43,6 @@ public class CategoryInfoSaveReq extends TreeEntity {
     /** 是否启用 */
 
     @ApiModelProperty(name = "是否启用", value = "是否启用", required = true)
-    @NotNull()
     private String start;
 
     /** 介绍 */

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java

@@ -1,5 +1,10 @@
 package com.muyu.product.domain.req;
 
+import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
+import com.muyu.product.domain.model.ProjectAddModel;
+import com.muyu.product.domain.model.ProjectModel;
+import com.muyu.product.domain.model.ProjectSKUModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -8,6 +13,10 @@ import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.muyu.common.core.web.domain.BaseEntity;
 
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 商品信息对象 project_info
  *
@@ -63,4 +72,34 @@ public class ProjectInfoEditReq extends BaseEntity {
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
 
+
+    @ApiModelProperty(value = "商品信息", required = true)
+    @NotNull(message = "商品信息不能为空")
+    private ProjectInfo projectInfo;
+
+    @ApiModelProperty("SKU列表")
+    private List<ProjectSkuInfo> skuList;
+
+    // 添加非空校验注解
+    @NotNull(message = "商品信息不能为空")
+    public ProjectInfo getProjectInfo() {
+        return projectInfo;
+    }
+
+    public List<ProjectSkuInfo> getSkuList() {
+        return skuList != null ? skuList : new ArrayList<>();
+    }
+
+    public void setProjectInfo(ProjectInfo projectInfo) {
+        this.projectInfo = projectInfo;
+    }
+
+    public void setSkuList(List<ProjectSkuInfo> skuList) {
+        this.skuList = skuList;
+    }
+
+    private ProjectAddModel projectAddModel;
+    private List<ProjectModel> attrValueList;
+    private List<ProjectSKUModel> productSkuList;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java

@@ -1,5 +1,7 @@
 package com.muyu.product.domain.req;
 
+import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -8,6 +10,8 @@ import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.muyu.common.core.web.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 商品信息对象 project_info
  *
@@ -63,4 +67,10 @@ public class ProjectInfoQueryReq extends BaseEntity {
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
 
+    @ApiModelProperty(name = "商品信息", value = "商品信息")
+    private ProjectInfo projectInfo;
+
+    @ApiModelProperty(name = "商品SKU", value = "商品SKU")
+    private List<ProjectSkuInfo> skuList;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java

@@ -1,5 +1,7 @@
 package com.muyu.product.domain.req;
 
+import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.model.AttrValueModel;
 import com.muyu.product.domain.model.ProductSkuModel;
 import com.muyu.product.domain.model.ProjectAddModel;
@@ -43,4 +45,10 @@ public class ProjectInfoSaveReq extends BaseEntity {
      */
     private List<ProductSkuModel> productSkuList;
 
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String specValues;
+
+    private ProjectInfo projectInfo;
+    private List<ProjectSkuInfo> skuList;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java

@@ -1,6 +1,10 @@
 package com.muyu.product.domain.req;
 
 import java.math.BigDecimal;
+import java.util.List;
+
+import com.muyu.product.domain.ProjectInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -43,5 +47,10 @@ public class ProjectSkuInfoEditReq extends BaseEntity {
     /** 规格图片 */
     @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
     private String image;
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String specValues;
+
+    private ProjectInfo projectInfo;
+    private List<ProjectSkuInfo> skuList;
 
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java

@@ -44,4 +44,7 @@ public class ProjectSkuInfoQueryReq extends BaseEntity {
     @ApiModelProperty(name = "规格图片", value = "规格图片")
     private String image;
 
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String specValues;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java

@@ -54,4 +54,7 @@ public class ProjectSkuInfoSaveReq extends BaseEntity {
     @ApiModelProperty(name = "规格图片", value = "规格图片", required = true)
     private String image;
 
+    @ApiModelProperty(name = "规格值", value = "规格值")
+    private String specValues;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoReq.java

@@ -0,0 +1,29 @@
+package com.muyu.product.domain.req;
+
+import com.muyu.product.domain.model.RuleAttrAddModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @ClassName RuleAttrInfoReq
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/14 16:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RuleAttrInfoReq {
+
+    private String name;
+
+    private String status;
+
+    private String remark;
+
+
+    private List<RuleAttrAddModel> ruleAttrList;
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java

@@ -7,6 +7,9 @@ import lombok.AllArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import io.swagger.annotations.*;
 import com.muyu.common.core.web.domain.BaseEntity;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 规格详情对象 rule_attr_info
@@ -43,4 +46,8 @@ public class RuleAttrInfoSaveReq extends BaseEntity {
     @ApiModelProperty(name = "规格值", value = "规格值")
     private String attrValue;
 
+    @NotBlank(message = "规格名称不能为空")
+    @Length(max = 50, message = "规格名称长度不能超过50个字符")
+    private String attrName;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleGroupUpdResp.java

@@ -0,0 +1,31 @@
+package com.muyu.product.domain.req;
+
+import com.muyu.product.domain.RuleAttrInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @ClassName RuleGroupUpdResp
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/13 22:24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleGroupUpdResp {
+
+    private Long id;
+
+    private String name;
+
+    private String status;
+
+    private List<RuleAttrInfo> ruleAttrList;
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java

@@ -1,6 +1,5 @@
 package com.muyu.product.domain.req;
 
-import com.muyu.common.core.annotation.Excel;
 import com.muyu.product.domain.model.RuleAttrAddModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -35,14 +34,7 @@ public class RuleInfoEditReq extends BaseEntity {
     @ApiModelProperty(name = "规格状态", value = "规格状态")
     private String status;
 
-    /** 规格状态 */
-    @Excel(name = "规格描述")
-    @ApiModelProperty(name = "规格描述", value = "规格描述")
-    private String remark;
-
-    /**
-     * 规格属性集合
-     */
     private List<RuleAttrAddModel> ruleAttrList;
 
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupPageResp.java

@@ -35,6 +35,8 @@ public class AttributeGroupPageResp extends BaseEntity {
     /** 状态 */
     private String states;
 
+    private String remark;
+
     /**
      * 属性对象集合
      */
@@ -48,11 +50,11 @@ public class AttributeGroupPageResp extends BaseEntity {
                 .attributeInfoList(attributeInfos)
                 .build();
     }
-
     public static AttributeGroupPageResp groupFunBuild (AttributeGroup attributeGroup, Function<Long,List<AttributeInfo> > function) {
         return AttributeGroupPageResp.builder()
                 .id(attributeGroup.getId())
                 .name(attributeGroup.getName())
+                .remark(attributeGroup.getRemark())
                 .states(attributeGroup.getStates())
                 .attributeInfoList(function.apply(attributeGroup.getId()))
                 .build();

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpdateResp.java

@@ -9,14 +9,16 @@ import lombok.NoArgsConstructor;
 import java.util.List;
 
 /**
- * 修改回显的详细信息
+ * @ClassName AttributeGroupUpdateResp
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/13 13:58
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AttributeGroupUpdResp {
-
+public class AttributeGroupUpdateResp {
     /** 属性组编号 */
     private Long id;
 
@@ -25,9 +27,8 @@ public class AttributeGroupUpdResp {
 
     /** 状态 */
     private String states;
+    private String remark;
 
-    /**
-     * 属性ID集合
-     */
     private List<AttributeInfo>  attributeList;
+
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoDetailResp.java

@@ -0,0 +1,46 @@
+package com.muyu.product.domain.resp;
+
+import com.muyu.common.core.utils.bean.BeanUtils;
+import com.muyu.product.domain.CategoryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @ClassName CategoryInfoDetailResp
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/14 23:34
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CategoryInfoDetailResp",description = "品类信息详情响应")
+public class CategoryInfoDetailResp extends CategoryInfo {
+    @ApiModelProperty("关联的属性ID列表")
+    private List<Long> attributeIdList;
+
+    @ApiModelProperty("关联的属性组ID列表")
+    private List<Long> attributeGroupIdList;
+
+    @ApiModelProperty("关联的品牌ID列表")
+    private List<Long> brandIdList;
+
+    @ApiModelProperty("父级品类名称")
+    private String parentName;
+
+    public static CategoryInfoDetailResp of(CategoryInfo categoryInfo, String parentName) {
+        CategoryInfoDetailResp resp = new CategoryInfoDetailResp();
+        // 复制基本属性
+        BeanUtils.copyProperties(categoryInfo, resp);
+        // 设置父级名称
+        resp.setParentName(parentName);
+        return resp;
+    }
+
+    public static CategoryInfoDetailResp of(CategoryInfo categoryInfo) {
+        return of(categoryInfo, null);
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java

@@ -61,4 +61,6 @@ public class ProjectDetailResp {
      * 属性组集合
      */
     private List<TemplateAttributeGroupModel> attributeGroupList;
+
+    private List<ProjectSkuInfo> skuList;
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java

@@ -32,17 +32,23 @@ public class RuleInfoResp extends BaseEntity {
     /** 规格状态 */
     private String status;
 
+    private String remark;
+
     /**
      * 规格属性集合
      */
     private List<RuleAttrAddModel> ruleAttrList;
 
-    public static RuleInfoResp infoBuild (RuleInfo ruleInfo, Function<Long, List<RuleAttrAddModel>> ruleAttrList) {
+    private Boolean isUsed;
+
+    public static RuleInfoResp infoBuild(RuleInfo ruleInfo, Function<Long, List<RuleAttrAddModel>> ruleAttrList, Function<Long, Boolean> isUsedFunc) {
         return RuleInfoResp.builder()
                 .id(ruleInfo.getId())
                 .name(ruleInfo.getName())
+                .remark(ruleInfo.getRemark())
                 .status(ruleInfo.getStatus())
                 .ruleAttrList(ruleAttrList.apply(ruleInfo.getId()))
+                .isUsed(isUsedFunc.apply(ruleInfo.getId()))
                 .build();
     }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoUpdResp.java

@@ -1,48 +0,0 @@
-package com.muyu.product.domain.resp;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.product.domain.model.RuleAttrAddModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * 规格修改响应对象
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RuleInfoUpdResp {
-
-    /** 主键 */
-    @TableId(value = "id",type = IdType.AUTO)
-    @ApiModelProperty(name = "主键", value = "主键")
-    private Long id;
-
-    /** 规格名称 */
-    @Excel(name = "规格名称")
-    @ApiModelProperty(name = "规格名称", value = "规格名称")
-    private String name;
-
-    /** 规格状态 */
-    @Excel(name = "规格状态")
-    @ApiModelProperty(name = "规格状态", value = "规格状态")
-    private String status;
-
-    /** 规格状态 */
-    @Excel(name = "规格描述")
-    @ApiModelProperty(name = "规格描述", value = "规格描述")
-    private String remark;
-
-    /**
-     * 规格属性集合
-     */
-    private List<RuleAttrAddModel> ruleAttrList;
-}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/vo/ProductVo.java

@@ -0,0 +1,39 @@
+package com.muyu.product.domain.vo;
+
+import com.muyu.product.domain.AttributeGroup;
+import com.muyu.product.domain.AttributeInfo;
+import com.muyu.product.domain.ProjectSkuInfo;
+import lombok.Data;
+
+import javax.management.Attribute;
+import java.util.List;
+
+/**
+ * @ClassName ProductVo
+ * @Description 描述
+ * @Author zhang
+ * @Date 2024/11/22 16:06
+ */
+@Data
+public class ProductVo {
+    private Long id;
+    private String name;    // 商品名称
+    private String introduction;  // 商品描述
+    private String mainType;     // 主类型
+    private String parentType;   // 父类型
+    private String type;         // 商品类型
+    private String image;        // 商品图片
+    private String carouselImages; // 轮播图
+    private String status;       // 商品状态
+    private Long ruleId;         // 规格ID
+    private Long brandId;        // 品牌ID
+    private String remark;       // 备注
+
+    // 属性相关
+    private List<AttributeGroup> templateAttributeGroupList; // 属性组列表
+    private List<AttributeInfo> templateAttributeList;          // 模板属性
+    private List<AttributeInfo> attributeList;                  // 自定义属性
+
+    // SKU相关
+    private List<ProjectSkuInfo> skuList;  // SKU列表
+}

muyu-modules/muyu-product/muyu-product-server/pom.xml

@@ -90,6 +90,11 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-swagger</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.6.15</version>
+        </dependency>
     </dependencies>
 
     <build>

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java

@@ -5,12 +5,14 @@ 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;
+import springfox.documentation.oas.annotations.EnableOpenApi;
 
 /**
  * @author DongZl
  * @description: 商品启动类
  * @Date 2024-2-26 下午 04:07
  */
+@EnableOpenApi
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableMyFeignClients
@@ -21,3 +23,4 @@ public class MuYuProductApplication {
     }
 
 }
+

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.product.domain.model.AttributeGroupSaveModel;
 import com.muyu.product.domain.resp.AttributeGroupPageResp;
-import com.muyu.product.domain.resp.AttributeGroupUpdResp;
+import com.muyu.product.domain.resp.AttributeGroupUpdateResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -75,8 +75,8 @@ public class AttributeGroupController extends BaseController {
     @RequiresPermissions("product:attributeGroup:query")
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
-    public Result<AttributeGroupUpdResp> getInfo(@PathVariable("id") Long id) {
-        return Result.success(attributeGroupService.getUpdById(id));
+    public Result<AttributeGroupUpdateResp> getInfo(@PathVariable("id") Long id) {
+        return Result.success(attributeGroupService.getUpdateById(id));
     }
 
     /**
@@ -100,9 +100,11 @@ public class AttributeGroupController extends BaseController {
     @PutMapping("/{id}")
     @ApiOperation("修改属性组")
     public Result<String> edit(@PathVariable Long id, @RequestBody AttributeGroupEditReq attributeGroupEditReq) {
-        return toAjax(attributeGroupService.updateById(AttributeGroup.editBuild(id,attributeGroupEditReq)));
+//        return toAjax(attributeGroupService.updateAttributeGroup(id,attributeGroupEditReq));
+        return attributeGroupService.updateAttributeGroup2(id,attributeGroupEditReq);
     }
 
+
     /**
      * 删除属性组
      */
@@ -114,4 +116,23 @@ public class AttributeGroupController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(attributeGroupService.removeBatchByIds(ids));
     }
+
+
+    /**
+     * 修改状态
+     */
+    @PutMapping("/{id}/status/{status}")
+    @ApiOperation("修改规格状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "规格id", required = true, dataType = "Long", paramType = "path"),
+            @ApiImplicitParam(name = "status", value = "状态(Y/N)", required = true, dataType = "String", paramType = "path")
+    })
+    public Result<String> UpdateStatus(@PathVariable("id") Long id, @PathVariable("status") String status) {
+        AttributeGroup attributeGroup = new AttributeGroup();
+        attributeGroup.setId(id);
+        attributeGroup.setStates(status);
+        return toAjax(attributeGroupService.updateById(attributeGroup));
+    }
+
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java

@@ -1,6 +1,7 @@
 package com.muyu.product.controller;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Supplier;
 import javax.servlet.http.HttpServletResponse;
 
@@ -10,6 +11,7 @@ import com.muyu.product.domain.AttributeInfo;
 import com.muyu.product.domain.BrandInfo;
 import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
+import com.muyu.product.domain.resp.CategoryInfoDetailResp;
 import com.muyu.product.domain.resp.CategoryParentCommonElementResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,33 +54,39 @@ public class CategoryInfoController extends BaseController {
     @ApiOperation("获取品类信息列表")
     @RequiresPermissions("product:category:list")
     @GetMapping("/list")
-    public Result<List<CategoryInfo>> list(CategoryInfo categoryInfo) {
-        List<CategoryInfo> list = categoryInfoService.list(categoryInfo);
+    public Result<List<CategoryInfoDetailResp>> list(CategoryInfo categoryInfo) {
+        try {
+            categoryInfo = Optional.ofNullable(categoryInfo).orElse(new CategoryInfo());
+            List<CategoryInfoDetailResp> list = categoryInfoService.listWithParent(categoryInfo);
             return Result.success(list);
+        } catch (Exception e) {
+            return Result.error(e.getMessage());
         }
+    }
+
 
     /**
      * 导出品类信息列表
      */
-    @ApiOperation("导出品类信息列表")
-    @RequiresPermissions("product:category:export")
-    @Log(title = "品类信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CategoryInfo categoryInfo) {
-        List<CategoryInfo> list = categoryInfoService.list(categoryInfo);
-        ExcelUtil<CategoryInfo> util = new ExcelUtil<CategoryInfo>(CategoryInfo.class);
-        util.exportExcel(response, list, "品类信息数据");
-    }
+//    @ApiOperation("导出品类信息列表")
+//    @RequiresPermissions("product:category:export")
+//    @Log(title = "品类信息", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, CategoryInfo categoryInfo) {
+//        List<CategoryInfo> list = categoryInfoService.list(categoryInfo);
+//        ExcelUtil<CategoryInfo> util = new ExcelUtil<CategoryInfo>(CategoryInfo.class);
+//        util.exportExcel(response, list, "品类信息数据");
+//    }
 
     /**
      * 获取品类信息详细信息
      */
+    @GetMapping(value = "/{id}")
     @ApiOperation("获取品类信息详细信息")
     @RequiresPermissions("product:category:query")
-    @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
-    public Result<CategoryInfo> getInfo(@PathVariable("id") Long id) {
-        return Result.success(categoryInfoService.getById(id));
+    public Result<CategoryInfoDetailResp> getInfo(@PathVariable("id") Long id) {
+        return Result.success(categoryInfoService.getDetailById(id));
     }
 
     /**
@@ -108,26 +116,37 @@ public class CategoryInfoController extends BaseController {
     /**
      * 修改品类信息
      */
-    @RequiresPermissions("product:category:edit")
-    @Log(title = "品类信息", businessType = BusinessType.UPDATE)
     @PutMapping("/{id}")
     @ApiOperation("修改品类信息")
-    public Result<String> edit(@PathVariable Long id, @RequestBody CategoryInfoEditReq categoryInfoEditReq) {
-        return toAjax(categoryInfoService.updateById(CategoryInfo.editBuild(id,categoryInfoEditReq)));
+    @RequiresPermissions("product:category:edit")
+    @Log(title = "品类信息", businessType = BusinessType.UPDATE)
+    public Result<String> edit(@PathVariable Long id, @RequestBody CategoryInfoSaveModel updateModel) {
+        return toAjax(categoryInfoService.updateCategoryInfo(id, updateModel));
     }
 
     /**
      * 删除品类信息
      */
+//    @RequiresPermissions("product:category: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<String> remove(@PathVariable List<Long> ids) {
+//        return toAjax(categoryInfoService.removeBatchByIds(ids));
+//    }
     @RequiresPermissions("product:category: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")
+    @ApiImplicitParam(name = "ids", value = "品类ID列表", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
     public Result<String> remove(@PathVariable List<Long> ids) {
-        return toAjax(categoryInfoService.removeBatchByIds(ids));
+        try {
+            return toAjax(categoryInfoService.removeCategories(ids));
+        } catch (RuntimeException e) {
+            return Result.error(e.getMessage());
+        }
     }
-
     /**
      * 通过品类ID获取父级以上的属性、属性组、品牌集合
      * @param categoryId 品类ID
@@ -141,4 +160,5 @@ public class CategoryInfoController extends BaseController {
     ) {
         return Result.success(categoryInfoService.parentCommonElement(categoryId));
     }
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java

@@ -27,6 +27,7 @@ import com.muyu.product.domain.req.ProjectInfoSaveReq;
 import com.muyu.product.domain.req.ProjectInfoEditReq;
 import com.muyu.product.service.ProjectInfoService;
 import com.muyu.common.core.web.page.TableDataInfo;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 商品信息Controller
@@ -41,21 +42,20 @@ public class ProjectInfoController extends BaseController {
     @Autowired
     private ProjectInfoService projectInfoService;
 
-    @Autowired
-    private ProjectInfoCache projectInfoCache;
-
     /**
      * 查询商品信息列表
      */
-    @ApiOperation("获取商品信息列表")
+    @ApiOperation(value = "获取商品信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectInfoQueryReq", value = "查询参数", paramType = "query", dataTypeClass = ProjectInfoQueryReq.class)
+    })
     @RequiresPermissions("product:info:list")
     @GetMapping("/list")
-    public Result<TableDataInfo<ProjectInfo>> list(ProjectInfoQueryReq projectInfoQueryReq) {
+    public Result<TableDataInfo<ProjectInfo>> list(@ApiIgnore ProjectInfoQueryReq projectInfoQueryReq) {
         startPage();
         List<ProjectInfo> list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq));
         return getDataTable(list);
     }
-
     /**
      * 导出商品信息列表
      */
@@ -77,7 +77,8 @@ public class ProjectInfoController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     public Result<ProjectInfo> getInfo(@PathVariable("id") Long id) {
-        return Result.success(projectInfoCache.get(id));
+        ProjectInfo byId = projectInfoService.getById(id);
+        return Result.success(byId);
     }
 
     /**
@@ -121,7 +122,9 @@ public class ProjectInfoController extends BaseController {
     @PutMapping("/{id}")
     @ApiOperation("修改商品信息")
     public Result<String> edit(@PathVariable Long id, @RequestBody ProjectInfoEditReq projectInfoEditReq) {
-        return toAjax(projectInfoService.updateById(ProjectInfo.editBuild(id,projectInfoEditReq)));
+        System.out.println("---------"+projectInfoEditReq);
+//        return toAjax(projectInfoService.updateById(ProjectInfo.editBuild(id,projectInfoEditReq)));
+        return projectInfoService.UpdProjectInfo(id,projectInfoEditReq);
     }
 
     /**
@@ -135,4 +138,7 @@ public class ProjectInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(projectInfoService.removeBatchByIds(ids));
     }
+
+
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java

@@ -4,9 +4,10 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.common.core.text.Convert;
+import com.muyu.product.domain.RuleAttrInfo;
 import com.muyu.product.domain.model.RuleInfoAddModel;
+import com.muyu.product.domain.req.*;
 import com.muyu.product.domain.resp.RuleInfoResp;
-import com.muyu.product.domain.resp.RuleInfoUpdResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,9 +25,6 @@ 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.RuleInfo;
-import com.muyu.product.domain.req.RuleInfoQueryReq;
-import com.muyu.product.domain.req.RuleInfoSaveReq;
-import com.muyu.product.domain.req.RuleInfoEditReq;
 import com.muyu.product.service.RuleInfoService;
 import com.muyu.common.core.web.page.TableDataInfo;
 
@@ -78,7 +76,7 @@ public class RuleInfoController extends BaseController {
     @RequiresPermissions("product:rule:query")
     @GetMapping(value = "/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
-    public Result<RuleInfoUpdResp> getInfo(@PathVariable("id") Long id) {
+    public Result<RuleInfoResp> getInfo(@PathVariable("id") Long id) {
         return Result.success(ruleInfoService.getUpdById(id));
     }
 
@@ -100,9 +98,10 @@ public class RuleInfoController extends BaseController {
     @Log(title = "商品规格", businessType = BusinessType.UPDATE)
     @PutMapping("/{id}")
     @ApiOperation("修改商品规格")
-    public Result<String> edit(@PathVariable Long id, @RequestBody RuleInfoEditReq ruleInfoEditReq) {
+    public Result<String> edit(@PathVariable Long id, @RequestBody RuleAttrInfoReq ruleInfoEditReq) {
 //        return toAjax(ruleInfoService.updateById(RuleInfo.editBuild(id,ruleInfoEditReq)));
-        return toAjax(ruleInfoService.updateById(id, ruleInfoEditReq));
+        ruleInfoService.edit3(id,ruleInfoEditReq);
+        return Result.success();
     }
 
     /**
@@ -116,4 +115,19 @@ public class RuleInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(ruleInfoService.removeBatchByIds(ids));
     }
+
+
+    @PutMapping("/{id}/status/{status}")
+    @ApiOperation("修改规格状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "规格ID", required = true, dataType = "Long", paramType = "path"),
+            @ApiImplicitParam(name = "status", value = "状态(Y/N)", required = true, dataType = "String", paramType = "path")
+    })
+    public Result<String> updateStatus(@PathVariable("id") Long id, @PathVariable("status") String status) {
+        RuleInfo ruleInfo = new RuleInfo();
+        ruleInfo.setId(id);
+        ruleInfo.setStatus(status);
+        return toAjax(ruleInfoService.updateById(ruleInfo));
+    }
 }
+

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java

@@ -3,6 +3,8 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.AsAttributeGroup;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 属性与组中间Mapper接口
@@ -10,6 +12,11 @@ import com.muyu.product.domain.AsAttributeGroup;
  * @author DongZeLiang
  * @date 2024-02-27
  */
+@Mapper
 public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup> {
 
+    void shanchu(Long id);
+
+    void insertBatch(@Param("id") Long id, @Param("id1") Long id1);
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java

@@ -3,6 +3,7 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.AttributeGroup;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 属性组Mapper接口
@@ -12,4 +13,5 @@ import com.muyu.product.domain.AttributeGroup;
  */
 public interface AttributeGroupMapper extends BaseMapper<AttributeGroup> {
 
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java

@@ -3,6 +3,7 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.ProjectInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 商品信息Mapper接口
@@ -10,6 +11,7 @@ import com.muyu.product.domain.ProjectInfo;
  * @author DongZeLiang
  * @date 2024-02-27
  */
+@Mapper
 public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
 
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java

@@ -3,6 +3,7 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.ProjectSkuInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 商品SKUMapper接口
@@ -10,6 +11,7 @@ import com.muyu.product.domain.ProjectSkuInfo;
  * @author DongZeLiang
  * @date 2024-02-27
  */
+@Mapper
 public interface ProjectSkuInfoMapper extends BaseMapper<ProjectSkuInfo> {
 
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java

@@ -3,6 +3,12 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.RuleAttrInfo;
+import com.muyu.product.domain.model.RuleAttrAddModel;
+import com.muyu.product.domain.req.RuleAttrInfoReq;
+import com.muyu.product.domain.req.RuleInfoEditReq;
+import com.muyu.product.domain.resp.RuleInfoResp;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 规格详情Mapper接口
@@ -10,6 +16,15 @@ import com.muyu.product.domain.RuleAttrInfo;
  * @author DongZeLiang
  * @date 2024-02-27
  */
+@Mapper
 public interface RuleAttrInfoMapper extends BaseMapper<RuleAttrInfo> {
 
+    void updRule(@Param("id") Long id,@Param("req") RuleAttrInfoReq req);
+
+    void deleteRule(@Param("id") Long id);
+
+    List<RuleAttrAddModel> getRuleAttrInfo(@Param("id") Long id);
+    RuleInfoResp getRuleAttrInfo2(@Param("id") Long id);
+
+    void addRuleAttrModel(@Param("id")Long id,@Param("name")String name,@Param("valueData") String substring);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java

@@ -19,4 +19,16 @@ public interface AsAttributeGroupService extends IService<AsAttributeGroup> {
      */
     public List<AsAttributeGroup> list(AsAttributeGroup asAttributeGroup);
 
+    /**
+     * 删除属性与组中间
+     * @param id
+     */
+    void delete(Long id);
+
+    /**
+     * 添加中间表
+     * @param id
+     * @param id1
+     */
+    void insertBath(Long id,Long id1);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java

@@ -2,13 +2,15 @@ package com.muyu.product.service;
 
 import java.util.List;
 
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.product.domain.AttributeGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.product.domain.AttributeInfo;
 import com.muyu.product.domain.model.AttributeGroupSaveModel;
+import com.muyu.product.domain.req.AttributeGroupEditReq;
 import com.muyu.product.domain.resp.AttributeGroupPageResp;
-import com.muyu.product.domain.resp.AttributeGroupUpdResp;
+import com.muyu.product.domain.resp.AttributeGroupUpdateResp;
 
 /**
  * 属性组Service接口
@@ -41,9 +43,14 @@ public interface AttributeGroupService extends IService<AttributeGroup> {
     public Boolean save(AttributeGroupSaveModel attributeGroupSaveModel);
 
     /**
-     * 根据ID查询属性组的修改
+     * 根据id查询属性组的修改
      * @param id
      * @return
      */
-    AttributeGroupUpdResp getUpdById(Long id);
+    AttributeGroupUpdateResp getUpdateById(Long id);
+
+//    public Boolean updateAttributeGroup(Long id, AttributeGroupEditReq editReq);
+
+
+    Result<String> updateAttributeGroup2(Long id, AttributeGroupEditReq attributeGroupEditReq);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java

@@ -9,6 +9,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.resp.CategoryCommonElementResp;
+import com.muyu.product.domain.resp.CategoryInfoDetailResp;
 import com.muyu.product.domain.resp.CategoryParentCommonElementResp;
 
 /**
@@ -24,7 +25,8 @@ public interface CategoryInfoService extends IService<CategoryInfo> {
      * @param categoryInfo 品类信息
      * @return 品类信息集合
      */
-    public List<CategoryInfo> list(CategoryInfo categoryInfo);
+    List<CategoryInfoDetailResp> listWithParent(CategoryInfo categoryInfo);
+//    public List<CategoryInfo> list(CategoryInfo categoryInfo);
 
     /**
      * 保存
@@ -69,4 +71,12 @@ public interface CategoryInfoService extends IService<CategoryInfo> {
     CategoryCommonElementResp getTemplateAttributeByCateGoryId (Long cateGoryId);
 
     public <T, AS> List<T> getCommon (Long categoryId, IService<AS> iService, IService<T> bsiService);
+
+
+    // 添加新方法
+    CategoryInfoDetailResp getDetailById(Long id);
+
+    boolean updateCategoryInfo(Long id, CategoryInfoSaveModel updateModel);
+
+    boolean removeCategories(List<Long> ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java

@@ -1,8 +1,11 @@
 package com.muyu.product.service;
 
 import java.util.List;
+
+import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.ProjectInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.product.domain.req.ProjectInfoEditReq;
 import com.muyu.product.domain.req.ProjectInfoSaveReq;
 import com.muyu.product.domain.resp.ProjectDetailResp;
 
@@ -34,4 +37,7 @@ public interface ProjectInfoService extends IService<ProjectInfo> {
      * @return 商品详情
      */
     ProjectDetailResp getDetailInfo (Long id);
+
+
+    Result UpdProjectInfo(Long id, ProjectInfoEditReq projectInfoEditReq);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java

@@ -33,4 +33,13 @@ public interface ProjectSkuInfoService extends IService<ProjectSkuInfo> {
      * @return 商品SKU信息
      */
     List<ProjectSkuInfo> listByProjectId (Long projectId);
+
+
+    boolean updateBatch(List<ProjectSkuInfo> skuList);
+
+    boolean updateStock(Long id, Long stock);
+
+    boolean deleteById(Long id);
+
+    boolean deleteBatch(List<Long> ids);
 }