fix()：团购策略

doc/参团开团数据.java

@@ -1,32 +0,0 @@
-参团:
-        商品列表
-            商品列表接口
-        选择商品
-              商品详情接口
-        一键参团
-               添加数据,修改库存接口
-        前端数据回显
-                回显接口
-         生成订单
-
-         通过时间统计订单 判断是否成功
-
-
-
-拼团商品详情
-        商品详情接口
-        评价接口
-        统计接口
-
-
-
-
-
-
-
-
-
-
-
-
-

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

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

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

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

@@ -0,0 +1,32 @@
+{
+    "活动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/resources/bootstrap.yml

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

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

@@ -1,58 +0,0 @@
-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,12 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 124.221.130.240:8848
-        namespace: cloud-wang
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 124.221.130.240:8848
-        namespace: cloud-wang
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -35,8 +33,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 124.221.130.240:8848
-            namespace: cloud-wang
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

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

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

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

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

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

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

@@ -7,7 +7,6 @@ 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.ActivityTeamInfoUpdModel;
-import com.muyu.marketing.domain.model.ActivityUpdTeamModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -130,22 +129,4 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoUpdModel.getStrategyId())
             .build();
   }
-  public static ActivityTeamInfo  activityUpdTeamModel (ActivityUpdTeamModel activityTeamInfo){
-    return ActivityTeamInfo.builder()
-            .id(activityTeamInfo.getId())
-            .productId(activityTeamInfo.getProductId())
-            .name(activityTeamInfo.getName())
-            .productImage(activityTeamInfo.getProductImage())
-            .introduction(activityTeamInfo.getIntroduction())
-            .unit(activityTeamInfo.getUnit())
-            .imageList(activityTeamInfo.getImageList())
-            .createTime(activityTeamInfo.getCreateTime())
-            .strategyType(activityTeamInfo.getStrategyType())
-            .content(activityTeamInfo.getContent())
-            .build();
-  }
-
-
-
-
 }

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -74,4 +76,13 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .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/TeamStrategyHundred.java

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

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

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

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

