feat: 拼团活动修改

doc/修改数据结构.java

@@ -0,0 +1,27 @@
+$.{
+        "活动ID":"Long",
+        "商品ID": "Long", //activity_team_info.product_id
+        "商品图片": "String",
+        "活动名称": "String",
+        "活动简介": "String",
+        "商品单位": "String",
+        "活动状态":"Long",
+        "商品的轮播图": [
+          "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",
+              "剩余库存":"Long",
+              "拼团价格":"BigDecimal",
+          }
+        ],
+        "排序": "Integer",
+        "详情": "String"
+}

doc/数据结构.java

@@ -0,0 +1,18 @@
+{
+     id:"Long",  //活动ID
+     name:"String", //活动名字
+     productId:"Long",  //商品ID
+     productImage:"String",  //商品活动图
+     introduction:"String",  //活动简介
+     unit:"String",  //单位
+     imageList:"String",  //轮播图
+     endTime:"Date",   //结束时间
+     sort:"Integer",  //活动排序
+     content:"String",  //活动详情
+     status:"String",    //活动状态
+     strategyType:"String",   //策略类型
+     strategyId:"Long",   //策略ID
+
+     List<拼团活动规格>:List //拼团活动规格集合
+
+}

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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         file-extension: yml
         # 共享配置

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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +35,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 124.71.140.64:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         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
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -93,4 +93,22 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
+
+  public static ActivityTeamInfo updModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id){
+    return ActivityTeamInfo.builder()
+            .id(id)
+            .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/ActivityTeamProductSkuInfo.java

@@ -1,6 +1,7 @@
 package com.muyu.marketing.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
@@ -26,6 +27,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
   /**
    * 活动ID
    */
+  @TableField(value = "team_id")
   private long teamId;
   /**
    * 商品ID
@@ -60,6 +62,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
             .remainStock(activityTeamProductSkuAddModel.getTeamStock())
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
-            .build()
+            .build();
   }
 }

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

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

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

@@ -0,0 +1,108 @@
+package com.muyu.marketing.domain.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 拼团活动响应模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoModel {
+
+    /**
+     * 主键
+     */
+    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 List<ActivityTeamProductSkuInfoModel> activityTeamProductSkuInfoModelList;
+
+
+    /**
+     * 拼团活动响应模型转换
+     * @param activityTeamInfo
+     * @param activityTeamProductSkuInfoModelList
+     * @return
+     */
+    public static ActivityTeamInfoModel ActivityTeamInfoModelBuilder(ActivityTeamInfo activityTeamInfo,  List<ActivityTeamProductSkuInfoModel> activityTeamProductSkuInfoModelList){
+       return ActivityTeamInfoModel.builder()
+               .id(activityTeamInfo.getId())
+               .name(activityTeamInfo.getName())
+               .productId(activityTeamInfo.getProductId())
+               .productImage(activityTeamInfo.getProductImage())
+               .introduction(activityTeamInfo.getIntroduction())
+               .unit(activityTeamInfo.getUnit())
+               .imageList(activityTeamInfo.getImageList())
+               .endTime(activityTeamInfo.getEndTime())
+               .sort(activityTeamInfo.getSort())
+               .content(activityTeamInfo.getContent())
+               .status(activityTeamInfo.getStatus())
+               .strategyType(activityTeamInfo.getStrategyType())
+               .strategyId(activityTeamInfo.getStrategyId())
+               .activityTeamProductSkuInfoModelList(activityTeamProductSkuInfoModelList)
+               .build();
+    }
+
+
+}

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

@@ -0,0 +1,73 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoUpdModel {
+    /**
+     * 主键
+     */
+    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 ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuInfoUpdModel;
+
+}

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

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

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

@@ -0,0 +1,17 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuInfoUpdModel {
+
+
+}

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

