拼团商品回显信息

doc/修改商品拼团信息

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

doc/团购回显数据结构

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

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

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

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

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

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

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

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

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

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

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

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

@@ -54,7 +54,7 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 活动排序
    */
-  private long sort;
+  private Integer sort;
   /**
    * 活动详情
    */

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

@@ -60,6 +60,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/ActivityModel.java

@@ -0,0 +1,14 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityModel {
+
+}

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

@@ -0,0 +1,85 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.util.Date;
+/**
+ * 拼团活动详情模型
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoDetailModel {
+    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 Integer sort;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private long strategyId;
+
+    public static ActivityTeamInfoDetailModel activityTeamInfoDetailModel(ActivityTeamInfo activityTeamInfo){
+        return ActivityTeamInfoDetailModel.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())
+                .build();
+    }
+
+}

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

@@ -0,0 +1,68 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 拼团活动修改模型
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoUpdModel {
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+
+
+    /**
+     * 商品SkU集合
+     */
+    private ActivityTeamProductSkuInfoModel activityTeamProductSkuInfoModel;
+
+}

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

@@ -36,7 +36,7 @@ public class ActivityTeamProductSkuAddModel {
     /**
      * 规格SKU
      */
-    private String sku;
+    private String productSku;
 
     /**
      * 拼团价格
@@ -51,7 +51,7 @@ public class ActivityTeamProductSkuAddModel {
     public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
         return ActivityTeamProductSkuAddModel.builder()
                 .productId(productId.get())
-                .sku(teamProjectSkuInfoAddReq.getSku())
+                .productSku(teamProjectSkuInfoAddReq.getSku())
                 .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
                 .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
                 .build();

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

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

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

@@ -0,0 +1,18 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ActivityTeamProductSkuInfoModel {
+    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModel;
+    private List<Long> skuIdList;
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+}

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

@@ -0,0 +1,17 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 拼团活动规格修改
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuUpdModel {
+    private String productSku;
+}

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

@@ -0,0 +1,78 @@
+package com.muyu.marketing.domain.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 ActivityTeamInfoUpdReq {
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+
+    private List<Long> skuId;
+}

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

@@ -0,0 +1,98 @@
+package com.muyu.marketing.domain.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.cglib.core.internal.Function;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TeamInfoDetailResp {
+    /**
+     * 活动id
+     */
+    private Long id;
+
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<TeamProjectSkuInfoResp> teamProjectSkuInfoResp;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+    public static TeamInfoDetailResp teamInfoDetailResp(ActivityTeamInfoDetailModel activityTeamInfoDetailModel, Function<Long,List<TeamProjectSkuInfoResp>> teamProjectSkuInfoResp){
+        return TeamInfoDetailResp.builder()
+                .id(activityTeamInfoDetailModel.getId())
+                .name(activityTeamInfoDetailModel.getName())
+                .productId(activityTeamInfoDetailModel.getProductId())
+                .productImage(activityTeamInfoDetailModel.getProductImage())
+                .introduction(activityTeamInfoDetailModel.getIntroduction())
+                .unit(activityTeamInfoDetailModel.getUnit())
+                .imageList(activityTeamInfoDetailModel.getImageList())
+                .endTime(activityTeamInfoDetailModel.getEndTime())
+                .sort(activityTeamInfoDetailModel.getSort())
+                .content(activityTeamInfoDetailModel.getContent())
+                .status(activityTeamInfoDetailModel.getStatus())
+                .strategyType(activityTeamInfoDetailModel.getStrategyType())
+                .strategyId(activityTeamInfoDetailModel.getStrategyId())
+                .teamProjectSkuInfoResp(teamProjectSkuInfoResp.apply(activityTeamInfoDetailModel.getId()))
+                .build();
+    }
+}

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

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

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

@@ -4,16 +4,20 @@ 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.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoListModel;
 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.TeamInfoDetailResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
