feat(): 更改信息

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

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

@@ -0,0 +1,35 @@
+$.{
+        "活动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",
+                        "商品价格":"BigDecimal", // activity_team_product_sku_info.product_sku
+                        "拼团价格":"BigDecimal",
+                        "拼团库存":"Long" // 若是只修改库存可以直接写一个单独的修改库存接口
+                    }
+                ],
+                "删除商品规格IdList":["Long","Long"],
+                "删除商品规格IdList":[
+                            "商品SKU": "String",
+                            "商品价格":"BigDecimal",
+                            "拼团价格":"BigDecimal",
+                            "拼团库存":"Long" // 若是只修改库存可以直接写一个单独的修改库存接口
+                        ]
+        },
+        "状态":"String" //需要判断该商品是否已开启秒杀状态 若开启禁止修改 未开启则可以修改
+        "排序":"Integer",
+        "详情":"String"
+}

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

@@ -0,0 +1,16 @@
+拼团模块
+   1.拼团商品详情
+   2.商品规格
+   3.参团选择商品
+        4. 策略类型  (普通团,梯队团)
+            4.1 参团中
+            4.2 参团失败
+            4.3 参团成功一达到人数
+            4.4 参团成功一人数未满
+   4.拼团订单详情
+        4.1 拼团成功
+        4.2 拼团失败
+
+
+分析接口
+1. 

doc/团购回显数据结构.java

@@ -0,0 +1,25 @@
+$.{
+  "活动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,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"
-}

muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java

@@ -11,10 +11,7 @@ import com.muyu.common.security.service.TokenService;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -24,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author muyu
  */
 @RestController
