2204A-cyj(回显)

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

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

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

@@ -36,7 +36,7 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 商品ID
    */
-  private long productId;
+  private Long productId;
   /**
    * 商品活动图
    */

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

@@ -54,6 +54,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
    */
   private BigDecimal teamPrice;
 
+
   /**
    * 通过模型钢构件对象
    * @param activityTeamProductSkuAddModel 模型
@@ -64,7 +65,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .productId(activityTeamProductSkuAddModel.getProductId())
             .teamId(activityTeamProductSkuAddModel.getTeamId())
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
-            .remainStock(activityTeamProductSkuAddModel.getTeamStock())
+//            .remainStock(activityTeamProductSkuAddModel.getTeamStock())
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }

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

@@ -0,0 +1,80 @@
+package com.muyu.marketing.domain.model;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 团购活动修改模型
+ *
+ * @author DongZeLiang
+ * @date 2024-11-26 09:38
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoUpdateModel {
+
+    /**
+     * 拼团名称
+     */
+    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;
+
+    /** 删除商品规格idList*/
+    private List<Long> ids;
+}

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

@@ -52,7 +52,7 @@ public class ActivityTeamProductSkuAddModel {
         return ActivityTeamProductSkuAddModel.builder()
                 .productId(productId.get())
                 .sku(teamProjectSkuInfoAddReq.getSku())
-                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
+//                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
                 .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
                 .build();
     }

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

@@ -43,7 +43,7 @@ public class TeamProjectSkuInfoResp {
                 .ruleId(skuInfo.getId())
                 .sku(skuInfo.getProductSku())
                 .teamPrice(skuInfo.getTeamPrice())
-                .teamStock(skuInfo.getTeamStock())
+//                .teamStock(skuInfo.getTeamStock())
                 .build();
     }
 

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

@@ -63,7 +63,7 @@ public class ActivityTeamController {
      * 回显拼团活动
      * @teamId 拼团活动id
      */
-    @GetMapping("/select/{id}")
+    @GetMapping("/{teamId}")
     public Result<ActivityTeamInfoResp> getTeamInfo(@PathVariable Long teamId){
         //调用Service方法 获取回显Model
         ActivityTeamInfoSelectModel activityTeamInfoSelectModel = activityTeamInfoService.selectTeamInfo(teamId);

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

@@ -16,6 +16,7 @@ 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.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -31,8 +32,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     @Autowired
     private ActivityTeamOpenInfoService activityTeamOpenInfoService;
 
-    @Autowired
-    private ActivityTeamInfoServiceImpl activityTeamInfoService;
     @Autowired
     private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
@@ -97,11 +96,9 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     @Override
     public ActivityTeamInfoSelectModel selectTeamInfo(Long teamId) {
         //根据拼团活动id 查询拼团活动
-        ActivityTeamInfo activityTeamInfo = activityTeamInfoService.getById(teamId);
+        ActivityTeamInfo activityTeamInfo = this.getById(teamId);
         //查询活动中的 商品sku集合
-        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamProductSkuInfoService.getActivityTeamProductSkuInfoByTeamId(teamId);
-        queryWrapper.eq(ActivityTeamProductSkuInfo::getProductId,activityTeamInfo.getProductId());
-        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamProductSkuInfoService.list(queryWrapper);
 
         //构造成 ActivityTeamInfoSelectModel
         ActivityTeamInfoSelectModel teamInfoSelectModel = ActivityTeamInfoSelectModel.getTeamInfoSelectModel(activityTeamInfo, activityTeamProductSkuInfoList);

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

@@ -4,6 +4,21 @@ server:
 
 # Spring
 spring:
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        # 主库数据源
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://60.204.150.30:3306/activity_team?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: xx-12345
+        slave:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://60.204.150.30:3306/product?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: xx-12345
   application:
     # 应用名称
     name: muyu-marketing