12.3合并

doc/three

@@ -0,0 +1,18 @@
+          "商品ID": "Long",
+          "商品图片": "String",
+          "活动名称": "String",
+          "活动简介": "String",
+          "商品单位": "String",
+          "商品的轮播图": [
+          "String", "String"
+          ],
+          "活动时间": "date",
+          "策略类型": "String",
+            [{
+        "id" : "Long" ,
+   "团购活动Id"  : "Long" ,
+  "规格SKU":   "String" ,
+   “拼团价格"  :"BigDecimal",
+    ”拼团库存“:"Long"
+            }]
+

doc/two

@@ -0,0 +1,33 @@
+
+{   "{
+       "code": 200,
+       "msg": null,
+       "data": {
+         "id": 1,
+         "teamId": null,
+         "name": "手机拼团领折扣",
+         "productId": 19,
+         "productImage": "http://127.0.0.1:9300/statics/2024/11/18/sdfx_20241118145144A006.jpg\thttp://127.0.0.1:9300/statics/2024/11/18/mfx_20241118145150A007.jpg",
+         "introduction": "好吃",
+         "unit": "盒",
+         "imageList": "http://127.0.0.1:9300/statics/2024/11/18/sdfx_20241118145144A006.jpg\thttp://127.0.0.1:9300/statics/2024/11/18/mfx_20241118145150A007.jpg",
+         "endTime": "2024-11-19",
+         "sort": 1,
+         "projectSkuInfoModelList": [
+           {
+             "productSkuId": 2,
+             "productSku": "骁龙888-8G-128G",
+             "teamPrice": 1,
+             "teamStock": 18
+           }
+         ],
+         "content": "",
+         "status": "1",
+         "strategyType": "拼团",
+         "strategyId": 1
+       }
+     }
+
+
+
+}

doc/团购查询单条数据结构.java

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

doc/团购活动修改.java

@@ -1,32 +0,0 @@
-{
-    "活动ID": "Long",
-    "商品ID": "Long",
-    "活动名称": "String",
-    "商品名称": "String",
-    "商品图片": "String",
-    "活动简介": "String",
-    "商品单位": "String",
-    "商品的轮播图": [
-            "String", "String"
-        ],
-    "活动时间": "date",
-    "策略类型": "String",
-    "商品规格": {
-        "修改商品规格List": [ // 修改
-                {
-                    "团购规格ID": "Long",
-                    "拼团价格": "BigDecimal",
-                    "拼团库存": "Long"
-                }
-            ],
-        "删除商品规格IdList" : ["Long", "Long"],
-        "添加商品规格List": [
-                "商品SKU": "String",
-                "商品价格": "BigDecimal",
-                "拼团价格": "BigDecimal",
-                "拼团库存": "Long"
-            ]
-    },
-
-"详情": "String"
-}

doc/团购添加数据结构.java

@@ -12,6 +12,8 @@ $.{
   "策略ID": "Long",
   "商品规格List": [ // activity_team_product_sku_info
     {
+      "productId": 6,
+      "teamId": 6,
       "规格SKU": "String", // activity_team_product_sku_info.product_sku
       "拼团价格": "BigDecimal",
       "拼团库存": "Long"
@@ -45,3 +47,6 @@ activity_team_product_sku_info.product_sku(商品SKU) <- ActivityTeamProductSkuI
 activity_team_product_sku_info.team_stock(拼团库存) <- ActivityTeamProductSkuInfo.teamStock <- @商品规格.拼团库存
 activity_team_product_sku_info.remain_stock(剩余库存) <- ActivityTeamProductSkuInfo.remainStock <- @商品规格.拼团库存
 activity_team_product_sku_info.team_price(拼团价格) <- ActivityTeamProductSkuInfo.teamPrice <- @商品规格.拼团价格
+
+
+

doc/策略

@@ -0,0 +1,26 @@
+  商城活动页 ->  商品列表
+  -> 商品列表可排序筛选   商品图展示几人团
+  ->点击图片
+  ->  展示商品详情页面   可查看拼团剩余人数，还剩下几人，剩余多少时间拼团成功
+  -> 点击参与拼团
+  -> 展示商品属性  选择商品属性  绑定商品信息
+
+
+
+
+商品详情页面
+   显示 商品信息 商品sku
+
+
+支付方式
+
+
+
+
+
+
+
+
+
+
+

muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java

@@ -15,5 +15,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 public class MuYuAuthApplication {
     public static void main (String[] args) {
         SpringApplication.run(MuYuAuthApplication.class, args);
+        System.out.println("auth end ");
     }
 }

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9200
+  port: 8089
 
 # Spring
 spring:
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java

@@ -13,5 +13,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 public class MuYuGatewayApplication {
     public static void main (String[] args) {
         SpringApplication.run(MuYuGatewayApplication.class, args);
+        System.out.println("end gateway");
     }
 }

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

@@ -0,0 +1,58 @@
+package com.muyu.gateway.config.properties;
+
+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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 8081
 
 # Spring
 spring:
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -28,12 +30,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 1.94.98.9:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 1.94.98.9:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

@@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
+import com.muyu.marketing.domain.model.ActivityTeamUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+import java.math.BigDecimal;
 import java.util.Date;
-
+/**
+ * 商品拼团信息
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -76,6 +80,7 @@ public class ActivityTeamInfo extends BaseEntity {
 
   /**
    * 公共添加模型，转换成添加对象
+   *
    * @param activityTeamInfoAddModel 添加模型
    * @return 添加对象
    */
@@ -96,37 +101,20 @@ public class ActivityTeamInfo extends BaseEntity {
             .build();
   }
 
-  public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
+  public static ActivityTeamInfo updModelBuild(ActivityTeamUpdModel activityTeamUpdModel) {
     return ActivityTeamInfo.builder()
-            .name(activityTeamInfoSaveModel.getName())
+            .id(activityTeamUpdModel.getId())
-            .productId(activityTeamInfoSaveModel.getProductId())
+            .productId(activityTeamUpdModel.getProductId())
-            .productImage(activityTeamInfoSaveModel.getProductImage())
+            .productImage(activityTeamUpdModel.getProductImage())
-            .introduction(activityTeamInfoSaveModel.getIntroduction())
+            .introduction(activityTeamUpdModel.getIntroduction())
-            .unit(activityTeamInfoSaveModel.getUnit())
+            .unit(activityTeamUpdModel.getUnit())
-            .imageList(activityTeamInfoSaveModel.getImageList())
+            .imageList(activityTeamUpdModel.getImageList())
-            .endTime(activityTeamInfoSaveModel.getEndTime())
+            .endTime(activityTeamUpdModel.getEndTime())
-            .sort(activityTeamInfoSaveModel.getSort())
+            .sort(activityTeamUpdModel.getSort())
-            .content(activityTeamInfoSaveModel.getContent())
+            .content(activityTeamUpdModel.getContent())
-            .status(activityTeamInfoSaveModel.getStatus())
+            .status(activityTeamUpdModel.getStatus())
-            .strategyType(activityTeamInfoSaveModel.getStrategyType())
+            .strategyType(activityTeamUpdModel.getStrategyType())
-            .strategyId(activityTeamInfoSaveModel.getStrategyId())
+            .strategyId(activityTeamUpdModel.getStrategyId())
-            .build();
-  }
-  public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){
-    return ActivityTeamInfo.builder()
-            .id(activityTeamInfoUpdModel.getId())
-            .name(activityTeamInfoUpdModel.getName())
-            .productId(activityTeamInfoUpdModel.getProductId())
-            .productImage(activityTeamInfoUpdModel.getProductImage())
-            .introduction(activityTeamInfoUpdModel.getIntroduction())
-            .unit(activityTeamInfoUpdModel.getUnit())
-            .imageList(activityTeamInfoUpdModel.getImageList())
-            .endTime(activityTeamInfoUpdModel.getEndTime())
-            .sort(activityTeamInfoUpdModel.getSort())
-            .content(activityTeamInfoUpdModel.getContent())
-            .status(activityTeamInfoUpdModel.getStatus())
-            .strategyType(activityTeamInfoUpdModel.getStrategyType())
-            .strategyId(activityTeamInfoUpdModel.getStrategyId())
             .build();
   }
 }

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

@@ -3,12 +3,15 @@ package com.muyu.marketing.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
-
+/**
+ * 团购活动
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -41,11 +44,12 @@ public class ActivityTeamOpenInfo extends BaseEntity {
   /**
    * 结束团购时间
    */
+  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
   private Date endTime;
   /**
    * 商品ID
    */
-  private String productId;
+  private Long productId;
   /**
    * 商品名称
    */
@@ -66,4 +70,6 @@ public class ActivityTeamOpenInfo extends BaseEntity {
    * 开团状态
    */
   private String status;
+//  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+//  private  Date updateTime;
 }

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

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.*;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
-
+/**
+ * 商品拼团规格
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -53,6 +52,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
 
   /**
    * 通过模型钢构件对象
+   *
    * @param activityTeamProductSkuAddModel 模型
    * @return 对象
    */
@@ -61,28 +61,30 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .productId(activityTeamProductSkuAddModel.getProductId())
             .teamId(activityTeamProductSkuAddModel.getTeamId())
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
-            .productSku(activityTeamProductSkuAddModel.getSku())
             .remainStock(activityTeamProductSkuAddModel.getTeamStock())
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }
-  public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuReqModel activityTeamProductSkuReqModel) {
+
+  public static ActivityTeamProductSkuInfo updModelBUild(ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuModel) {
     return ActivityTeamProductSkuInfo.builder()
-            .id(activityTeamProductSkuReqModel.getId())
+            .id(activityTeamProductSkuModel.getId())
-            .productId(activityTeamProductSkuReqModel.getProductId())
+            .teamStock(activityTeamProductSkuModel.getTeamStock())
-            .teamStock(activityTeamProductSkuReqModel.getTeamStock())
+            .teamPrice(activityTeamProductSkuModel.getTeamPrice())
-            .productSku(activityTeamProductSkuReqModel.getProductSku())
+
-            .teamPrice(activityTeamProductSkuReqModel.getTeamPrice())
+            .build();
+  }
+  public static ActivityTeamProductSkuInfo addProductBuildModel(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
+    return ActivityTeamProductSkuInfo.builder()
+            .productId(activityTeamProductSkuAddModel.getProductId())
+            .teamId(activityTeamProductSkuAddModel.getTeamId())
+            .productSku(activityTeamProductSkuAddModel.getProductSku())
+            .teamStock(activityTeamProductSkuAddModel.getTeamStock())
+            .remainStock(activityTeamProductSkuAddModel.getTeamStock())
+            .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }
 
-  public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuUpdModel teamProductSkuUpdModel){
+
-    return ActivityTeamProductSkuInfo.builder()
-            .id(teamProductSkuUpdModel.getId())
-            .teamPrice(teamProductSkuUpdModel.getTeamPrice())
-            .teamStock(teamProductSkuUpdModel.getTeamStock())
-            .remainStock(teamProductSkuUpdModel.getTeamStock())
-            .build();
-  }
 
 }

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

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

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

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

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