+import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
+import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.cglib.core.internal.Function;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -28,10 +32,15 @@ import java.util.List;
 public class ActivityTeamController {
 
     @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;;
+    private ActivityTeamInfoService activityTeamInfoService;
+
+    @Autowired
+    private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
+    ;
 
     /**
      * 查询营销团购活动列表
+     *
      * @param teamInfoListReq 活动查询入参
      * @return 活动响应结果
      */
@@ -50,12 +59,36 @@ public class ActivityTeamController {
 
     /**
      * 添加团购活动
+     *
      * @param activityTeamInfoSaveReq 添加请求对象
      * @return 结果集
      */
-    @PostMapping
+    @PostMapping("/add")
     public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
     }
+
+
+    /**
+     * 商品拼团活动详情
+     */
+    @GetMapping("findById")
+    public Result<TeamInfoDetailResp> findById(@RequestParam("id")Long id){
+        ActivityTeamInfoDetailModel teamInfo = activityTeamInfoService.findById(id);
+        TeamInfoDetailResp teamInfoDetailResp = TeamInfoDetailResp.teamInfoDetailResp(
+                teamInfo,
+                teamId -> TeamProjectSkuInfoResp.teamProjectSkuInfoResp(activityTeamProductSkuInfoService.findByTeamId(teamId))
+        );
+        return Result.success(teamInfoDetailResp);
+    }
+
+    /**
+     * 修改商品拼团活动详情
+     */
+    @PutMapping("update")
+    public Result<String> upd(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
+        return Result.success();
+    }
+
 }

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

@@ -4,6 +4,7 @@ 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.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 
@@ -24,4 +25,9 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+
+    /**
+     * 拼团活动详情
+     */
+    public ActivityTeamInfoDetailModel findById(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.ActivityTeamProductSkuInfoListModel;
 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);
 
+
+    /**
+     * 活动商品规格sku
+     * @param teamId
+     * @return
+     */
+    public List<ActivityTeamProductSkuInfoListModel> findByTeamId(Long teamId);
+
 }

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

@@ -82,4 +82,12 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
         this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
+
+    /**
+     * 拼团活动详情
+     */
+    @Override
+    public ActivityTeamInfoDetailModel findById(Long id) {
+        return ActivityTeamInfoDetailModel.activityTeamInfoDetailModel(this.getById(id));
+    }
 }

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

@@ -5,6 +5,7 @@ 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.ActivityTeamProductSkuInfoListModel;
 import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
 import com.muyu.marketing.domain.model.TeamProductStockModel;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
@@ -80,4 +81,19 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
                 activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
         );
     }
+
+    /**
+     * 活动商品规格sku
+     * @param teamId
+     * @return
+     */
+    @Override
+    public List<ActivityTeamProductSkuInfoListModel> findByTeamId(Long teamId) {
+        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<ActivityTeamProductSkuInfo>()
+                .eq(ActivityTeamProductSkuInfo::getTeamId, teamId);
+        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfos = this.list(queryWrapper);
+        return activityTeamProductSkuInfos.stream().
+                map(ActivityTeamProductSkuInfoListModel::infoListModel)
+                .toList();
+    }
 }

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

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

muyu-modules/muyu-marketing/marketing-server/src/main/resources/json

@@ -0,0 +1,33 @@
+{
+  "code": 200,
+  "msg": null,
+  "data": {
+    "id": 33,
+    "name": "大啥第三方",
+    "productId": 4,
+    "productImage": "http://127.0.0.1:9300/statics/2024/11/18/90B41C0F5E61650EB75F14740C5BE06D_20241118145544A011.jpg",
+    "introduction": "啥地方",
+    "unit": "阿萨",
+    "imageList": "http://127.0.0.1:9300/statics/2024/11/24/abs_20241124222309A011.jpg",
+    "endTime": "2024-11-24",
+    "sort": null,
+    "teamProjectSkuInfoResp": [
+      {
+        "productSkuId": 4,
+        "productSku": "骁龙888-16G-128G",
+        "teamPrice": 4999,
+        "teamStock": 4500
+      },
+      {
+        "productSkuId": 4,
+        "productSku": "骁龙888plus-16G-512G",
+        "teamPrice": 4200,
+        "teamStock": 4200
+      }
+    ],
+    "content": "是地方v",
+    "status": null,
+    "strategyType": "in_team",
+    "strategyId": 4
+  }
+}

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

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

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

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

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

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

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

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