+
 public class TokenController {
     @Autowired
     private TokenService tokenService;

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        amespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -3,14 +3,18 @@ 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 com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @SuperBuilder
@@ -24,7 +28,7 @@ public class ActivityTeamInfo extends BaseEntity {
    * 主键
    */
   @TableId(value = "id", type = IdType.AUTO)
-  private long id;
+  private Long id;
   /**
    * 拼团名称
    */
@@ -52,11 +56,13 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 活动结束时间
    */
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date endTime;
   /**
    * 活动排序
    */
-  private long sort;
+  private Long sort;
   /**
    * 活动详情
    */
@@ -72,7 +78,11 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 策略ID
    */
-  private long strategyId;
+  private Long strategyId;
+  /**
+   * 首页
+   */
+
 
   /**
    * 公共添加模型，转换成添加对象
@@ -96,37 +106,20 @@ public class ActivityTeamInfo extends BaseEntity {
             .build();
   }
 
-  public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
+  public static ActivityTeamInfo addTeamInfoModelBuild(ActivityTeamInfoModel activityTeamInfoModel) {
     return ActivityTeamInfo.builder()
-            .name(activityTeamInfoSaveModel.getName())
+            .name(activityTeamInfoModel.getName())
-            .productId(activityTeamInfoSaveModel.getProductId())
+            .productId(activityTeamInfoModel.getProductId())
-            .productImage(activityTeamInfoSaveModel.getProductImage())
+            .productImage(activityTeamInfoModel.getProductImage())
-            .introduction(activityTeamInfoSaveModel.getIntroduction())
+            .introduction(activityTeamInfoModel.getIntroduction())
-            .unit(activityTeamInfoSaveModel.getUnit())
+            .unit(activityTeamInfoModel.getUnit())
-            .imageList(activityTeamInfoSaveModel.getImageList())
+            .imageList(activityTeamInfoModel.getImageList())
-            .endTime(activityTeamInfoSaveModel.getEndTime())
+            .endTime(activityTeamInfoModel.getEndTime())
-            .sort(activityTeamInfoSaveModel.getSort())
+            .sort(activityTeamInfoModel.getSort())
-            .content(activityTeamInfoSaveModel.getContent())
+            .content(activityTeamInfoModel.getContent())
-            .status(activityTeamInfoSaveModel.getStatus())
+            .status(activityTeamInfoModel.getStatus())
-            .strategyType(activityTeamInfoSaveModel.getStrategyType())
+            .strategyType(activityTeamInfoModel.getStrategyType())
-            .strategyId(activityTeamInfoSaveModel.getStrategyId())
+            .strategyId(activityTeamInfoModel.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,9 +3,11 @@ 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 org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -41,6 +43,8 @@ public class ActivityTeamOpenInfo extends BaseEntity {
   /**
    * 结束团购时间
    */
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date endTime;
   /**
    * 商品ID

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

@@ -6,8 +6,6 @@ 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.ActivityTeamProductSkuModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -51,6 +49,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
    */
   private BigDecimal teamPrice;
 
+
   /**
    * 通过模型钢构件对象
    * @param activityTeamProductSkuAddModel 模型
@@ -61,28 +60,16 @@ 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 skuUpdModel(ActivityTeamProductSkuModel 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 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/model/ActivityTeamInfoAddModel.java

@@ -15,7 +15,7 @@ import java.util.function.Supplier;
 /**
  * 团购活动添加模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-26 09:38
  */
 @Data
@@ -48,7 +48,6 @@ public class ActivityTeamInfoAddModel {
     /**
      * 轮播图
      */
-
     private String imageList;
     /**
      * 活动结束时间

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

@@ -2,28 +2,26 @@ package com.muyu.marketing.domain.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 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 {
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoDatailModel {
     /**
-     * 拼团id
+     * 拼团Id
      */
     private Long id;
     /**
@@ -45,7 +43,6 @@ public class ActivityTeamDetailModel {
     /**
      * 单位
      */
-
     private String unit;
     /**
      * 轮播图
@@ -64,7 +61,7 @@ public class ActivityTeamDetailModel {
     /**
      * 商品SkU集合
      */
-    private List<ActivityTeamProductSkuModel> projectSkuInfoAddReqList;
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuList;
     /**
      * 活动详情
      */
@@ -81,9 +78,9 @@ public class ActivityTeamDetailModel {
      * 策略ID
      */
     private Long strategyId;
-    public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
+
-                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
+    public static ActivityTeamInfoDatailModel DatailModel(ActivityTeamInfo activityTeamInfo, List<ActivityTeamProductSkuModel> teamInfoSkuListModelList) {
-        return function.apply(ActivityTeamDetailModel.builder()
+        return ActivityTeamInfoDatailModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())
                 .productId(activityTeamInfo.getProductId())
@@ -93,10 +90,12 @@ public class ActivityTeamDetailModel {
                 .imageList(activityTeamInfo.getImageList())
                 .endTime(activityTeamInfo.getEndTime())
                 .sort(activityTeamInfo.getSort())
+                .activityTeamProductSkuList(teamInfoSkuListModelList)
                 .content(activityTeamInfo.getContent())
                 .status(activityTeamInfo.getStatus())
                 .strategyType(activityTeamInfo.getStrategyType())
                 .strategyId(activityTeamInfo.getStrategyId())
-        );
+                .build();
+
     }
 }

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

@@ -12,7 +12,7 @@ import java.util.function.Function;
 
 /**
  * 团购活动雷彪查询结果模型
- * @author DongZeLiang
+ * @author
  * @date 2024-11-20 14:18:10
  */
 @Data

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

@@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder;
 
 /**
  * 团购活动雷彪查询模型
- * @author DongZeLiang
+ * @author
  * @date 2024-11-20 14:18:10
  */
 @Data

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

@@ -0,0 +1,100 @@
+package com.muyu.marketing.domain.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.marketing.domain.req.ActivityTeamProductReq;
+import com.muyu.marketing.domain.req.ActivityTeamProductUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 团购活动修改对象
+ */
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamInfoModel {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    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 ActivityTeamProductUpdModel activityTeamProductUpdModel;
+
+    public static ActivityTeamInfoModel activityTeamBuilder(ActivityTeamProductReq activityTeamProductReq) {
+        return ActivityTeamInfoModel.builder()
+                .id(activityTeamProductReq.getId())
+                .name(activityTeamProductReq.getName())
+                .productId(activityTeamProductReq.getProductId())
+                .productImage(activityTeamProductReq.getProductImage())
+                .introduction(activityTeamProductReq.getIntroduction())
+                .unit(activityTeamProductReq.getUnit())
+                .imageList(activityTeamProductReq.getImageList())
+                .endTime(activityTeamProductReq.getEndTime())
+                .sort(activityTeamProductReq.getSort())
+                .content(activityTeamProductReq.getContent())
+                .status(activityTeamProductReq.getStatus())
+                .strategyType(activityTeamProductReq.getStrategyType())
+                .strategyId(activityTeamProductReq.getProductId())
+                .activityTeamProductUpdModel(ActivityTeamProductUpdModel.teamProductBuilder(activityTeamProductReq.getActivityTeamProductUpdReq()))
+                .build();
+    }
+
+}

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

@@ -1,92 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 添加活动模型
- * @author: AoCi Tian
- * @create: 2024-11-26 10:59
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoSaveModel {
-
-    /**
-     * 拼团名称
-     */
-    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;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-    public static ActivityTeamInfoSaveModel activityTeamInfoSaveModelBuild (ActivityTeamInfoAddModel activityTeamInfoAddModel){
-        return ActivityTeamInfoSaveModel.builder()
-                .name(activityTeamInfoAddModel.getName())
-                .productId(activityTeamInfoAddModel.getProductId())
-                .productImage(activityTeamInfoAddModel.getProductImage())
-                .introduction(activityTeamInfoAddModel.getIntroduction())
-                .unit(activityTeamInfoAddModel.getUnit())
-                .imageList(activityTeamInfoAddModel.getImageList())
-                .endTime(activityTeamInfoAddModel.getEndTime())
-                .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/model/ActivityTeamInfoSkuListModel.java

@@ -0,0 +1,62 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * 团购活动Id查询结果模型
+ * @author
+ * @date 2024-11-20 14:18:10
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoSkuListModel {
+
+    /**
+     * 活动Id
+     */
+    private Long teamId;
+
+    /**
+     * 商品Id
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamProductSkuModel skuByIdModel(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) {
+        return ActivityTeamProductSkuModel.builder()
+                .teamId(activityTeamProductSkuInfo.getTeamId())
+                .productId(activityTeamProductSkuInfo.getProductId())
+                .sku(activityTeamProductSkuInfo.getProductSku())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                .teamStock(activityTeamProductSkuInfo.getTeamStock())
+                .build();
+
+    }
+}

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

@@ -1,65 +0,0 @@
-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 java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 活动商品规格修改模型
- * @author: AoCi Tian
- * @create: 2024-11-26 19:25
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoUpdModel {
-    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 ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
-
-    public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
-        return ActivityTeamInfoUpdModel.builder()
-                .id(activityTeamInfoUpdReq.getId())
-                .name(activityTeamInfoUpdReq.getName())
-                .productId(activityTeamInfoUpdReq.getProductId())
-                .productImage(activityTeamInfoUpdReq.getProductImage())
-                .introduction(activityTeamInfoUpdReq.getIntroduction())
-                .unit(activityTeamInfoUpdReq.getUnit())
-                .imageList(activityTeamInfoUpdReq.getImageList())
-                .endTime(activityTeamInfoUpdReq.getEndTime())
-                .sort(activityTeamInfoUpdReq.getSort())
-                .content(activityTeamInfoUpdReq.getContent())
-                .status(activityTeamInfoUpdReq.getStatus())
-                .strategyType(activityTeamInfoUpdReq.getStrategyType())
-                .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
-                .build();
-    }
-}

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

@@ -8,13 +8,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
  * 团购spu库存添加模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-26 09:36
  */
 @Data
@@ -56,4 +55,5 @@ public class ActivityTeamProductSkuAddModel {
                 .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
                 .build();
     }
+
 }

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

@@ -1,51 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * 商品活动SKU信息模型
- *
- * @author DongZeLiang
- * @date 2024-11-26 15:35
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuInfoModel {
-    /**
-     * 团购商品SKU的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,31 +1,37 @@
 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;
 
 /**
- * @program: 2204a-cloud-server
+ * 团购活动规格模型
- * @description: 回显sku模型
+ */
- * @author: AoCi Tian
- * @create: 2024-11-26 16:03
- **/
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ActivityTeamProductSkuModel {
     /**
-     * 规格id
+     * 规格Id
      */
     private Long id;
     /**
-     * 规格SKU
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 商品SKU
      */
     private String sku;
 
@@ -38,13 +44,4 @@ public class ActivityTeamProductSkuModel {
      * 拼团库存
      */
     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

@@ -1,40 +0,0 @@
-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 java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: sku修改模型
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuReqModel {
-    private Long id;
-    private Long teamId;
-    private Long productId;
-    private String productSku;
-    private Long teamStock;
-    private Long remainStock;
-    private BigDecimal teamPrice;
-    public static ActivityTeamProductSkuReqModel activityTeamProductSkuReqModelBuild(ActivityTeamProductSkuReq activityTeamProductSkuReq){
-        return ActivityTeamProductSkuReqModel.builder()
-                .id(activityTeamProductSkuReq.getId())
-                .productId(activityTeamProductSkuReq.getProductId())
-                .teamId(activityTeamProductSkuReq.getTeamId())
-                .productSku(activityTeamProductSkuReq.getProductSku())
-                .remainStock(activityTeamProductSkuReq.getRemainStock())
-                .teamStock(activityTeamProductSkuReq.getTeamStock())
-                .teamPrice(activityTeamProductSkuReq.getTeamPrice())
-                .build();
-    }
-}

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/ActivityTeamProductUpdModel.java

@@ -0,0 +1,40 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.req.ActivityTeamProductUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * 团购活动修改对象里的集合
+ */
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductUpdModel {
+    /**
+     * 批量修改商品规格
+     */
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuUpdModelList;
+    /**
+     * 批量删除商品规格
+     */
+    private List<Long> ids;
+    /**
+     * 批量添加商品规格
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+
+    public static ActivityTeamProductUpdModel teamProductBuilder(ActivityTeamProductUpdReq activityTeamProductUpdReq) {
+        return ActivityTeamProductUpdModel.builder()
+                .activityTeamProductSkuUpdModelList(activityTeamProductUpdReq.getActivityTeamProductSkuUpdModelList())
+                .ids(activityTeamProductUpdReq.getIds())
+                .activityTeamProductSkuAddModelList(activityTeamProductUpdReq.getActivityTeamProductSkuAddModelList())
+                .build();
+    }
+}

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

@@ -12,7 +12,7 @@ import java.math.RoundingMode;
 /**
  * 团购商品优惠力度模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-21 11:57
  */
 @Data

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

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 /**
  * 团购商品库存模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-21 14:04
  */
 @Data

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

@@ -0,0 +1,10 @@
+package com.muyu.marketing.domain.req;
+
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.Data;
+
+@Data
+public class ActivityTeamInfoReq extends ActivityTeamInfo {
+    private Integer pageNum=1;
+    private Integer pageSize=2;
+}

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

@@ -11,6 +11,9 @@ import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
+
+
+
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -72,4 +75,5 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
      * 策略ID
      */
     private Long strategyId;
+
 }

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

@@ -1,36 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-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 19:25
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoUpdReq {
-    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 ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
-}

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

@@ -1,28 +1,26 @@
-package com.muyu.marketing.domain.resp;
+package com.muyu.marketing.domain.req;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductUpdModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
-import java.util.List;
 
 @Data
 @SuperBuilder
-@NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
-public class ActivityTeamDetailResp extends BaseEntity {
+public class ActivityTeamProductReq {
-
     /**
-     * 团购ID
+     * 主键
      */
-    private Long teamId;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
     /**
      * 拼团名称
      */
@@ -30,7 +28,7 @@ public class ActivityTeamDetailResp extends BaseEntity {
     /**
      * 商品ID
      */
-    private Long productId;
+    private long productId;
     /**
      * 商品活动图
      */
@@ -42,26 +40,19 @@ public class ActivityTeamDetailResp extends BaseEntity {
     /**
      * 单位
      */
-
     private String unit;
     /**
      * 轮播图
      */
-
     private String imageList;
     /**
      * 活动结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date endTime;
     /**
      * 活动排序
      */
-    private Integer sort;
+    private Long sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
     /**
      * 活动详情
      */
@@ -78,4 +69,9 @@ public class ActivityTeamDetailResp extends BaseEntity {
      * 策略ID
      */
     private Long strategyId;
+    /**
+     * 规格对象
+     */
+    private ActivityTeamProductUpdReq activityTeamProductUpdReq;
+
 }

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

@@ -1,28 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: sku修改入参
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuReq {
-    private Long id;
-    private Long teamId;
-    private Long productId;
-    private String productSku;
-    private Long teamStock;
-    private Long remainStock;
-    private BigDecimal teamPrice;
-}

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/ActivityTeamProductUpdReq.java

@@ -0,0 +1,30 @@
+package com.muyu.marketing.domain.req;
+
+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.util.List;
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductUpdReq {
+    /**
+     * 批量修改商品规格
+     */
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuUpdModelList;
+    /**
+     * 批量删除商品规格
+     */
+    private List<Long> ids;
+    /**
+     * 批量添加商品规格
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+
+
+}

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

@@ -22,7 +22,6 @@ public class TeamInfoListReq extends PageDomain {
      */
     private String status;
 
-
     /**
      * 通过当前对象构建业务查询模型
      * @return 业务查询模型

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

@@ -1,33 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 添加的
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-public class TeamProjectSkuInfoUpdReq {
-
-    /**
-     * 规格SKU
-     */
-    private Long id;
-
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-}

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

@@ -0,0 +1,129 @@
+package com.muyu.marketing.domain.resp;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDatailModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 团购活动添加模型
+ *
+ * @author
+ * @date 2024-11-26 09:38
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoDatailResp {
+
+    /**
+     * 拼团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<ActivityTeamProductSkuResp> activityTeamProductSkuList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+    public static ActivityTeamInfoDatailResp findRespBuild (ActivityTeamInfoDatailResp activityTeamInfoDatailResp){
+        return ActivityTeamInfoDatailResp.builder()
+                .name(activityTeamInfoDatailResp.getName())
+                .productId(activityTeamInfoDatailResp.getProductId())
+                .productImage(activityTeamInfoDatailResp.getProductImage())
+                .introduction(activityTeamInfoDatailResp.getIntroduction())
+                .unit(activityTeamInfoDatailResp.getUnit())
+                .imageList(activityTeamInfoDatailResp.getImageList())
+                .endTime(activityTeamInfoDatailResp.getEndTime())
+                .sort(activityTeamInfoDatailResp.getSort())
+                .content(activityTeamInfoDatailResp.getContent())
+                .status(activityTeamInfoDatailResp.getStatus())
+                .strategyType(activityTeamInfoDatailResp.getStrategyType())
+                .strategyId(activityTeamInfoDatailResp.getStrategyId())
+                .activityTeamProductSkuList(
+                        activityTeamInfoDatailResp.getActivityTeamProductSkuList()
+                                .stream()
+                                .map(findResp -> ActivityTeamProductSkuResp.addReqBuild(findResp, activityTeamInfoDatailResp::getProductId))
+                                .toList()
+                ).build();
+    }
+
+    public static ActivityTeamInfoDatailResp datailRespBuilder(ActivityTeamInfoDatailModel datailModel,List<ActivityTeamProductSkuResp> activityTeamProductSkuResps ) {
+        return ActivityTeamInfoDatailResp.builder()
+                .id(datailModel.getId())
+                .name(datailModel.getName())
+                .productId(datailModel.getProductId())
+                .productImage(datailModel.getProductImage())
+                .introduction(datailModel.getIntroduction())
+                .unit(datailModel.getUnit())
+                .imageList(datailModel.getImageList())
+                .endTime(datailModel.getEndTime())
+                .sort(datailModel.getSort())
+                .status(datailModel.getStatus())
+                .content(datailModel.getContent())
+                .strategyType(datailModel.getStrategyType())
+                .strategyId(datailModel.getStrategyId())
+                .activityTeamProductSkuList(activityTeamProductSkuResps)
+                .build();
+
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.muyu.marketing.domain.resp;
+
+
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * 团购spu库存添加模型
+ *
+ * @author
+ * @date 2024-11-26 09:36
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuResp {
+
+    /**
+     * 规格Id
+     */
+    private Long id;
+    /**
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamProductSkuResp addReqBuild(ActivityTeamProductSkuResp activityTeamProductSkuResp, Supplier<Long> productId){
+        return ActivityTeamProductSkuResp.builder()
+                .productId(productId.get())
+                .sku(activityTeamProductSkuResp.getSku())
+                .teamStock(activityTeamProductSkuResp.getTeamStock())
+                .teamPrice(activityTeamProductSkuResp.getTeamPrice())
+                .build();
+    }
+
+
+    public static ActivityTeamProductSkuResp skuRespbuilder(ActivityTeamProductSkuModel activityTeamProductSkuModel) {
+        return ActivityTeamProductSkuResp.builder()
+                .id(activityTeamProductSkuModel.getId())
+                .productId(activityTeamProductSkuModel.getProductId())
+                .sku(activityTeamProductSkuModel.getSku())
+                .teamStock(activityTeamProductSkuModel.getTeamStock())
+                .teamStock(activityTeamProductSkuModel.getTeamStock())
+                .teamPrice(activityTeamProductSkuModel.getTeamPrice())
+                .build();
+    }
+}

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

@@ -1,38 +0,0 @@
-package com.muyu.marketing.domain.resp;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 添加的
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ActivityTeamProjectSkuResp {
-
-    /**
-     * 团购商品SKU的ID
-     */
-    private Long productSkuId;
-
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
-    /**
-     * 拼团价格
-     */
-    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-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java

@@ -1,15 +1,17 @@
 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.web.page.TableDataInfo;
+import com.muyu.marketing.domain.ActivityTeamInfo;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.req.ActivityTeamInfoReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
-import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
-import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,19 +55,33 @@ public class ActivityTeamController {
      * @param activityTeamInfoSaveReq 添加请求对象
      * @return 结果集
      */
-    @PostMapping
+    @PostMapping("/add")
     public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
     }
 
-    @PostMapping("/findById/{id}")
+    /**
-    public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
+     * 查询营销团购活动列表分页
-        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
+     * @param activityTeamInfo 添加请求对象
+     * @return 结果集
+     */
+    @PostMapping("/listTeam")
+    public Result listTeam(@RequestBody ActivityTeamInfoReq activityTeamInfo){
+        PageHelper.startPage(activityTeamInfo.getPageNum(),activityTeamInfo.getPageSize());
+        List<ActivityTeamInfo> list = activityTeamInfoService.list();
+        PageInfo<ActivityTeamInfo> activityTeamInfoPageInfo = new PageInfo<>(list);
+        return Result.success(activityTeamInfoPageInfo);
     }
-    @PutMapping("/updateByTeamId")
+
-    public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
+    /**
-        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
+     * 根据活动Id查询信息
-        return Result.success();
+     * @param
+     * @return 结果集
+     */
+    @GetMapping("/byId/{id}")
+    public Result<ActivityTeamInfoDatailResp> findById(@PathVariable Long id) {
+        ActivityTeamInfoDatailResp activityById = activityTeamInfoService.findActivityById(id);
+        return Result.success(activityById);
     }
 }

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

@@ -3,7 +3,12 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 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.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
+import com.muyu.marketing.domain.req.ActivityTeamProductReq;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp;
 
 public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
 
@@ -22,18 +27,15 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
 
     /**
-     * 根据ID查询商品的详情
+     * 活动商品详细信息
-     * @param id 团购活动ID
+     * @param id
-     * @return 团购详情
+     * @return
      */
-    ActivityTeamDetailModel findDetailById(Long id);
+    public ActivityTeamInfoDatailResp findActivityById(Long id);
 
     /**
-     * 修改团购活动信息
+     * 活动商品的修改
-     * @param activityTeamInfoUpdModel 团购活动信息
+     * @param activityTeamInfoModel
-     * @return 是否成功
      */
-    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
+    public void bateUpdate(ActivityTeamInfoModel activityTeamInfoModel);
-
-
 }

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

@@ -3,7 +3,6 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.core.enums.market.team.TeamOpenTypeEnum;
 import com.muyu.marketing.domain.ActivityTeamOpenInfo;
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 
 public interface ActivityTeamOpenInfoService extends IService<ActivityTeamOpenInfo> {
 
@@ -32,4 +31,5 @@ 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.TeamStrategyExemptionHundred;
 import com.muyu.marketing.domain.model.*;
 
 import java.util.List;
@@ -39,35 +40,24 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
     /**
-     * 通过拼团活动ID获取拼团下商品SKU集合
+     * 通过活动Id查询规格集合数据
-     * @param teamId 活动ID
-     * @return 拼团商品SKU集合
      */
-    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
+    public List<ActivityTeamProductSkuModel> findById(Long id);
-
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
 
     /**
-     * 根据 业务模型 进行 团购商品修改
+     * 根据 业务模型 对团购商品修改
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
      */
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
+    public boolean update(ActivityTeamProductSkuModel activityTeamProductSkuModel);
+
 
     /**
-     * 根据 业务模型 进行 团购商品批量修改
+     * 根据 业务模型 对商品批量修改
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
      */
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
+    public boolean bathUpdate(List<ActivityTeamProductSkuModel> activityTeamProductSkuModels);
 
     /**
-     * 一键设置
+     * 根据业务模型 对商品批量删除
-     * @param activityTeamProductSkuSettingModel 整体修改模型
      */
-    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
+    public void bathDelete(List<Long> id);
-        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

@@ -7,6 +7,8 @@ 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.model.*;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp;
+import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
@@ -15,6 +17,7 @@ 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;
 
 
@@ -79,30 +82,49 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
 
+
     /**
-     * 根据ID查询商品的详情
+     * 查询活动信息
-     * @param id 团购活动ID
+     * @param id
-     * @return 团购详情
+     * @return
      */
     @Override
-    public ActivityTeamDetailModel findDetailById(Long id) {
+    public ActivityTeamInfoDatailResp findActivityById(Long id) {
+        //查找根据活动Id规格信息
+        List<ActivityTeamProductSkuModel> teamInfoSkuListModelList = activityTeamProductSkuInfoService.findById(id);
         ActivityTeamInfo activityTeamInfo = this.getById(id);
-        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
+        ActivityTeamInfoDatailModel datailModel = ActivityTeamInfoDatailModel.DatailModel(activityTeamInfo, teamInfoSkuListModelList);
-        return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
+        List<ActivityTeamProductSkuModel> activityTeamProductSkuList = datailModel.getActivityTeamProductSkuList();
-                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
+        List<ActivityTeamProductSkuResp> activityTeamProductSkuResps = new ArrayList<>();
-        );
+        activityTeamProductSkuList.stream().map(ActivityTeamInfoSkuListModel->{
+            return activityTeamProductSkuResps.add(ActivityTeamProductSkuResp.skuRespbuilder(ActivityTeamInfoSkuListModel));
+        }).toList();
+        return ActivityTeamInfoDatailResp.datailRespBuilder(datailModel,activityTeamProductSkuResps);
     }
 
     /**
-     * 修改团购活动信息
+     * 商品信息修改
-     * @param activityTeamInfoUpdModel 团购活动信息
+     * @param
-     * @return 是否成功
      */
     @Override
-    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+    public void bateUpdate(ActivityTeamInfoModel activityTeamInfoModel) {
-        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
+        //添加
-        Assert.isTrue(update,"修改失败");
+        List<ActivityTeamProductSkuAddModel> teamProductSkuAddModelList = activityTeamInfoModel.getActivityTeamProductUpdModel().getActivityTeamProductSkuAddModelList();
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
+
-        return update;
+        //根据 Sku的Id删除
+        activityTeamOpenInfoService.removeBatchByIds(activityTeamInfoModel.getActivityTeamProductUpdModel().getIds());
+
+        teamProductSkuAddModelList.forEach(
+                activityTeamProductSkuAddModel -> {
+                    activityTeamProductSkuAddModel.setTeamId(activityTeamInfoModel.getId());
+                }
+        );
+
+        activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
+
+        //活动修改
+        this.updateById(ActivityTeamInfo.addTeamInfoModelBuild(activityTeamInfoModel));
+        activityTeamProductSkuInfoService.bathUpdate(activityTeamInfoModel.getActivityTeamProductUpdModel().getActivityTeamProductSkuUpdModelList());
+
     }
 }

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

@@ -4,6 +4,7 @@ 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.model.*;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
@@ -12,7 +13,6 @@ import com.muyu.product.cache.ProjectSkuCache;
 import com.muyu.product.domain.ProjectSkuInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -82,57 +82,62 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
     }
 
     /**
-     * 通过拼团活动ID获取拼团下商品SKU集合
+     * 通过活动Id查询规格集合数据
      *
-     * @param teamId 活动ID
+     * @param id
-     * @return 拼团商品SKU集合
      */
     @Override
-    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
+    public List<ActivityTeamProductSkuModel> findById(Long id) {
-        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<ActivityTeamProductSkuInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
+        lambdaQueryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,id);
-        List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
+        List<ActivityTeamProductSkuInfo> list = this.list(lambdaQueryWrapper);
-        return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
-//        return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
-    }
 
-    @Transactional
+        List<ActivityTeamProductSkuModel> teamInfoSkuListModelList = list.stream().map(ActivityTeamProductSkuInfo -> {
-    @Override
+            ActivityTeamProductSkuModel activityTeamInfoSkuListModel = ActivityTeamInfoSkuListModel.skuByIdModel(ActivityTeamProductSkuInfo);
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
+            return activityTeamInfoSkuListModel;
-        return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
+        }).toList();
+
+        return teamInfoSkuListModelList;
     }
 
     /**
-     * 根据 业务模型 进行 团购商品修改
+     * 根据 业务模型 对团购商品修改
-     *
+     * @param activityTeamProductSkuUpdModel
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
      */
     @Override
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) {
+    public boolean update(ActivityTeamProductSkuModel activityTeamProductSkuUpdModel) {
-        // update set  where
+
         LambdaUpdateWrapper<ActivityTeamProductSkuInfo> updateWrapper = new LambdaUpdateWrapper<>();
-        // 字段=值
         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
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
      */
     @Override
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
+    public boolean bathUpdate(List<ActivityTeamProductSkuModel> activityTeamProductSkuUpdModelList) {
-        return this.updateBatchById(
+        List<ActivityTeamProductSkuInfo> teamProductSkuInfoList = activityTeamProductSkuUpdModelList
-                activityTeamProductSkuUpdModelList.stream()
+                .stream()
-                        .map(ActivityTeamProductSkuInfo::updModelBuild)
+                .map(ActivityTeamProductSkuInfo::skuUpdModel)
-                        .toList()
+                .toList();
-        );
+        return this.updateBatchById(teamProductSkuInfoList);
     }
+
+    /**
+     * 根据业务模型 批量删除商品规格
+     * @param id
+     */
+    @Override
+    public void bathDelete(List<Long> id) {
+        this.bathDelete(id);
+    }
+
+
+
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.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.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,13 @@
+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,10 @@ 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
-@Service("team-strategy-exemption")
 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/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/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java

@@ -1,85 +0,0 @@
-package com.muyu.marketing.team.strategy.impl;
-
-
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-
-/**
- * 团购执行器
- *
- * @author DongZeLiang
- * @date 2024-11-29 15:28
- */
-@Service
-@Primary
-public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
-    /**
-     * 开团
-     *
-     * @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");
-        }else if (activityTeamId == 0) {
-            activityTeamType = "team-strategy-exemption";
-        }else if (activityTeamId == 1) {
-            activityTeamType = "team-strategy-hundred";
-        }else if (activityTeamId == 2) {
-            activityTeamType = "team-strategy-ordinary";
-        }
-        ActivityTeamStrategy 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) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @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/resources/bootstrap.yml

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-buy
+    name: muyu-marketing
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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/TemplateAttributeModel.java

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

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

@@ -0,0 +1,73 @@
+package com.muyu.product.domain.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ProjectInfoListResp {
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 商品名称 */
+    @ApiModelProperty(name = "商品名称", value = "商品名称")
+    private String name;
+
+    /** 商品描述 */
+    @ApiModelProperty(name = "商品描述", value = "商品描述")
+    private String introduction;
+
+    /** 主类型 */
+    @ApiModelProperty(name = "主类型", value = "主类型")
+    private Long mianType;
+
+    /** 父类型 */
+    @ApiModelProperty(name = "父类型", value = "父类型")
+    private Long parentType;
+
+    /** 商品类型 */
+    @ApiModelProperty(name = "商品类型", value = "商品类型")
+    private Long type;
+
+    /** 商品图片 */
+    @ApiModelProperty(name = "商品图片", value = "商品图片")
+    private String image;
+
+    /** 商品轮播图 */
+    @ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
+    private String carouselImages;
+
+    /** 商品状态 */
+    @ApiModelProperty(name = "商品状态", value = "商品状态")
+    private String status;
+
+    /** 规格 */
+    @ApiModelProperty(name = "规格", value = "规格")
+    private Long ruleId;
+
+    /** 品牌 */
+    @ApiModelProperty(name = "品牌", value = "品牌")
+    private Long brandId;
+
+
+    /** 主类型名称 */
+    private String mianTypeName;
+    /** 父类型名称 */
+    private String parentTypeName;
+    /** 商品类型名称 */
+    private String typeName;
+    /** 规格名称 */
+    private String ruleName;
+    /** 品牌名称 */
+    private String brandName;
+}

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,15 @@ public class CommentInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(commentInfoService.removeBatchByIds(ids));
     }
+
+    /**
+     * 商品评论查询
+     */
+    @GetMapping("/commentId/{projectId}")
+    public Result commentInfoList(@PathVariable("projectId") Long id){
+        LambdaQueryWrapper<CommentInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CommentInfo::getParentId,id);
+        List<CommentInfo> list = commentInfoService.list(lambdaQueryWrapper);
+        return Result.success(list);
+    }
 }

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.product.cache.ProjectInfoCache;
 import com.muyu.product.domain.resp.ProjectDetailResp;
+import com.muyu.product.domain.resp.ProjectInfoListResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,12 +48,21 @@ public class ProjectInfoController extends BaseController {
     /**
      * 查询商品信息列表
      */
+//    @ApiOperation("获取商品信息列表")
+//    @RequiresPermissions("product:info:list")
+//    @GetMapping("/list")
+//    public Result<TableDataInfo<ProjectInfo>> list(ProjectInfoQueryReq projectInfoQueryReq) {
+//        startPage();
+//        List<ProjectInfo> list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq));
+//        return getDataTable(list);
+//    }
+
     @ApiOperation("获取商品信息列表")
     @RequiresPermissions("product:info:list")
     @GetMapping("/list")
-    public Result<TableDataInfo<ProjectInfo>> list(ProjectInfoQueryReq projectInfoQueryReq) {
+    public Result<TableDataInfo<ProjectInfoListResp>> list(ProjectInfoQueryReq projectInfoQueryReq) {
         startPage();
-        List<ProjectInfo> list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq));
+        List<ProjectInfoListResp> list = projectInfoService.ProjectInfoList(ProjectInfo.queryBuild(projectInfoQueryReq));
         return getDataTable(list);
     }
 

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

@@ -5,6 +5,7 @@ import com.muyu.product.domain.ProjectInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.product.domain.req.ProjectInfoSaveReq;
 import com.muyu.product.domain.resp.ProjectDetailResp;
+import com.muyu.product.domain.resp.ProjectInfoListResp;
 
 /**
  * 商品信息Service接口
@@ -34,4 +35,6 @@ public interface ProjectInfoService extends IService<ProjectInfo> {
      * @return 商品详情
      */
     ProjectDetailResp getDetailInfo (Long id);
+
+    List<ProjectInfoListResp> ProjectInfoList(ProjectInfo projectInfo);
 }

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

@@ -57,6 +57,8 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
 
     @Autowired
     private AttributeGroupService attributeGroupService;
+    @Autowired
+    private AsProductAttributeInfoService asProductAttributeInfoService;
 
     /**
      * 查询品类信息列表
@@ -371,6 +373,22 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
         attributeInfoLambdaQueryWrapper.notIn(!attributeIdSet.isEmpty(), AttributeInfo::getId, attributeIdSet);
         attributeModelList = attributeInfoService.list(attributeInfoLambdaQueryWrapper).stream().map(AttributeInfo::buildTemplateModel).toList();
 
+
+        attributeGroupModelList.forEach(TemplateAttributeGroupModel->{
+            TemplateAttributeGroupModel.getAttributeList().forEach(TemplateAttributeModel->{
+                Long id = TemplateAttributeModel.getId();
+                LambdaQueryWrapper<AsProductAttributeInfo> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(AsProductAttributeInfo::getAttributeId,id);
+                List<AsProductAttributeInfo> list = this.asProductAttributeInfoService.list(queryWrapper);
+
+                list.forEach(AsProductAttributeInfo->{
+                    TemplateAttributeModel.setValue(AsProductAttributeInfo.getValue());
+                });
+            });
+        });
+
+
+
         return CategoryCommonElementResp.builder()
                 .templateAttributeGroupList(attributeGroupModelList)
                 .templateAttributeList(templateAttributeModelList)

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

@@ -2,6 +2,7 @@ package com.muyu.product.service.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 
 import com.muyu.common.core.utils.ObjUtils;
@@ -11,6 +12,8 @@ import com.muyu.product.domain.model.*;
 import com.muyu.product.domain.req.ProjectInfoSaveReq;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
 import com.muyu.product.domain.resp.ProjectDetailResp;
+import com.muyu.product.domain.resp.ProjectInfoListResp;
+import com.muyu.product.mapper.RuleInfoMapper;
 import com.muyu.product.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +50,8 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
 
     @Autowired
     private AttributeInfoService attributeInfoService;
-
+    @Autowired
+    private RuleInfoMapper ruleInfoMapper;
     /**
      * 查询商品信息列表
      *
@@ -229,4 +233,37 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
                 .attributeGroupList(templateAttributeGroupList)
                 .build();
     }
+
+    @Override
+    public List<ProjectInfoListResp> ProjectInfoList(ProjectInfo projectInfo) {
+        List<ProjectInfo> list = list(projectInfo);
+        LinkedList<ProjectInfoListResp> objects = new LinkedList<>();
+        list.forEach(s -> {
+            CategoryInfo mianTypeName = categoryInfoService.getById(s.getMianType());
+            CategoryInfo parentTypeName = categoryInfoService.getById(s.getParentType());
+            CategoryInfo typeName = s.getType() != null ? categoryInfoService.getById(s.getType()) : null;
+
+            RuleInfo ruleName = ruleInfoMapper.selectById(s.getRuleId());
+
+            BrandInfo brandName = brandInfoService.getById(s.getBrandId());
+
+            ProjectInfoListResp build = ProjectInfoListResp.builder()
+                    .id(s.getId())
+                    .name(s.getName())
+                    .introduction(s.getIntroduction())
+                    .mianType(s.getMianType())
+                    .parentType(s.getParentType())
+                    .type(s.getType()).image(s.getImage())
+                    .carouselImages(s.getCarouselImages())
+                    .status(s.getStatus())
+                    .mianTypeName(mianTypeName != null ? mianTypeName.getName() : "")
+                    .parentTypeName(parentTypeName != null ? parentTypeName.getName() : "")
+                    .typeName(typeName != null ? typeName.getName() : "")
+                    .ruleName(ruleName != null ? ruleName.getName() : "")
+                    .brandName(brandName != null ? brandName.getNam() : "")
+                    .build();
+            objects.add(build);
+        });
+        return objects;
+    }
 }

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml

@@ -16,10 +16,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 22cbf23e-e2e3-489f-bb75-db2fb40c4af0
         # 配置文件格式
         file-extension: yml
         # 共享配置