@@ -0,0 +1,23 @@
+package com.muyu.marketing.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * @program: daiseven-dong
+ * @description: d
+ * @author: CuiFu Bo
+ * @create: 2024-11-27 20:48
+ **/
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Deledto {
+
+    private List<Long> ids;
+}

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

@@ -0,0 +1,51 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.req.ActivityTeamProductSkuReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: daiseven-dong
+ * @description: l
+ * @author: CuiFu Bo
+ * @create: 2024-11-27 18:59
+ **/
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityInfoSKuModel {
+
+
+    private Long id;
+    private String name;
+    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;
+    private Long strategyId;
+    private List<Long> ids;
+
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuList;
+    //修改
+    private List<ActivityTeamProductSkuModel> activityTeamUpdModelList;
+    //添加
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+
+
+//    public  static ActivityInfoSKuModel delSKuModel   (){
+//
+//    };
+}

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

@@ -2,7 +2,9 @@ package com.muyu.marketing.domain.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
+import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,7 +12,6 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
-import java.util.function.Supplier;
 
 /**
  * 团购活动添加模型
@@ -23,7 +24,6 @@ import java.util.function.Supplier;
 @NoArgsConstructor
 @AllArgsConstructor
 public class ActivityTeamInfoAddModel {
-
     /**
      * 拼团名称
      */
