拼团商品回显信息

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"
+
+
+}

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

@@ -1,6 +1,7 @@
 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;
@@ -43,19 +44,12 @@ public class ActivityTeamInfoUpdModel {
      */
 
     private String imageList;
-    /**
+
-     * 活动结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private Date endTime;
     /**
      * 活动排序
      */
     private Integer sort;
-    /**
+
-     * 商品SkU集合
-     */
-    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
     /**
      * 活动详情
      */
@@ -64,12 +58,11 @@ public class ActivityTeamInfoUpdModel {
      * 活动状态
      */
     private String status;
+
+
     /**
-     * 策略类型
+     * 商品SkU集合
      */
-    private String strategyType;
+    private ActivityTeamProductSkuInfoModel activityTeamProductSkuInfoModel;
-    /**
+
-     * 策略ID
-     */
-    private Long strategyId;
 }

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/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

@@ -72,4 +72,7 @@ public class ActivityTeamInfoUpdReq {
      * 策略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-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
         # 共享配置