@@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel {
      * @return 优惠力度
      */
     public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) {
-        TeamProductDiscountPriceModel.builder()
+        return TeamProductDiscountPriceModel.builder()
                 .productPrice(productPrice)
                 .teamPrice(teamPrice)
                 .discount(

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

@@ -3,9 +3,10 @@ package com.muyu.marketing.domain.req;
 import com.muyu.common.core.web.page.PageDomain;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -0,0 +1,102 @@
+package com.muyu.marketing.domain.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 拼团活动回显
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamInfoResponse {
+    /**
+     * 主键
+     */
+    private long id;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 轮播图
+     */
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProductSkuInfoResponse> teamProjectSkuInfoAddReqList;
+
+
+
+
+    public static ActivityTeamInfoResponse ActivityTeamInfoResponseBulider(ActivityTeamInfoModel activityTeamInfoModel, ArrayList<ActivityTeamProductSkuInfoResponse> activityTeamProductSkuInfoResponses){
+       return ActivityTeamInfoResponse.builder()
+                .id(activityTeamInfoModel.getId())
+                .name(activityTeamInfoModel.getName())
+                .productId(activityTeamInfoModel.getProductId())
+                .productImage(activityTeamInfoModel.getProductImage())
+                .introduction(activityTeamInfoModel.getIntroduction())
+                .unit(activityTeamInfoModel.getUnit())
+                .imageList(activityTeamInfoModel.getImageList())
+                .endTime((activityTeamInfoModel.getEndTime()))
+                .sort((int) activityTeamInfoModel.getSort())
+                .status(activityTeamInfoModel.getStatus())
+                .content(activityTeamInfoModel.getContent())
+                .strategyType(activityTeamInfoModel.getStrategyType())
+                .strategyId(activityTeamInfoModel.getStrategyId())
+                .teamProjectSkuInfoAddReqList(activityTeamProductSkuInfoResponses)
+                .build();
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.muyu.marketing.domain.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 拼团活动规格回显
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductSkuInfoResponse {
+    /**
+     * 主键
+     */
+    private long id;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品SKU
+     */
+    private String productSku;
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+    /**
+     * 剩余库存
+     */
+    private Long remainStock;
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+
+    public static ActivityTeamProductSkuInfoResponse ActivityTeamProductSkuInfoResponseBulider(ActivityTeamProductSkuInfoModel activityTeamProductSkuInfoModel){
+        return ActivityTeamProductSkuInfoResponse.builder()
+                .id(activityTeamProductSkuInfoModel.getId())
+                .productId(activityTeamProductSkuInfoModel.getProductId())
+                .productSku(activityTeamProductSkuInfoModel.getProductSku())
+                .teamStock(activityTeamProductSkuInfoModel.getTeamStock())
+                .remainStock(activityTeamProductSkuInfoModel.getRemainStock())
+                .teamPrice(activityTeamProductSkuInfoModel.getTeamPrice())
+                .build();
+
+    }
+
+}

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

@@ -1,19 +1,19 @@
 package com.muyu.marketing.team.controller;
 
 
+import com.dtflys.forest.annotation.Get;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse;
 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.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -58,4 +58,15 @@ public class ActivityTeamController {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
     }
+
+    /**
+     * 拼团活动回显
+     * @param id
+     * @return
+     */
+    @GetMapping("/Echo/{id}")
+    public Result echo(@PathVariable Long id){
+        ActivityTeamInfoResponse activityTeamInfoResponse = activityTeamInfoService.activityTeamInfoModel(id);
+        return Result.success(activityTeamInfoResponse);
+    }
 }

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

@@ -6,6 +6,8 @@ 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.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse;
 
 import java.util.List;
 
@@ -24,4 +26,21 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+
+
+    /**
+     * 通过id返回拼团活动信息
+     * @param id
+     * @return
+     */
+    public ActivityTeamInfoResponse activityTeamInfoModel(Long id);
+
+    /**
+     * 修改拼团活动
+     */
+    public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id);
+
+
+
+
 }

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

@@ -5,6 +5,7 @@ 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.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
 import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
 import com.muyu.marketing.domain.model.TeamProductStockModel;
 
@@ -41,4 +42,12 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
+
+    /**
+     * 通过活动teamId查询活动规格信息
+     * @param teamId
+     * @return
+     */
+    public List<ActivityTeamProductSkuInfoModel> ActivityTeamProductSkuInfoModelList(Long teamId);
+
 }

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

@@ -9,10 +9,13 @@ 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.ActivityTeamInfoResponse;
+import com.muyu.marketing.domain.resp.ActivityTeamProductSkuInfoResponse;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -32,6 +35,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     @Autowired
     private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
+
     @Override
     public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) {
 
@@ -82,4 +86,28 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
         this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
+
+    @Override
+    public ActivityTeamInfoResponse activityTeamInfoModel(Long id) {
+        List<ActivityTeamProductSkuInfoModel> activityTeamProductSkuInfoModelList = activityTeamProductSkuInfoService.ActivityTeamProductSkuInfoModelList(id);
+
+        ActivityTeamInfoModel activityTeamInfoModel = ActivityTeamInfoModel.ActivityTeamInfoModelBuilder(this.getById(id), activityTeamProductSkuInfoModelList);
+
+        List<ActivityTeamProductSkuInfoModel> activityTeamInfoModelActivityTeamProductSkuInfoModelList = activityTeamInfoModel.getActivityTeamProductSkuInfoModelList();
+
+        ArrayList<ActivityTeamProductSkuInfoResponse> activityTeamProductSkuInfoResponses = new ArrayList<>();
+
+        activityTeamInfoModelActivityTeamProductSkuInfoModelList.stream().map(ActivityTeamProductSkuInfoModel->{
+            return activityTeamProductSkuInfoResponses.add(ActivityTeamProductSkuInfoResponse.ActivityTeamProductSkuInfoResponseBulider(ActivityTeamProductSkuInfoModel));
+        }).toList();
+        return ActivityTeamInfoResponse.ActivityTeamInfoResponseBulider(activityTeamInfoModel,activityTeamProductSkuInfoResponses);
+    }
+
+    @Override
+    public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id) {
+        this.updateById(ActivityTeamInfo.updModelBuild(activityTeamInfoAddModel,id));
+
+
+
+    }
 }

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

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
 import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
 import com.muyu.marketing.domain.model.TeamProductStockModel;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import com.muyu.product.cache.ProjectSkuCache;
 import com.muyu.product.domain.ProjectSkuInfo;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -80,4 +82,20 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
                 activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
         );
     }
+
+
+    @Override
+    public List<ActivityTeamProductSkuInfoModel> ActivityTeamProductSkuInfoModelList(Long teamId) {
+
+        List<ActivityTeamProductSkuInfo> list = this.list(
+                new LambdaQueryWrapper<ActivityTeamProductSkuInfo>().eq(
+                        ActivityTeamProductSkuInfo::getTeamId,teamId));
+        return list.stream().map(ActivityTeamProductSkuInfoModel::reqSkuBulider).toList();
+
+//        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
+//        List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
+//        List<ActivityTeamProductSkuInfoModel> activityTeamProductSkuInfoModels = list.stream().map(ActivityTeamProductSkuInfoModel::reqSkuBulider).toList();
+//        return activityTeamProductSkuInfoModels;
+    }
 }

muyu-modules/muyu-marketing/marketing-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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         file-extension: yml
         # 共享配置

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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         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: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.71.140.64:8848
+        namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2
         # 配置文件格式
         file-extension: yml
         # 共享配置