@@ -58,7 +58,7 @@ public class ActivityTeamInfoAddModel {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
     /**
      * 商品SkU集合
      */
@@ -80,7 +80,8 @@ public class ActivityTeamInfoAddModel {
      */
     private Long strategyId;
 
-    public static ActivityTeamInfoAddModel addReqBuild (ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
+
+    public static ActivityTeamInfoAddModel dobuild(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
         return  ActivityTeamInfoAddModel.builder()
                 .name(activityTeamInfoSaveReq.getName())
                 .productId(activityTeamInfoSaveReq.getProductId())
@@ -94,11 +95,13 @@ public class ActivityTeamInfoAddModel {
                 .status(activityTeamInfoSaveReq.getStatus())
                 .strategyType(activityTeamInfoSaveReq.getStrategyType())
                 .strategyId(activityTeamInfoSaveReq.getStrategyId())
-                .activityTeamProductSkuAddModelList(
+                .activityTeamProductSkuAddModelList(activityTeamInfoSaveReq.getProjectSkuInfoAddReqList().stream().map(addReq->
-                        activityTeamInfoSaveReq.getTeamProjectSkuInfoAddReqList()
+                    ActivityTeamProductSkuAddModel.dbuild(addReq,activityTeamInfoSaveReq::getProductId)
-                                .stream()
+                 ).toList()
-                                .map(addReq -> ActivityTeamProductSkuAddModel.addReqBuild(addReq, activityTeamInfoSaveReq::getProductId))
-                                .toList()
                 ).build();
     }
+
+
+
+
 }

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

@@ -1,6 +1,5 @@
 package com.muyu.marketing.domain.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.ActivityTeamInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,24 +7,16 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
-import java.util.List;
-import java.util.function.Function;
 
 /**
- * @program: 2204a-cloud-server
+ * 拼团活动详情模型
- * @description: 活动回显总模型
- * @author: AoCi Tian
- * @create: 2024-11-26 16:00
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamDetailModel {
-    /**
-     * 拼团id
  */
-    private Long id;
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoDetailModel {
+    private long id;
     /**
      * 拼团名称
      */
@@ -33,7 +24,7 @@ public class ActivityTeamDetailModel {
     /**
      * 商品ID
      */
-    private Long productId;
+    private long productId;
     /**
      * 商品活动图
      */
@@ -45,26 +36,19 @@ public class ActivityTeamDetailModel {
     /**
      * 单位
      */
-
     private String unit;
     /**
      * 轮播图
      */
-
     private String imageList;
     /**
      * 活动结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date endTime;
     /**
      * 活动排序
      */
     private Long sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ActivityTeamProductSkuModel> projectSkuInfoAddReqList;
     /**
      * 活动详情
      */
@@ -80,10 +64,11 @@ public class ActivityTeamDetailModel {
     /**
      * 策略ID
      */
-    private Long strategyId;
+    private long strategyId;
-    public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
+
-                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
+    //查询
-        return function.apply(ActivityTeamDetailModel.builder()
+    public static ActivityTeamInfoDetailModel activityTeamInfoDetailModel(ActivityTeamInfo activityTeamInfo){
+        return ActivityTeamInfoDetailModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())
                 .productId(activityTeamInfo.getProductId())
@@ -97,6 +82,7 @@ public class ActivityTeamDetailModel {
                 .status(activityTeamInfo.getStatus())
                 .strategyType(activityTeamInfo.getStrategyType())
                 .strategyId(activityTeamInfo.getStrategyId())
-        );
+                .build();
     }
+
 }

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

@@ -1,28 +1,25 @@
 package com.muyu.marketing.domain.model;
 
 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
+ * @program: daiseven-dong
  * @description: 活动商品规格修改模型
- * @author: AoCi Tian
+ * @author: CuiFu Bo
- * @create: 2024-11-26 19:25
+ * @create: 2024-11-27 16:31
  **/
+
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@AllArgsConstructor
+@SuperBuilder
 public class ActivityTeamInfoUpdModel {
     private Long id;
     private String name;
@@ -37,8 +34,8 @@ public class ActivityTeamInfoUpdModel {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
+    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;
-
+    private ActivityTeamInfoUpdModel activityTeamUpdSkuModel;
     public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
         return ActivityTeamInfoUpdModel.builder()
                 .id(activityTeamInfoUpdReq.getId())
@@ -54,12 +51,9 @@ public class ActivityTeamInfoUpdModel {
                 .status(activityTeamInfoUpdReq.getStatus())
                 .strategyType(activityTeamInfoUpdReq.getStrategyType())
                 .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
+                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
                 .build();
     }
+
+
 }

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

@@ -1,14 +1,13 @@
 package com.muyu.marketing.domain.model;
 
 
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -36,7 +35,8 @@ public class ActivityTeamProductSkuAddModel {
     /**
      * 规格SKU
      */
-    private String sku;
+    private String productSku;
+
 
     /**
      * 拼团价格
@@ -48,12 +48,13 @@ public class ActivityTeamProductSkuAddModel {
      */
     private Long teamStock;
 
-    public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
+    public  static  ActivityTeamProductSkuAddModel  dbuild (ProjectSkuInfoAddReq projectSkuInfoAddReq, Supplier<Long> productId){
        return ActivityTeamProductSkuAddModel.builder()
                .productId(productId.get())
-                .sku(teamProjectSkuInfoAddReq.getSku())
+                .productSku(projectSkuInfoAddReq.getSku())
-                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
+                .teamStock(projectSkuInfoAddReq.getTeamStock())
-                .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
+                .teamPrice(projectSkuInfoAddReq.getTeamPrice())
                 .build();
     }
+
 }

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

@@ -0,0 +1,58 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 商品活动规格集合模型
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuInfoListModel {
+    /**
+     * 主键
+     */
+    private long id;
+    /**
+     * 活动ID
+     */
+    private long teamId;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品SKU
+     */
+    private String productSku;
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+    /**
+     * 剩余库存
+     */
+    private Long remainStock;
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    public static ActivityTeamProductSkuInfoListModel infoListModel(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){
+        return ActivityTeamProductSkuInfoListModel.builder()
+                .id(activityTeamProductSkuInfo.getId())
+                .teamId(activityTeamProductSkuInfo.getTeamId())
+                .productId(activityTeamProductSkuInfo.getProductId())
+                .teamStock(activityTeamProductSkuInfo.getTeamStock())
+                .productSku(activityTeamProductSkuInfo.getProductSku())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                .build();
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.muyu.marketing.domain.model;
 
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -8,44 +7,23 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
-/**
- * 商品活动SKU信息模型
- *
- * @author DongZeLiang
- * @date 2024-11-26 15:35
- */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ActivityTeamProductSkuInfoModel {
+public class ActivityTeamProductSkuInfoUpdModel {
     /**
-     * 团购商品SKU的ID
+     * 商品规格id
      */
     private Long id;
-
-    /**
-     * 团ID
-     */
-    private Long teamId;
-
-    /**
-     * 商品ID
-     */
-    private Long productId;
-
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
     /**
      * 拼团价格
      */
     private BigDecimal teamPrice;
-
     /**
      * 拼团库存
      */
     private Long teamStock;
+
+
 }

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

@@ -1,50 +1,35 @@
 package com.muyu.marketing.domain.model;
 
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
+ * @program: daiseven-dong
- * @description: 回显sku模型
+ * @description: l
- * @author: AoCi Tian
+ * @author: CuiFu Bo
- * @create: 2024-11-26 16:03
+ * @create: 2024-11-26 21:18
  **/
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@AllArgsConstructor
+
 public class ActivityTeamProductSkuModel {
         /**
-     * 规格id
+         * 活动规格sku修改模型
          */
-    private Long id;
+        private List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuModelList;
         /**
-     * 规格SKU
+         * 活动规格id
          */
-    private String sku;
+        private List<Long> skuIdList;
-
         /**
-     * 拼团价格
+         * 活动规格sku添加模型
          */
-    private BigDecimal teamPrice;
+        private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
 
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-
-    public static ActivityTeamProductSkuModel FindBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) {
-        return ActivityTeamProductSkuModel.builder()
-                .id(activityTeamProductSkuInfo.getId())
-                .sku(activityTeamProductSkuInfo.getProductSku())
-                .teamStock(activityTeamProductSkuInfo.getTeamStock())
-                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
-                .build();
-    }
 }

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

@@ -2,22 +2,22 @@ package com.muyu.marketing.domain.model;
 
 import com.muyu.marketing.domain.req.ActivityTeamProductSkuReq;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 
 /**
- * @program: 2204a-cloud-server
+ * @program: daiseven-dong
  * @description: sku修改模型
- * @author: AoCi Tian
+ * @author: CuiFu Bo
- * @create: 2024-11-26 19:45
+ * @create: 2024-11-27 16:32
  **/
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@AllArgsConstructor
+@SuperBuilder
 public class ActivityTeamProductSkuReqModel {
     private Long id;
     private Long teamId;

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

@@ -1,59 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * 团购商品规格一键设置
- *
- * @author DongZeLiang
- * @date 2024-11-28 11:15
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuSettingModel {
-
-    /**
-     * 活动ID
-     */
-    private Long teamId;
-
-    /**
-     * 删除的ID集合
-     */
-    private List<Long> removeIds;
-
-    /**
-     * 添加的规格集合
-     */
-    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
-
-    /**
-     * 修改的规格集合
-     */
-    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
-
-    public static ActivityTeamProductSkuSettingModel settingReqModel(ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq, Supplier<Long> productId) {
-        return ActivityTeamProductSkuSettingModel.builder()
-                .removeIds(activityTeamProductSkuSettingReq.getRemoveIds())
-                .activityTeamProductSkuAddModelList(
-                        activityTeamProductSkuSettingReq.getTeamProjectSkuInfoAddReqList().stream()
-                                .map(teamProjectSkuInfoAddReq -> ActivityTeamProductSkuAddModel.addReqBuild(teamProjectSkuInfoAddReq, productId))
-                                .toList()
-                )
-                .activityTeamProductSkuUpdModelList(
-                        activityTeamProductSkuSettingReq.getTeamProjectSkuInfoUpdReqList().stream()
-                                .map(ActivityTeamProductSkuUpdModel::updReqBuild)
-                                .toList()
-                ).build();
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * 拼团活动商品SKU
- *
- * @author DongZeLiang
- * @date 2024-11-27 14:18
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuUpdModel {
-
-    /**
-     * 商品规格ID
-     */
-    private Long id;
-
-    /**
-     * 团购价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 团购库存
-     */
-    private Long teamStock;
-
-    public static ActivityTeamProductSkuUpdModel updReqBuild(TeamProjectSkuInfoUpdReq teamProjectSkuInfoUpdReq){
-        return ActivityTeamProductSkuUpdModel.builder()
-                .id(teamProjectSkuInfoUpdReq.getId())
-                .teamStock(teamProjectSkuInfoUpdReq.getTeamStock())
-                .teamPrice(teamProjectSkuInfoUpdReq.getTeamPrice())
-                .build();
-    }
-}

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

@@ -0,0 +1,61 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.req.ProductSkuInfoUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.function.Supplier;
+
+/**
+ * @program: daiseven-dong
+ * @description: l
+ * @author: CuiFu Bo
+ * @create: 2024-11-27 00:43
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamSkuupdateModel {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+    private  Long remainStock;
+    public  static ActivityTeamSkuupdateModel teamSkuEditBuild(ProductSkuInfoUpdReq productSkuInfoUpdReq, Supplier<Long> productId){
+        return ActivityTeamSkuupdateModel.builder()
+                .id(productSkuInfoUpdReq.getProductSkuId())
+                .sku(productSkuInfoUpdReq.getSku())
+                .teamStock(productSkuInfoUpdReq.getTeamStock())
+                .teamPrice(productSkuInfoUpdReq.getTeamPrice())
+                .productId(productId.get())
+                .build();
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
+import com.muyu.marketing.domain.req.ActivityTeamUpdReq;
+import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: daiseven-dong
+ * @description: l
+ * @author: CuiFu Bo
+ * @create: 2024-11-27 00:20
+ **/
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamUpdModel {
+ 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;
+ private  ActivityTeamProductSkuModel activityTeamProductSkuModel;
+
+
+
+
+
+  public static ActivityTeamUpdModel activityTeamUpdReq(ActivityTeamUpdReq activityTeamInfoUpdReq){
+   return    ActivityTeamUpdModel.builder()
+           .id(activityTeamInfoUpdReq.getId())
+           .name(activityTeamInfoUpdReq.getName())
+           .productId(activityTeamInfoUpdReq.getProductId())
+           .introduction(activityTeamInfoUpdReq.getIntroduction())
+           .unit(activityTeamInfoUpdReq.getUnit())
+           .endTime(activityTeamInfoUpdReq.getEndTime())
+           .imageList(activityTeamInfoUpdReq.getImageList())
+           .productImage(activityTeamInfoUpdReq.getProductImage())
+           .activityTeamProductSkuModel(activityTeamInfoUpdReq.getActivityTeamUpdSkuModel())
+           .sort(activityTeamInfoUpdReq.getSort())
+           .content(activityTeamInfoUpdReq.getContent())
+           .status(activityTeamInfoUpdReq.getStatus())
+           .strategyType(activityTeamInfoUpdReq.getStrategyType())
+           .strategyId(activityTeamInfoUpdReq.getStrategyId())
+           .strategyType(activityTeamInfoUpdReq.getStrategyType())
+           .build();
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -1,30 +1,30 @@
 package com.muyu.marketing.domain.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
+ * @program: daiseven-dong
- * @description: 添加活动模型
+ * @description: l
- * @author: AoCi Tian
+ * @author: CuiFu Bo
- * @create: 2024-11-26 10:59
+ * @create: 2024-11-26 21:39
  **/
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@AllArgsConstructor
-public class ActivityTeamInfoSaveModel {
+@SuperBuilder
+public class ActivityTeamfindidModel {
 
-    /**
+    private Long id;
-     * 拼团名称
-     */
     private String name;
     /**
      * 商品ID
@@ -56,7 +56,11 @@ public class ActivityTeamInfoSaveModel {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
     /**
      * 活动详情
      */
@@ -73,20 +77,16 @@ public class ActivityTeamInfoSaveModel {
      * 策略ID
      */
     private Long strategyId;
-    public static ActivityTeamInfoSaveModel activityTeamInfoSaveModelBuild (ActivityTeamInfoAddModel activityTeamInfoAddModel){
+    private  String sku;
-        return ActivityTeamInfoSaveModel.builder()
+    private BigDecimal teamPrice;
-                .name(activityTeamInfoAddModel.getName())
+    private  Long teamStock;
-                .productId(activityTeamInfoAddModel.getProductId())
+
-                .productImage(activityTeamInfoAddModel.getProductImage())
+    public  static  ActivityTeamfindidModel folist(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){
-                .introduction(activityTeamInfoAddModel.getIntroduction())
+        return  ActivityTeamfindidModel.builder()
-                .unit(activityTeamInfoAddModel.getUnit())
+                .productId(activityTeamProductSkuInfo.getProductId())
-                .imageList(activityTeamInfoAddModel.getImageList())
+                .sku(activityTeamProductSkuInfo.getProductSku())
-                .endTime(activityTeamInfoAddModel.getEndTime())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
-                .sort(activityTeamInfoAddModel.getSort())
-                .content(activityTeamInfoAddModel.getContent())
-                .status(activityTeamInfoAddModel.getStatus())
-                .strategyType(activityTeamInfoAddModel.getStrategyType())
-                .strategyId(activityTeamInfoAddModel.getStrategyId())
                 .build();
+
     }
 }

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

@@ -51,11 +51,11 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
     /**
      * 商品SkU集合
      */
-    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
+    private List<ProjectSkuInfoAddReq> projectSkuInfoAddReqList;
     /**
      * 活动详情
      */

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

@@ -1,23 +1,24 @@
 package com.muyu.marketing.domain.req;
 
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
+ * @program: daiseven-dong
  * @description: 活动商品规格修改入参
- * @author: AoCi Tian
+ * @author: CuiFu Bo
- * @create: 2024-11-26 19:25
+ * @create: 2024-11-27 16:26
  **/
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@SuperBuilder
 public class ActivityTeamInfoUpdReq {
     private Long id;
     private String name;
@@ -32,5 +33,8 @@ public class ActivityTeamInfoUpdReq {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
+    private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
+
+
+    private ActivityTeamProductSkuModel activityTeamProductSkuModel;
 }

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

@@ -1,22 +1,22 @@
 package com.muyu.marketing.domain.req;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 
 /**
- * @program: 2204a-cloud-server
+ * @program: daiseven-dong
  * @description: sku修改入参
- * @author: AoCi Tian
+ * @author: CuiFu Bo
- * @create: 2024-11-26 19:45
+ * @create: 2024-11-27 16:27
  **/
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@SuperBuilder
 public class ActivityTeamProductSkuReq {
     private Long id;
     private Long teamId;

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

@@ -1,37 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * 团购商品规格设置
- *
- * @author DongZeLiang
- * @date 2024-11-28 11:27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuSettingReq {
-    /**
-     * 删除的ID集合
-     */
-    private List<Long> removeIds;
-
-    /**
-     * 添加的规格集合
-     */
-    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
-
-    /**
-     * 添加的规格集合
-     */
-    private List<TeamProjectSkuInfoUpdReq> teamProjectSkuInfoUpdReqList;
-}

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

@@ -0,0 +1,83 @@
+package com.muyu.marketing.domain.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
+import com.muyu.marketing.domain.model.ActivityTeamUpdModel;
+
+import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuResp;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamUpdReq {
+
+    /**
+     * 活动ID
+     */
+    private Long id;
+
+    /**
+     * 拼团名称
+     */
+    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 ActivityTeamProductSkuModel activityTeamUpdSkuModel;
+    /**
+     * 活动详情
+     */
+    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/req/ProductSkuInfoUpdReq.java

@@ -8,18 +8,23 @@ import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 
 /**
- * 添加的
+ * @program: daiseven-dong
- */
+ * @description: l
+ * @author: CuiFu Bo
+ * @create: 2024-11-27 00:45
+ **/
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-public class TeamProjectSkuInfoUpdReq {
+public class ProductSkuInfoUpdReq {
+
+   private  Long productSkuId;
 
     /**
      * 规格SKU
      */
-    private Long id;
+    private String sku;
 
     /**
      * 拼团价格

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

@@ -1,6 +1,7 @@
 package com.muyu.marketing.domain.req;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -14,7 +15,7 @@ import java.math.BigDecimal;
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-public class TeamProjectSkuInfoAddReq {
+public class ProjectSkuInfoAddReq {
 
     /**
      * 规格SKU

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

@@ -1,27 +1,30 @@
 package com.muyu.marketing.domain.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Function;
 
+/**
+ * @program: daiseven-dong
+ * @description:
+ * @author: CuiFu Bo
+ * @create: 2024-11-26 15:20
+ **/
 @Data
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class ActivityTeamDetailResp extends BaseEntity {
 
-    /**
+public class ActivityTeamDetailResp {
-     * 团购ID
+    private  Long id;
-     */
     private  Long teamId;
     /**
      * 拼团名称
@@ -57,11 +60,11 @@ public class ActivityTeamDetailResp extends BaseEntity {
     /**
      * 活动排序
      */
-    private Integer sort;
+    private Long sort;
     /**
      * 商品SkU集合
      */
-    private List<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
+    private List<TeamProjectSkuInfoResp> projectSkuInfoModelList;
     /**
      * 活动详情
      */
@@ -78,4 +81,26 @@ public class ActivityTeamDetailResp extends BaseEntity {
      * 策略ID
      */
     private Long strategyId;
+
+
+
+    public static ActivityTeamDetailResp setUpDatailResp(ActivityTeamInfoDetailModel activityTeamInfoDetailModel, Function<Long,List<TeamProjectSkuInfoResp>> teamProjectSkuInfoResp){
+        return ActivityTeamDetailResp.builder()
+                .id(activityTeamInfoDetailModel.getId())
+                .name(activityTeamInfoDetailModel.getName())
+                .productId(activityTeamInfoDetailModel.getProductId())
+                .productImage(activityTeamInfoDetailModel.getProductImage())
+                .introduction(activityTeamInfoDetailModel.getIntroduction())
+                .unit(activityTeamInfoDetailModel.getUnit())
+                .imageList(activityTeamInfoDetailModel.getImageList())
+                .endTime(activityTeamInfoDetailModel.getEndTime())
+                .sort(activityTeamInfoDetailModel.getSort())
+                .content(activityTeamInfoDetailModel.getContent())
+                .status(activityTeamInfoDetailModel.getStatus())
+                .strategyType(activityTeamInfoDetailModel.getStrategyType())
+                .strategyId(activityTeamInfoDetailModel.getStrategyId())
+                .projectSkuInfoModelList(teamProjectSkuInfoResp.apply(activityTeamInfoDetailModel.getId()))
+                .build();
+    }
+
 }

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

@@ -0,0 +1,11 @@
+package com.muyu.marketing.domain.resp;
+
+/**
+ * @program: daiseven-dong
+ * @description: l
+ * @author: CuiFu Bo
+ * @create: 2024-11-28 17:38
+ **/
+
+public class ActivityTeamInfoResp {
+}

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

@@ -1,38 +1,83 @@
 package com.muyu.marketing.domain.resp;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
- * 添加的
+ * @program: daiseven-dong
- */
+ * @description: 商品规格list
+ * @author: CuiFu Bo
+ * @create: 2024-11-26 15:22
+ **/
 @Data
-@SuperBuilder
+@Builder
-@AllArgsConstructor
 @NoArgsConstructor
+@AllArgsConstructor
 public class ActivityTeamProjectSkuResp {
 
+    private  Long teamId;
     /**
-     * 团购商品SKU的ID
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 轮播图
      */
-    private Long productSkuId;
 
+    private String imageList;
     /**
-     * 规格SKU
+     * 活动结束时间
      */
-    private String sku;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProjectSkuResp> projectSkuInfoModelList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
 
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
 
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
 }

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

@@ -1,48 +0,0 @@
-package com.muyu.marketing.domain.resp;
-
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 回显resp
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProjectFindSkuInfoResp {
-    /**
-     * 规格id
-     */
-    private Long id;
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-
-    public static ProjectFindSkuInfoResp projectFindSkuInfoBuild (ActivityTeamProductSkuModel activityTeamProductSkuModel)  {
-        return ProjectFindSkuInfoResp.builder()
-                .teamStock(activityTeamProductSkuModel.getTeamStock())
-                .teamPrice(activityTeamProductSkuModel.getTeamPrice())
-                .id(activityTeamProductSkuModel.getId())
-                .sku(activityTeamProductSkuModel.getSku())
-                .build();
-    }
-}

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

@@ -1,107 +0,0 @@
-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;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 团购活动回显响应
- * @author: AoCi Tian
- * @create: 2024-11-26 15:19
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class TeamInfoFindByIdResp {
-   /**
-    * 拼团id
-    */
-    private Long id;
-    /**
-     * 拼团名称
-     */
-    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 Long sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ProjectFindSkuInfoResp> projectSkuInfoAddList;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-
-    public static TeamInfoFindByIdResp teamInfoFindByIdBuild (ActivityTeamDetailModel activityTeamDetailModel){
-     return TeamInfoFindByIdResp.builder()
-              .id(activityTeamDetailModel.getId())
-              .name(activityTeamDetailModel.getName())
-              .productId(activityTeamDetailModel.getProductId())
-              .productImage(activityTeamDetailModel.getProductImage())
-              .introduction(activityTeamDetailModel.getIntroduction())
-              .unit(activityTeamDetailModel.getUnit())
-              .imageList(activityTeamDetailModel.getImageList())
-              .endTime(activityTeamDetailModel.getEndTime())
-              .sort(activityTeamDetailModel.getSort())
-              .projectSkuInfoAddList(activityTeamDetailModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
-//              .projectSkuInfoAddList(
-//                      teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(activityTeamProductSkuModel ->
-//                              ProjectFindSkuInfoResp.projectFindSkuInfoBuild(activityTeamProductSkuModel)).toList()
-//              )
-              .content(activityTeamDetailModel.getContent())
-              .status(activityTeamDetailModel.getStatus())
-              .strategyType(activityTeamDetailModel.getStrategyType())
-              .strategyId(activityTeamDetailModel.getStrategyId())
-              .build();
- }
-}

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

@@ -0,0 +1,47 @@
+package com.muyu.marketing.domain.resp;
+
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoListModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TeamProjectSkuInfoResp {
+    /**
+     * 规格Id
+     */
+    private Long productSkuId;
+    /**
+     * 规格SKU
+     */
+    private String productSku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static List<TeamProjectSkuInfoResp> teamProjectSkuInfoResp(List<ActivityTeamProductSkuInfoListModel> activityTeamProductSkuInfoListModel){
+        return  activityTeamProductSkuInfoListModel.stream().map(teamProductSkuInfoListModel ->{
+            TeamProjectSkuInfoResp skuInfoResp = TeamProjectSkuInfoResp.builder()
+                    .productSkuId(teamProductSkuInfoListModel.getProductId())
+                    .productSku(teamProductSkuInfoListModel.getProductSku())
+                    .teamPrice(teamProductSkuInfoListModel.getTeamPrice())
+                    .teamStock(teamProductSkuInfoListModel.getTeamStock())
+                    .build();
+            return skuInfoResp;
+        }).toList();
+    }
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java

@@ -17,6 +17,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class MuYuMarketIngApplication {
     public static void main (String[] args) {
+
         SpringApplication.run(MuYuMarketIngApplication.class, args);
+        System.out.println("end------------");
     }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java

@@ -1,18 +1,26 @@
 package com.muyu.marketing.team.controller;
 
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.PageUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.ActivityTeamOpenInfo;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.*;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
+import com.muyu.marketing.domain.req.ActivityTeamUpdReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
-import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
+import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
+import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -28,10 +36,14 @@ import java.util.List;
 public class ActivityTeamController {
 
     @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;;
+    private ActivityTeamInfoService activityTeamInfoService;
+    ;
+    @Autowired
+    private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
     /**
      * 查询营销团购活动列表
+     *
      * @param teamInfoListReq 活动查询入参
      * @return 活动响应结果
      */
@@ -47,25 +59,59 @@ public class ActivityTeamController {
         );
     }
 
+    @PostMapping("/add")
+    public Result<String> add(@RequestBody ActivityTeamInfoSaveReq projectSkuInfoAddReq) {
+        activityTeamInfoService.save(ActivityTeamInfoAddModel.dobuild(projectSkuInfoAddReq));
+        return Result.success("ok");
+    }
+
+
+    /**id查找商品拼团活动详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/id/{id}")
+    public Result<ActivityTeamDetailResp> findById(@PathVariable("id") Long id) {
+        ActivityTeamInfoDetailModel teamInfo = activityTeamInfoService.findById(id);
+
+        ActivityTeamDetailResp teamInfoDetailResp = ActivityTeamDetailResp.setUpDatailResp(
+                teamInfo,
+                teamId -> TeamProjectSkuInfoResp.teamProjectSkuInfoResp(activityTeamProductSkuInfoService.findByTeamId(teamId))
+        );
+        return Result.success(teamInfoDetailResp);
+    }
+
+
+
+    /**修改商品拼团活动详情
+     * @param activityTeamUpdReq
+     * @return
+     */
+    @PutMapping
+    public Result upd(@RequestBody ActivityTeamUpdReq activityTeamUpdReq){
+        activityTeamInfoService.update(ActivityTeamUpdModel.activityTeamUpdReq(activityTeamUpdReq));
+        return Result.success();
+    }
+
+
+
+    @GetMapping("/slist")
+    public List<ActivityTeamInfo> select(){
+        List<ActivityTeamInfo> llist = activityTeamInfoService.llist();
+        return  llist;
+    }
 
     /**
-     * 添加团购活动
+     *客户端列表
-     * @param activityTeamInfoSaveReq 添加请求对象
-     * @return 结果集
      */
-    @PostMapping
+    @GetMapping("customerList")
-    public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
+    public Result<TableDataInfo<ActivityTeamInfo>> customerList(TeamInfoListReq teamInfoListReq){
-        activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
+        PageHelper.startPage(teamInfoListReq.getPageNum(), teamInfoListReq.getPageSize());
-        return Result.success();
+        PageInfo<ActivityTeamInfo> pageInfo = new PageInfo<>(activityTeamInfoService.list());
+        TableDataInfo<ActivityTeamInfo> tableDataInfo = new TableDataInfo<>();
+        tableDataInfo.setRows(pageInfo.getList());
+        tableDataInfo.setTotal(pageInfo.getTotal());
+        return Result.success(tableDataInfo);
     }
 
-    @PostMapping("/findById/{id}")
-    public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
-        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
-    }
-    @PutMapping("/updateByTeamId")
-    public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
-        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
-        return Result.success();
-    }
 }

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

@@ -2,6 +2,8 @@ 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

@@ -0,0 +1,11 @@
+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 org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TeamStrategyExemptionHundredMapper extends BaseMapper<TeamStrategyExemptionHundred> {
+    
+}

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

@@ -0,0 +1,11 @@
+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 org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper<TeamStrategyExemptionOrdinary> {
+    
+}

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

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

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

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

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

@@ -1,39 +1,35 @@
 package com.muyu.marketing.team.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
 import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.req.TeamInfoListReq;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoResp;
+import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuResp;
+
+import java.util.List;
 
 public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
-
-
     /**
      * 通过查询模型查询团购活动列表
      * @param activityTeamInfoListQueryModel 团购活动查询模型
      * @return 团购活动列表
      */
     public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel);
-
     /**
      * 通过添加模型，去进行商品拼团活动的操作
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
 
-    /**
+    ActivityTeamInfoDetailModel findById(Long id);
-     * 根据ID查询商品的详情
-     * @param id 团购活动ID
-     * @return 团购详情
-     */
-    ActivityTeamDetailModel findDetailById(Long id);
 
-    /**
+    public void    update(ActivityTeamUpdModel activityTeamUpdModelList);
-     * 修改团购活动信息
-     * @param activityTeamInfoUpdModel 团购活动信息
-     * @return 是否成功
-     */
-    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
 
+    List<ActivityTeamInfo> llist();
+
 }

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

@@ -5,8 +5,12 @@ import com.muyu.common.core.enums.market.team.TeamOpenTypeEnum;
 import com.muyu.marketing.domain.ActivityTeamOpenInfo;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 
+import java.util.List;
+
 public interface ActivityTeamOpenInfoService extends IService<ActivityTeamOpenInfo> {
 
+    List<ActivityTeamOpenInfo> selectlist(  );
+
     /**
      * 通过活动ID和开团类型查询开团数量
      * @param teamId 活动ID
@@ -32,4 +36,8 @@ public interface ActivityTeamOpenInfoService extends IService<ActivityTeamOpenIn
     public default Long getTeamInTypeNumberByTeamId(Long teamId){
         return this.getTeamOpenNumberByTeamIdAndType(teamId, TeamOpenTypeEnum.IN_TEAM);
     }
+
+
+
+
 }

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

@@ -3,6 +3,7 @@ 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.dto.Deledto;
 import com.muyu.marketing.domain.model.*;
 
 import java.util.List;
@@ -23,7 +24,6 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public TeamProductDiscountPriceModel getDiscountPrice(Long teamId);
 
-
     /**
      * 通过活动ID获取 剩余库存
      * @param teamId 活动ID
@@ -38,36 +38,16 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
-    /**
+    public List<ActivityTeamProductSkuInfoListModel> findByTeamId(Long teamId);
-     * 通过拼团活动ID获取拼团下商品SKU集合
-     * @param teamId 活动ID
-     * @return 拼团商品SKU集合
-     */
-    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
 
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
+    /** 根据业务模型进行团购批量修改
-
+     * @param activityTeamProductSkuModelList
-    /**
+     * @return
-     * 根据 业务模型 进行 团购商品修改
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
      */
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
+    public boolean updateBath(List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuModelList );
 
-    /**
+    public  boolean insertinto(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel);
-     * 根据 业务模型 进行 团购商品批量修改
+
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
+    public boolean delBatch(List<Long> ids);
-     * @return 修改结果
-     */
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
 
-    /**
-     * 一键设置
-     * @param activityTeamProductSkuSettingModel 整体修改模型
-     */
-    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
-        this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
-        this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
-        this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
-    }
 }

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,7 @@
+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,10 +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.team.strategy.ActivityTeamStrategy;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 
-/**
+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

@@ -1,11 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,21 +1,39 @@
 package com.muyu.marketing.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.req.TeamInfoListReq;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoResp;
+import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuResp;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
+import com.muyu.product.domain.AsCategoryAttribute;
+import com.muyu.product.domain.CategoryInfo;
+import com.muyu.product.domain.req.CategoryInfoEditReq;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -34,7 +52,6 @@ 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());
-
         /**
          * Object<T> -> 创建对象的时候进行的占用
          * <T> Result<T> 以方法返回值为占用
@@ -44,17 +61,17 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         List<ActivityTeamInfoListModel> activityTeamInfoListModels = activityTeamInfoList.stream()
                 .map(activityTeamInfo -> ActivityTeamInfoListModel.infoBuild(activityTeamInfo,
                         (activityTeamInfoListModelBuilder) -> {
-                            TeamProductDiscountPriceModel discountPrice = activityTeamProductSkuInfoService.getDiscountPrice(activityTeamInfo.getId());
+//                            TeamProductDiscountPriceModel discountPrice = activityTeamProductSkuInfoService.getDiscountPrice(activityTeamInfo.getId());
                             TeamProductStockModel teamProductStockModel = activityTeamProductSkuInfoService.getStock(activityTeamInfo.getId());
-                            Long teamOpenTypeNumber = activityTeamOpenInfoService.getTeamOpenTypeNumberByTeamId(activityTeamInfo.getId());
+//                            Long teamOpenTypeNumber = activityTeamOpenInfoService.getTeamOpenTypeNumberByTeamId(activityTeamInfo.getId());
-                            Long teamInTypeNumber = activityTeamOpenInfoService.getTeamInTypeNumberByTeamId(activityTeamInfo.getId());
+//                            Long teamInTypeNumber = activityTeamOpenInfoService.getTeamInTypeNumberByTeamId(activityTeamInfo.getId());
 
                             return activityTeamInfoListModelBuilder
-                                    .openTeamNumber(teamOpenTypeNumber)
+//                                    .openTeamNumber(teamOpenTypeNumber)
-                                    .addTeamNumber(teamInTypeNumber)
+//                                    .addTeamNumber(teamInTypeNumber)
-                                    .attendNumber(teamOpenTypeNumber + teamInTypeNumber)
+//                                    .attendNumber(teamOpenTypeNumber + teamInTypeNumber)
-                                    .teamPrice(discountPrice.getTeamPrice())
+//                                    .teamPrice(discountPrice.getTeamPrice())
-                                    .productPrice(discountPrice.getProductPrice())
+//                                    .productPrice(discountPrice.getProductPrice())
                                     .teamStock(teamProductStockModel.getTeamStock())
                                     .remainStock(teamProductStockModel.getRemainStock())
                                     .build();
@@ -72,37 +89,56 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
      */
     @Override
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
+
          ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.addModelBuild(activityTeamInfoAddModel);
-        Assert.isTrue(this.save(activityTeamInfo), StringUtils.format("团购活动添加失败：[{}]", activityTeamInfoAddModel));
+
-        List<ActivityTeamProductSkuAddModel> teamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList();
+        Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("不存在"),activityTeamInfoAddModel);
-        teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
+
-        this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
+        List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList();
+        activityTeamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> {
+            activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId());
+        });
+        activityTeamProductSkuInfoService.batchSave(activityTeamProductSkuAddModelList);
     }
 
-    /**
-     * 根据ID查询商品的详情
-     * @param id 团购活动ID
-     * @return 团购详情
-     */
     @Override
-    public ActivityTeamDetailModel findDetailById(Long id) {
+    public ActivityTeamInfoDetailModel findById(Long id) {
-        ActivityTeamInfo activityTeamInfo = this.getById(id);
+        return ActivityTeamInfoDetailModel.activityTeamInfoDetailModel(this.getById(id));
-        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
-        return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
-                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
-        );
     }
 
-    /**
+//    @Override
-     * 修改团购活动信息
+//    public boolean update(ActivityTeamUpdModel activityTeamUpdModelList) {
-     * @param activityTeamInfoUpdModel 团购活动信息
+//        LambdaUpdateWrapper<ActivityTeamProductSkuInfo> updateWrapper = new LambdaUpdateWrapper<>();
-     * @return 是否成功
+//        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamUpdModelList.getTeamPrice());
-     */
+//        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamUpdModelList.getTeamStock());
+//        updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock,activityTeamUpdModelList.getRemainStock());
+//        updateWrapper.eq( ActivityTeamProductSkuInfo::getId ,activityTeamUpdModelList.getId());
+//
+//        return this.update(activityTeamUpdModelList);
+//    }
+
+
     @Override
-    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+    public void update(ActivityTeamUpdModel activityTeamUpdModel) {
-        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
+
-        Assert.isTrue(update,"修改失败");
+        ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.updModelBuild(activityTeamUpdModel);
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
+        //修改拼团活动表
-        return update;
+        this.updateById(activityTeamInfo);
+       //批量修改商品sku列表
+          activityTeamProductSkuInfoService.updateBath(activityTeamUpdModel.getActivityTeamProductSkuModel().getActivityTeamProductSkuModelList());
+        //根据活动规格批量删除
+        activityTeamProductSkuInfoService.removeBatchByIds(activityTeamUpdModel.getActivityTeamProductSkuModel().getSkuIdList());
+
+        List<ActivityTeamProductSkuAddModel> teamProductSkuAddModelList = activityTeamUpdModel.getActivityTeamProductSkuModel().getActivityTeamProductSkuAddModelList();
+       //批量添加商品规格
+        activityTeamProductSkuInfoService.saveBatch(teamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::addProductBuildModel).toList());
     }
+
+    @Override
+    public List<ActivityTeamInfo> llist() {
+
+        return this.list();
+    }
+
+
 }

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

@@ -8,10 +8,17 @@ import com.muyu.marketing.team.mapper.ActivityTeamOpenInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ActivityTeamOpenInfoServiceImpl extends ServiceImpl<ActivityTeamOpenInfoMapper, ActivityTeamOpenInfo>
     implements ActivityTeamOpenInfoService {
 
+    @Override
+    public List<ActivityTeamOpenInfo> selectlist( ) {
+
+        return this.list();
+    }
     /**
      * 通过活动ID和开团类型查询开团数量
      *
@@ -26,6 +33,4 @@ public class ActivityTeamOpenInfoServiceImpl extends ServiceImpl<ActivityTeamOpe
         queryWrapper.eq(ActivityTeamOpenInfo::getTeamType, teamOpenType.code());
         return this.count(queryWrapper);
     }
-
-
 }

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

@@ -1,14 +1,20 @@
 package com.muyu.marketing.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.exception.ServiceException;
+import com.muyu.marketing.domain.ActivityTeamInfo;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import com.muyu.marketing.domain.dto.Deledto;
 import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
+import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuResp;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
+import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import com.muyu.product.cache.ProjectSkuCache;
+import com.muyu.product.domain.AsAttributeGroup;
+import com.muyu.product.domain.AttributeGroup;
 import com.muyu.product.domain.ProjectSkuInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -81,58 +87,31 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         );
     }
 
-    /**
-     * 通过拼团活动ID获取拼团下商品SKU集合
-     *
-     * @param teamId 活动ID
-     * @return 拼团商品SKU集合
-     */
     @Override
-    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
+    public List<ActivityTeamProductSkuInfoListModel> findByTeamId(Long teamId) {
-        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<ActivityTeamProductSkuInfo> wrapper = new LambdaQueryWrapper<ActivityTeamProductSkuInfo>()
-        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
+                .eq(ActivityTeamProductSkuInfo::getTeamId, teamId);
-        List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
+        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = this.list(wrapper);
-        return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
+        return activityTeamProductSkuInfoList.stream().
-//        return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
+                map(ActivityTeamProductSkuInfoListModel::infoListModel)
+                .toList();
     }
 
     @Transactional
     @Override
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
+    public boolean updateBath(List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuModelList) {
-        return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
+        return this.updateBatchById(activityTeamProductSkuModelList.stream().map(ActivityTeamProductSkuInfo::updModelBUild).toList());
     }
 
-    /**
-     * 根据 业务模型 进行 团购商品修改
-     *
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
-     */
     @Override
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) {
+        public boolean delBatch(List<Long> ids) {
-        // update set  where
+            this.removeBatchByIds(ids);
-        LambdaUpdateWrapper<ActivityTeamProductSkuInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        return true;
-        // 字段=值
-        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock());
-        updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock,activityTeamProductSkuUpdModel.getTeamStock());
-        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice());
-        // id=？
-        updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId());
-        return this.update(updateWrapper);
     }
 
-    /**
-     * 根据 业务模型 进行 团购商品批量修改
-     *
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
-     */
     @Override
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
+    public boolean insertinto(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
-        return this.updateBatchById(
+        return false;
-                activityTeamProductSkuUpdModelList.stream()
-                        .map(ActivityTeamProductSkuInfo::updModelBuild)
-                        .toList()
-        );
     }
+   
 }

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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,16 @@
+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,62 +4,13 @@ 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;
-
+/**
-@Log4j2
+ *  免单
-@Service("team-strategy-exemption")
+ *
+ */
+@Service
 public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption>
     implements TeamStrategyExemptionService {
     
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-        log.info("参加 - 免单团 - [{}]", activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
 }

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

@@ -1,66 +0,0 @@
-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.TeamStrategyHundredMapper;
-import com.muyu.marketing.team.service.TeamStrategyHundredService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.stereotype.Service;
-
-@Log4j2
-@Service("team-strategy-hundred")
-public class TeamStrategyHundredServiceImpl extends ServiceImpl<TeamStrategyHundredMapper, TeamStrategyHundred>
-    implements TeamStrategyHundredService {
-
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-
-        log.info("参加 - 百人团 - [{}]", activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
-}

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

@@ -1,66 +0,0 @@
-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.TeamStrategyOrdinaryMapper;
-import com.muyu.marketing.team.service.TeamStrategyOrdinaryService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.stereotype.Service;
-
-@Log4j2
-@Service("team-strategy-ordinary")
-public class TeamStrategyOrdinaryServiceImpl extends ServiceImpl<TeamStrategyOrdinaryMapper, TeamStrategyOrdinary>
-    implements TeamStrategyOrdinaryService {
-
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-
-        log.info("参加 - 普通团 - [{}]", activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/sragety/AcitivtyTeamStrategy.java

@@ -0,0 +1,39 @@
+package com.muyu.marketing.team.sragety;
+
+/**
+ * @program: daiseven-dong
+ * @description: 团活动策略
+ * @author: CuiFu Bo
+ * @create: 2024-11-29 20:03
+ **/
+
+public interface AcitivtyTeamStrategy {
+
+
+    /**开团
+     * @param activityTeamId
+     */
+    public void  openTeam(Long activityTeamId);
+
+    /**申请加团
+     * @param teamId
+     */
+    public  void  applyTeam(Long teamId);
+
+    /**参团
+     * @param teamId
+     * @param TeamNumber
+     */
+    public  void  addTeam(Long teamId, String TeamNumber);
+
+
+    /**退团
+     * @param teamId
+     */
+    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/sragety/impl/ActivityTeamStrategyImpl.java

@@ -1,33 +1,24 @@
-package com.muyu.marketing.team.strategy.impl;
+package com.muyu.marketing.team.sragety.impl;
-
 
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+import com.muyu.marketing.team.sragety.AcitivtyTeamStrategy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 /**
- * 团购执行器
+ * @program: daiseven-dong
- *
+ * @description: 团购执行器
- * @author DongZeLiang
+ * @author: CuiFu Bo
- * @date 2024-11-29 15:28
+ * @create: 2024-11-29 20:34
- */
+ **/
 @Service
 @Primary
-public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
+public class ActivityTeamStrategyImpl implements AcitivtyTeamStrategy {
-    /**
+
-     * 开团
+
-     *
-     * @param activityTeamId 团购活动ID
-     */
     @Override
     public void openTeam(Long activityTeamId) {
-        // 假设这里是通过方法获取的type，activityTeamId.toString()
-        // "team-strategy-exemption"
-        // "team-strategy-hundred"
-        // "team-strategy-ordinary"
-
         String activityTeamType = null;
         if (activityTeamId == null) {
             throw new ServiceException("activityTeamId is null");
@@ -38,46 +29,25 @@ public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
         }else if (activityTeamId == 2) {
             activityTeamType = "team-strategy-ordinary";
         }
-        ActivityTeamStrategy activityTeamStrategy = SpringUtils.getBean(activityTeamType);
+        AcitivtyTeamStrategy activityTeamStrategy = SpringUtils.getBean(activityTeamType);
         activityTeamStrategy.openTeam(activityTeamId);
     }
 
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
     @Override
     public void applyTeam(Long teamId) {
 
     }
 
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
     @Override
-    public void addTeam(Long teamId, String orderNumber) {
+    public void addTeam(Long teamId, String TeamNumber) {
 
     }
 
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
     @Override
     public void backTeam(Long teamId) {
 
     }
 
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
     @Override
     public void settle(Long teamId) {
 

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

@@ -1,44 +0,0 @@
-package com.muyu.marketing.team.strategy;
-
-
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 团活动策略
- *
- * @author DongZeLiang
- * @date 2024-11-29 15:03
- */
-public interface ActivityTeamStrategy {
-
-    /**
-     * 开团
-     * @param activityTeamId 团购活动ID
-     */
-    public void openTeam(Long activityTeamId);
-
-    /**
-     * 申请加团
-     * @param teamId 团ID
-     */
-    public void applyTeam(Long teamId);
-
-    /**
-     * 参团
-     * @param teamId 加团ID
-     * @param orderNumber 订单编号
-     */
-    public void addTeam(Long teamId, String orderNumber);
-
-    /**
-     * 退团
-     * @param teamId 团购ID
-     */
-    public void backTeam(Long teamId);
-
-    /**
-     * 结算团
-     * @param teamId 团购ID
-     */
-    public void settle(Long teamId);
-}

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

@@ -1,12 +1,12 @@
 # Tomcat
 server:
-  port: 9209
+  port: 9256
 
 # Spring
 spring:
   application:
     # 应用名称
-    name: muyu-buy
+    name: muyu-marketing
   profiles:
     # 环境配置
     active: dev
@@ -14,15 +14,19 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
+        group: DEFAULT_GROUP
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        group: DEFAULT_GROUP
 logging:
   level:
     com.muyu.marketing.mapper: DEBUG

muyu-modules/muyu-marketing/marketing-server/src/test/java/com/muyu/test/TeamStrategyTest.java

@@ -1,28 +0,0 @@
-package com.muyu.test;
-
-
-import com.muyu.marketing.MuYuMarketIngApplication;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * 测试
- *
- * @author DongZeLiang
- * @date 2024-11-29 15:40
- */
-@SpringBootTest(classes = MuYuMarketIngApplication.class)
-public class TeamStrategyTest {
-
-    @Autowired
-    private ActivityTeamStrategy activityTeamStrategy;
-
-    @Test
-    public void testStrategy() {
-        activityTeamStrategy.openTeam(0L);
-        activityTeamStrategy.openTeam(1L);
-        activityTeamStrategy.openTeam(2L);
-    }
-}

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

@@ -46,6 +46,7 @@ public class AttributeGroupSaveModel extends BaseEntity {
                 .build();
     }
 
+
     public AttributeGroup buildAttributeGroup () {
         return AttributeGroup.builder()
                 .name(this.getName())

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

@@ -68,16 +68,16 @@ public class AttributeGroupController extends BaseController {
         util.exportExcel(response, list, "属性组数据");
     }
 
-    /**
+//    /**
-     * 获取属性组详细信息
+//     * 获取属性组详细信息
-     */
+//     */
-    @ApiOperation("获取属性组详细信息")
+//    @ApiOperation("获取属性组详细信息")
-    @RequiresPermissions("product:attributeGroup:query")
+//    @RequiresPermissions("product:attributeGroup:query")
-    @GetMapping(value = "/{id}")
+//    @GetMapping(value = "/{id}")
-    @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
+//    @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
-    public Result<AttributeGroupUpdResp> getInfo(@PathVariable("id") Long id) {
+//    public Result<AttributeGroupUpdResp> getInfo(@PathVariable("id") Long id) {
-        return Result.success(attributeGroupService.getUpdById(id));
+//        return Result.success(attributeGroupService.getUpdById(id));
-    }
+//    }
 
     /**
      * 新增属性组
@@ -92,17 +92,33 @@ public class AttributeGroupController extends BaseController {
         );
     }
 
+//    /**
+//     * 修改属性组
+//     */
+//    @RequiresPermissions("product:attributeGroup:edit")
+//    @Log(title = "属性组", businessType = BusinessType.UPDATE)
+//    @PutMapping("/{id}")
+//    @ApiOperation("修改属性组")
+//    public Result<String> edit(@PathVariable Long id, @RequestBody AttributeGroupEditReq attributeGroupEditReq) {
+//
+//        return toAjax(attributeGroupService.updateById(AttributeGroup.editBuild(id,attributeGroupEditReq)));
+////        return  attributeGroupService.updatebyidTwo(id,attributeGroupEditReq);
+//    }
+
     /**
      * 修改属性组
      */
     @RequiresPermissions("product:attributeGroup:edit")
     @Log(title = "属性组", businessType = BusinessType.UPDATE)
-    @PutMapping("/{id}")
+    @PutMapping("")
     @ApiOperation("修改属性组")
-    public Result<String> edit(@PathVariable Long id, @RequestBody AttributeGroupEditReq attributeGroupEditReq) {
+    public Result<String> edit(@PathVariable Integer[] attrbuIdList, @RequestBody AttributeGroup attributeGroup) {
-        return toAjax(attributeGroupService.updateById(AttributeGroup.editBuild(id,attributeGroupEditReq)));
+     return  attributeGroupService.upd(attrbuIdList, attributeGroup);
     }
 
+
+
+
     /**
      * 删除属性组
      */
@@ -114,4 +130,18 @@ public class AttributeGroupController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(attributeGroupService.removeBatchByIds(ids));
     }
+
+
+    @PutMapping("changeStatus")
+    public  Result editStatus(@RequestBody AttributeGroup attributeGroup){
+
+        return  toAjax(attributeGroupService.changeStatus(attributeGroup));
+    }
+
+
+    @GetMapping(value = "/{id}")
+    public  Result<AttributeGroupPageResp> findById(@PathVariable Long id){
+           return  attributeGroupService.findById(id);
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.muyu.product.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -108,4 +109,13 @@ public class CommentInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(commentInfoService.removeBatchByIds(ids));
     }
+
+   //根据商品id查找评论
+  @GetMapping("/find/{proudctId}")
+    public List<CommentInfo> find(@PathVariable Integer proudctId){
+
+      List<CommentInfo> findddd = commentInfoService.findddd(proudctId);
+      return findddd;
+  }
+
 }

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

@@ -130,4 +130,7 @@ public class ProjectSkuInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(projectSkuInfoService.removeBatchByIds(ids));
     }
+
+
+
 }

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

@@ -12,4 +12,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/service/AttributeGroupService.java

@@ -2,11 +2,13 @@ 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;
 
@@ -46,4 +48,17 @@ public interface AttributeGroupService extends IService<AttributeGroup> {
      * @return
      */
     AttributeGroupUpdResp getUpdById(Long id);
+
+
+    /**修改属性组状态
+     * @param attributeGroup
+     * @return
+     */
+    int changeStatus(AttributeGroup attributeGroup);
+
+    Result<String> updatebyidTwo(Long id, AttributeGroupEditReq attributeGroupEditReq);
+
+    Result<String> upd(Integer[] ids, AttributeGroup attributeGroup);
+
+    Result<AttributeGroupPageResp> findById(Long id);
 }

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

@@ -3,6 +3,7 @@ package com.muyu.product.service;
 import java.util.List;
 import com.muyu.product.domain.CommentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 商品评论Service接口
@@ -18,5 +19,5 @@ public interface CommentInfoService extends IService<CommentInfo> {
      * @return 商品评论集合
      */
     public List<CommentInfo> list(CommentInfo commentInfo);
-
+    List<CommentInfo> findddd( Integer proudctId);
 }

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

@@ -3,14 +3,17 @@ package com.muyu.product.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.ObjUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.product.domain.AsAttributeGroup;
 import com.muyu.product.domain.AttributeGroup;
 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.mapper.AsAttributeGroupMapper;
 import com.muyu.product.mapper.AttributeGroupMapper;
 import com.muyu.product.service.AsAttributeGroupService;
 import com.muyu.product.service.AttributeGroupService;
@@ -38,6 +41,10 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
     @Autowired
     private AttributeInfoService attributeInfoService;
 
+    @Autowired
+    private  AttributeGroupMapper attributeGroupMapper;
+    @Autowired
+    private AsAttributeGroupMapper asAttributeGroupMapper;
     /**
      * 分页查询
      *
@@ -126,4 +133,40 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
                 .attributeList(attributeInfoList)
                 .build();
     }
+
+    @Override
+    public int changeStatus(AttributeGroup attributeGroup) {
+        return 0;
+    }
+
+    @Override
+    public Result<String> updatebyidTwo(Long id, AttributeGroupEditReq attributeGroupEditReq) {
+        return null;
+    }
+
+    @Override
+    public Result<String> upd(Integer[] ids, AttributeGroup attributeGroup) {
+           //修改属性组
+          attributeGroupMapper.updateById(attributeGroup);
+           //删除属性与组中间表 as_attribute_group
+           LambdaQueryWrapper<AsAttributeGroup> queryWrapper = new LambdaQueryWrapper<>();
+           queryWrapper.eq(AsAttributeGroup::getGroupId,attributeGroup.getId());
+           asAttributeGroupMapper.delete(queryWrapper);
+           //添加属性与组中间表 as_attribute_group
+//        for (Integer id : ids) {
+//             attributeGroupMapper.saveAsAttributeGroup(attributeGroup.getId(),id);
+//        }
+        return Result.success("修改成功");
+    }
+
+    @Override
+    public Result<AttributeGroupPageResp> findById(Long id) {
+        return null;
+    }
+
+//    @Override
+//    public Result<AttributeGroupPageResp> findById(Long id) {
+//       attributeGroupMapper.find
+//        return null;
+//    }
 }

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

@@ -54,4 +54,12 @@ public class CommentInfoServiceImpl extends ServiceImpl<CommentInfoMapper, Comme
 
         return list(queryWrapper);
     }
+
+    @Override
+    public List<CommentInfo> findddd(Integer proudctId) {
+        LambdaQueryWrapper<CommentInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CommentInfo::getProjectId,proudctId);
+        List<CommentInfo> list = this.list(wrapper);
+        return list;
+    }
 }

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9302
+  port: 9333
 
 # Spring
 spring:
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9201
+  port: 9296
 
 # Spring
 spring:
@@ -14,10 +14,13 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.98.9:8848
+        namespace: asdasd
+
         # 配置文件格式
         file-extension: yml
         # 共享配置