@@ -7,7 +7,6 @@ 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;
@@ -78,18 +77,12 @@ public class ActivityTeamDetailModel {
      * 策略类型
      */
     private String strategyType;
-
-    private BigDecimal productPrice;
-    /**
-     * 剩余库存
-     */
-    private Long remainStock;
     /**
      * 策略ID
      */
     private Long strategyId;
     public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
-                                                           Function<ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
+                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
         return function.apply(ActivityTeamDetailModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())

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

@@ -71,7 +71,7 @@ public class ActivityTeamInfoListModel {
     private Long teamStock;
 
 
-    public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModelBuilder, ActivityTeamInfoListModel> function) {
+    public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModel.ActivityTeamInfoListModelBuilder, ActivityTeamInfoListModel> function) {
         ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())

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

@@ -1,11 +1,15 @@
 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;
 
@@ -33,7 +37,7 @@ public class ActivityTeamInfoUpdModel {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;
+    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
 
     public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
         return ActivityTeamInfoUpdModel.builder()
@@ -50,7 +54,12 @@ public class ActivityTeamInfoUpdModel {
                 .status(activityTeamInfoUpdReq.getStatus())
                 .strategyType(activityTeamInfoUpdReq.getStrategyType())
                 .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
+                .activityTeamProductSkuSettingModel(
+                        ActivityTeamProductSkuSettingModel.settingReqModel(
+                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
+                                activityTeamInfoUpdReq::getProductId
+                        )
+                )
                 .build();
     }
 }

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

@@ -0,0 +1,59 @@
+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,6 +1,7 @@
 package com.muyu.marketing.domain.model;
 
 
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -34,4 +35,12 @@ public class ActivityTeamProductSkuUpdModel {
      * 团购库存
      */
     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/req/ActivityTeamInfoUpdReq.java

@@ -32,5 +32,5 @@ public class ActivityTeamInfoUpdReq {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
+    private ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
 }

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

@@ -0,0 +1,37 @@
+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/TeamProjectSkuInfoUpdReq.java

@@ -0,0 +1,33 @@
+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/TeamInfoFindByIdResp.java

@@ -2,13 +2,12 @@ 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.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -53,12 +52,6 @@ public class TeamInfoFindByIdResp {
      */
 
     private String imageList;
-
- private BigDecimal productPrice;
- /**
-  * 剩余库存
-  */
- private Long remainStock;
     /**
      * 活动结束时间
      */
@@ -84,9 +77,6 @@ public class TeamInfoFindByIdResp {
      * 策略类型
      */
     private String strategyType;
-
-
-
     /**
      * 策略ID
      */
@@ -112,8 +102,6 @@ public class TeamInfoFindByIdResp {
               .status(activityTeamDetailModel.getStatus())
               .strategyType(activityTeamDetailModel.getStrategyType())
               .strategyId(activityTeamDetailModel.getStrategyId())
-             .remainStock(activityTeamDetailModel.getRemainStock())
-             .productPrice(activityTeamDetailModel.getProductPrice())
               .build();
  }
 }

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

@@ -1,27 +1,35 @@
 package com.muyu.marketing.team.controller;
+
+
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
-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.ActivityTeamInfoUpdModel;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
-import com.muyu.marketing.domain.req.ActivityTeamUpdProductUpdReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
 import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
+
 /**
  * 营销团购活动控制层
+ *
  * @author DongZeLiang
  * @date 2024-11-20 14:25
  */
 @RestController
 @RequestMapping("/team")
 public class ActivityTeamController {
+
     @Autowired
     private ActivityTeamInfoService activityTeamInfoService;;
+
     /**
      * 查询营销团购活动列表
      * @param teamInfoListReq 活动查询入参
@@ -38,6 +46,8 @@ public class ActivityTeamController {
                 }}
         );
     }
+
+
     /**
      * 添加团购活动
      * @param activityTeamInfoSaveReq 添加请求对象
@@ -48,6 +58,7 @@ public class ActivityTeamController {
         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)));
@@ -57,13 +68,4 @@ public class ActivityTeamController {
         activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
         return Result.success();
     }
-    @PostMapping("/updActivityTeamInfo")
-    public Result updActivityTeamInfo (@RequestBody ActivityTeamUpdProductUpdReq activityTeamUpdProductUpdReq){
-     boolean a= activityTeamInfoService.updproduct(ActivityUpdTeamModel.update(activityTeamUpdProductUpdReq));
-        if(a){
-           return Result.success("删除成功");
-        }else{
-            return Result.error("删除失败");
-        }
-    }
 }

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+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/satery/ActivityTeamStratey.java

@@ -1,10 +0,0 @@
-package com.muyu.marketing.team.satery;
-
-public interface ActivityTeamStratey {
-    public  void openTeam(Long activityTeamId);
-    public void ApplyTeam(Long activityTeamId);
-    public void addTeam(Long teamId,Long number);
-    public void backTeam(Long teamId);
-    public  void settle(Long team);
-
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/satery/impl/ActivityTeamStrateyImpl.java

@@ -1,7 +0,0 @@
-package com.muyu.marketing.team.satery.impl;
-
-public class ActivityTeamStrateyImpl {
-
-
-
-}

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

@@ -36,5 +36,4 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
 
-    boolean updproduct(ActivityUpdTeamModel update);
 }

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

@@ -1,8 +1,10 @@
 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> {
 
     /**

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

@@ -3,7 +3,6 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import com.muyu.marketing.domain.model.*;
 
 import java.util.List;
@@ -48,12 +47,27 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
 
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
 
-    public boolean updtoBath(List<ActivityTeamUpdModel> activityTeamUpdModels);
-
-    public boolean addBath(List<ActivityTeamAddModel> activityTeamAddModels);
-
-    public  boolean delBath(List<Long> ids);
-
+    /**
+     * 根据 业务模型 进行 团购商品修改
+     * @param activityTeamProductSkuUpdModel 修改业务模型
+     * @return 修改结果
+     */
+    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
 
+    /**
+     * 根据 业务模型 进行 团购商品批量修改
+     * @param activityTeamProductSkuUpdModelList 修改业务模型
+     * @return 修改结果
+     */
+    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
 
+    /**
+     * 一键设置
+     * @param activityTeamProductSkuSettingModel 整体修改模型
+     */
+    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
+        this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
+        this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
+        this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
+    }
 }

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

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.*;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
@@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -29,8 +27,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
 
     @Autowired
     private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
-    @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;
 
     @Override
     public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) {
@@ -45,7 +41,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
          */
         Page<ActivityTeamInfo> activityTeamInfoPage = this.page(activityTeamInfoListQueryModel.buildPage(), queryWrapper);
         List<ActivityTeamInfo> activityTeamInfoList = activityTeamInfoPage.getRecords();
-
         List<ActivityTeamInfoListModel> activityTeamInfoListModels = activityTeamInfoList.stream()
                 .map(activityTeamInfo -> ActivityTeamInfoListModel.infoBuild(activityTeamInfo,
                         (activityTeamInfoListModelBuilder) -> {
@@ -106,22 +101,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     @Override
     public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
         boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
-        io.jsonwebtoken.lang.Assert.isTrue(update,"修改失败");
-
-        activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
+        Assert.isTrue(update,"修改失败");
+        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
         return update;
     }
-
-    @Override
-    public boolean updproduct(ActivityUpdTeamModel update) {
-        boolean b = this.updateById(ActivityTeamInfo.activityUpdTeamModel(update));
-        io.jsonwebtoken.lang.Assert.isTrue(b,"修改失败");
-        List<ActivityTeamUpdModel> activityTeamUpdModels = update.getActivityTeamUpdModels();
-        List<ActivityTeamAddModel> activityTeamAddModels = update.getActivityTeamAddModels();
-        List<Long> ids = update.getIds();
-        activityTeamProductSkuInfoService.updtoBath(activityTeamUpdModels);
-        activityTeamProductSkuInfoService.addBath(activityTeamAddModels);
-        activityTeamProductSkuInfoService.delBath(ids);
-return b;
-    }
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ActivityTeamOpenInfoServiceImpl extends ServiceImpl<ActivityTeamOpenInfoMapper, ActivityTeamOpenInfo>
     implements ActivityTeamOpenInfoService {
+
     /**
      * 通过活动ID和开团类型查询开团数量
      *

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

@@ -1,6 +1,7 @@
 package com.muyu.marketing.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
@@ -27,8 +28,6 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
     @Autowired
     private ProjectSkuCache projectSkuCache;
 
-
-
     /**
      * 通过团购活动ID获取团购中最优惠的价格
      *
@@ -51,6 +50,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         }
         return discountPriceModelOptional.get();
     }
+
     /**
      * 通过活动ID获取 剩余库存
      *
@@ -102,42 +102,37 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
     }
 
-
+    /**
+     * 根据 业务模型 进行 团购商品修改
+     *
+     * @param activityTeamProductSkuUpdModel 修改业务模型
+     * @return 修改结果
+     */
     @Override
-    public boolean updtoBath(List<ActivityTeamUpdModel> activityTeamUpdModels) {
-        List<ActivityTeamProductSkuInfo> list = activityTeamUpdModels.stream().map(activityTeamUpdModel -> {
-            ActivityTeamProductSkuInfo build = ActivityTeamProductSkuInfo.builder()
-                    .id(activityTeamUpdModel.getId())
-                    .teamPrice(activityTeamUpdModel.getTeamPrice())
-                    .teamStock(activityTeamUpdModel.getTeamStock())
-                    .remainStock(activityTeamUpdModel.getTeamStock())
-                    .build();
-            return build;
-        }).toList();
-        return this.updateBatchById(list);
-
+    public boolean update(ActivityTeamProductSkuUpdModel 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 修改业务模型
+     * @return 修改结果
+     */
     @Override
-    public boolean addBath(List<ActivityTeamAddModel> activityTeamAddModels) {
-        List<ActivityTeamProductSkuInfo> list = activityTeamAddModels.stream().map(activityTeamAddModel -> {
-            ActivityTeamProductSkuInfo build = ActivityTeamProductSkuInfo.builder()
-                    .productSku(activityTeamAddModel.getProduckSku())
-                    .teamPrice(activityTeamAddModel.getTeamPrice())
-                    .teamStock(activityTeamAddModel.getTeamStock())
-                    .build();
-
-            return build;
-        }).toList();
-
-       return this.saveBatch(list);
+    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
+        return this.updateBatchById(
+                activityTeamProductSkuUpdModelList.stream()
+                        .map(ActivityTeamProductSkuInfo::updModelBuild)
+                        .toList()
+        );
     }
-
-    @Override
-    public boolean delBath(List<Long> ids) {
-        boolean b = this.removeBatchByIds(ids);
-        return b;
-
-    }
-
 }

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

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

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

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

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

@@ -4,10 +4,62 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.marketing.domain.TeamStrategyExemption;
 import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
 import com.muyu.marketing.team.service.TeamStrategyExemptionService;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
-@Service
+@Log4j2
+@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

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

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

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

@@ -0,0 +1,85 @@
+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,9 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-activity
-  main:
-    allow-circular-references: true
+    name: muyu-buy
   profiles:
     # 环境配置
     active: dev
@@ -16,12 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 124.221.130.240:8848
-        namespace: cloud-wang
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 124.221.130.240:8848
-        namespace: cloud-wang
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -0,0 +1,28 @@
+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-server/src/main/java/com/muyu/product/controller/CommentInfoController.java

@@ -86,11 +86,6 @@ import com.muyu.common.core.web.page.TableDataInfo;
         return toAjax(commentInfoService.save(CommentInfo.saveBuild(commentInfoSaveReq)));
     }
 
-    @PostMapping("/tocomment/{id}")
-    public    Result<List<CommentInfo>> commentInfoResult(@PathVariable Long id){
-        return  Result.success(commentInfoService.commentInfoId(id));
-    }
-
     /**
      * 修改商品评论
      */

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

@@ -19,5 +19,4 @@ public interface CommentInfoService extends IService<CommentInfo> {
      */
     public List<CommentInfo> list(CommentInfo commentInfo);
 
-    List<CommentInfo> commentInfoId(Long id);
 }

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

@@ -54,13 +54,4 @@ public class CommentInfoServiceImpl extends ServiceImpl<CommentInfoMapper, Comme
 
         return list(queryWrapper);
     }
-
-    @Override
-    public List<CommentInfo> commentInfoId(Long id) {
-        LambdaQueryWrapper<CommentInfo> commentInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        commentInfoLambdaQueryWrapper.eq(CommentInfo::getProjectId,id);
-        List<CommentInfo> list = this.list(commentInfoLambdaQueryWrapper);
-        return list;
-
-    }
 }

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

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

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

@@ -16,12 +16,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 124.221.130.240:8848
-        namespace: cloud-wang
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 124.221.130.240:8848
-        namespace: cloud-wang
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

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