2024/12/5

哈哈哈哈哈周六啦
高雪慈修改
2024-12-05 10:44:14 +08:00 · 2024-11-30 10:57:31 +08:00 · 2024-11-27 22:50:46 +08:00 · 2024-11-27 14:57:30 +08:00
85 changed files with 402 additions and 746 deletions
--- a/doc/团购活动修改.java
+++ b/doc/团购活动修改.java
@ -30,3 +30,5 @@

 "详情": "String"
 }
+
+list:
--- a/doc/策略-功能划分
+++ b/doc/策略-功能划分
@ -0,0 +1,17 @@
+
+商品列表 -点击购买 （回显商品详情）
+
+普通
+百人
+团长免单：
+开团-（添加订单的页面 支付）
+开团成功 - （添加订单信息 判断当前人数是否已满）(回显订单信息) 还差x人 邀请好友参团 剩余xx时间
+邀请好友/有人参团 - （添加订单信息 判断当前人数是否已满）
+满员 - （团长支付的钱返还至小钱包） （申请解冻-判断团内订单是否都已完成）
+时间到达但是未邀满 免单失败 但原订单依然生效 可选择继续开团/参团
+
+
+
+
+商品详情
+团购订单列表
--- a/doc/策略.md
+++ b/doc/策略.md
--- a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
@ -1,9 +1,8 @@
 package com.muyu.auth.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.auth.form.LoginBody;
 import com.muyu.auth.form.RegisterBody;
 import com.muyu.auth.service.SysLoginService;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.JwtUtils;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.security.auth.AuthUtil;
--- a/muyu-auth/src/main/resources/bootstrap.yml
+++ b/muyu-auth/src/main/resources/bootstrap.yml
@ -14,10 +14,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java
@ -1,9 +1,9 @@
 package com.muyu.common.core.web.controller;

 import com.github.pagehelper.PageInfo;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.DateUtils;
 import com.muyu.common.core.utils.PageUtils;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java
+++ b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java
@ -1,5 +1,5 @@
 package com.muyu.common.security.handler;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.HttpStatus;
 import com.muyu.common.core.exception.DemoModeException;
 import com.muyu.common.core.exception.InnerAuthException;
@ -7,7 +7,6 @@ import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.exception.auth.NotPermissionException;
 import com.muyu.common.core.exception.auth.NotRoleException;
 import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.domain.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;
--- a/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java
+++ b/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java
@ -1,7 +1,6 @@
 package com.muyu.gateway.handler;
-
-import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.gateway.service.ValidateCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
--- a/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java
+++ b/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java
@ -1,7 +1,6 @@
 package com.muyu.gateway.service;
-
-import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.CaptchaException;

 import java.io.IOException;

--- a/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
@ -1,5 +1,5 @@
 package com.muyu.gateway.service.impl;
-
+import com.muyu.common.core.domain.Result;
 import com.google.code.kaptcha.Producer;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.constant.Constants;
@ -7,7 +7,6 @@ import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.sign.Base64;
 import com.muyu.common.core.utils.uuid.IdUtils;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.gateway.config.properties.CaptchaProperties;
 import com.muyu.gateway.model.resp.CaptchaCodeResp;
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@ -1,7 +1,6 @@
 # Tomcat
 server:
  port: 8080
-
 # Spring
 spring:
  application:
@ -14,10 +13,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
@ -33,7 +34,7 @@ spring:
      datasource:
        ds1:
          nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 113.44.75.158:8848
            dataId: sentinel-muyu-gateway
            groupId: DEFAULT_GROUP
            data-type: json
--- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java
+++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java
@ -1,5 +1,4 @@
 package com.muyu.file.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.file.FileUtils;
 import com.muyu.file.service.ISysFileService;
--- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
+++ b/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: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java
+++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java
@ -1,8 +1,7 @@
 package com.muyu.gen.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.text.Convert;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
+++ b/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: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm
+++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm
@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
--- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java
+++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java
@ -1,11 +1,10 @@
 package com.muyu.job.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.exception.job.TaskException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java
+++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java
@ -1,8 +1,7 @@
 package com.muyu.job.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
+++ b/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: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java
@ -7,6 +7,7 @@ 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.ActivityTeamProductInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

@ -129,4 +130,20 @@ public class ActivityTeamInfo extends BaseEntity {
            .strategyId(activityTeamInfoUpdModel.getStrategyId())
            .build();
  }
+
+  public static ActivityTeamInfo updateBuild (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel){
+    return ActivityTeamInfo.builder()
+            .id(activityTeamProductInfoUpdModel.getTeamId())
+            .productId(activityTeamProductInfoUpdModel.getProductId())
+            .name(activityTeamProductInfoUpdModel.getName())
+            .productImage(activityTeamProductInfoUpdModel.getProductImage())
+            .introduction(activityTeamProductInfoUpdModel.getIntroduction())
+            .unit(activityTeamProductInfoUpdModel.getUnit())
+            .imageList(activityTeamProductInfoUpdModel.getImageList())
+            .endTime(activityTeamProductInfoUpdModel.getEndTime())
+            .strategyType(activityTeamProductInfoUpdModel.getStrategyType())
+            .content(activityTeamProductInfoUpdModel.getContent())
+            .build();
+  }
+
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java
@ -5,9 +5,7 @@ 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;

@ -76,13 +74,4 @@ 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();
-  }
-
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java
@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "team_strategy_exemption_hundred", autoResultMap = true)
-public class TeamStrategyHundred extends BaseEntity {
+public class TeamStrategyExemptionHundred extends BaseEntity {

  /**
   * 主键
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java
@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true)
-public class TeamStrategyOrdinary extends BaseEntity {
+public class TeamStrategyExemptionOrdinary extends BaseEntity {

  /**
   * 主键
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java
@ -58,7 +58,7 @@ public class ActivityTeamInfoAddModel {
    /**
     * 活动排序
     */
-    private Long sort;
+    private Integer sort;
    /**
     * 商品SkU集合
     */
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java
@ -49,6 +49,10 @@ public class ActivityTeamInfoListModel {
     * 拼团商品图片
     */
    private String productImage;
+    /**
+     * 拼团商品id
+     */
+    private Long productId;
    /**
     * 商品价格
     */
@ -72,20 +76,6 @@ public class ActivityTeamInfoListModel {


    public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModel.ActivityTeamInfoListModelBuilder, ActivityTeamInfoListModel> function) {
-        ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder()
-                .id(activityTeamInfo.getId())
-                .name(activityTeamInfo.getName())
-//                .openTeamNumber(teamOpenTypeNumber)
-//                .addTeamNumber(teamInTypeNumber)
-//                .attendNumber(teamOpenTypeNumber + teamInTypeNumber)
-                .endTime(activityTeamInfo.getEndTime())
-                .productImage(activityTeamInfo.getProductImage())
-//                .teamPrice(discountPrice.getTeamPrice())
-//                .productPrice(discountPrice.getProductPrice())
-//                .teamStock(teamProductStockModel.getTeamStock())
-//                .remainStock(teamProductStockModel.getRemainStock())
-                .status(activityTeamInfo.getStatus())
-                .build();
        return function.apply(
                ActivityTeamInfoListModel.builder()
                        .id(activityTeamInfo.getId())
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java
@ -5,13 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;

 import java.util.Date;
-import java.util.List;

 /**
- * @program: 2204a-cloud-server
 * @description: 添加活动模型
 * @author: AoCi Tian
 * @create: 2024-11-26 10:59
@ -82,7 +79,7 @@ public class ActivityTeamInfoSaveModel {
                .unit(activityTeamInfoAddModel.getUnit())
                .imageList(activityTeamInfoAddModel.getImageList())
                .endTime(activityTeamInfoAddModel.getEndTime())
-                .sort(activityTeamInfoAddModel.getSort())
+                .sort(Long.valueOf(activityTeamInfoAddModel.getSort()))
                .content(activityTeamInfoAddModel.getContent())
                .status(activityTeamInfoAddModel.getStatus())
                .strategyType(activityTeamInfoAddModel.getStrategyType())
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
@ -1,21 +1,16 @@
 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;

 /**
- * @program: 2204a-cloud-server
- * @description: 活动商品规格修改模型
+ * 活动商品规格修改模型
 * @author: AoCi Tian
 * @create: 2024-11-26 19:25
 **/
@ -37,7 +32,7 @@ public class ActivityTeamInfoUpdModel {
    private String status;
    private String strategyType;
    private Long strategyId;
-    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
+    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;

    public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
        return ActivityTeamInfoUpdModel.builder()
@ -54,12 +49,7 @@ public class ActivityTeamInfoUpdModel {
                .status(activityTeamInfoUpdReq.getStatus())
                .strategyType(activityTeamInfoUpdReq.getStrategyType())
                .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
+                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
                .build();
    }
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java
@ -0,0 +1,66 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductInfoUpdModel {
+    /**
+     * 活动ID
+     */
+    private Long teamId;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 活动名称
+     */
+    private String name;
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * 商品活动图
+     */
+    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 String strategyType;
+    /**
+     * 商品SkU模型
+     */
+    public ActivityTeamUpdSKuModel updSkuList;
+    /**
+     * 活动详情
+     */
+    private String content;
+}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java
@ -1,59 +0,0 @@
-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();
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.model;


-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@ -35,12 +34,4 @@ 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();
-    }
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java
@ -0,0 +1,29 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamUpdSKuModel {
+    /**
+     * 商品规格修改集合
+     */
+    public List<ActivityTeamProductSkuReqModel> skuList;
+
+    /**
+     * 删除商品规格idList
+     */
+    public List<Long> delSkuIdList;
+
+    /**
+     * 添加商品规格List
+     */
+    public List<ActivityTeamProductSkuAddModel> addSkuList;
+}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java
@ -51,7 +51,7 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
    /**
     * 活动排序
     */
-    private Long sort;
+    private Integer sort;
    /**
     * 商品SkU集合
     */
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java
+++ b/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 ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
+    private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java
@ -1,37 +0,0 @@
-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;
-}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoUpdReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoUpdReq.java
@ -1,33 +0,0 @@
-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;
-}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java
@ -2,7 +2,6 @@ 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;
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java
@ -48,6 +48,10 @@ public class TeamInfoListResp {
     * 商品价格
     */
    private BigDecimal productPrice;
+    /**
+     * 商品id
+     */
+    private Long productId;
    /**
     * 剩余库存
     */
@ -80,6 +84,7 @@ public class TeamInfoListResp {
                .attendNumber(activityTeamInfoListModel.getAttendNumber())
                .endTime(activityTeamInfoListModel.getEndTime())
                .teamPrice(activityTeamInfoListModel.getTeamPrice())
+                .productId(activityTeamInfoListModel.getProductId())
                .productImage(activityTeamInfoListModel.getProductImage())
                .productPrice(activityTeamInfoListModel.getProductPrice())
                .remainStock(activityTeamInfoListModel.getRemainStock())
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
@ -3,6 +3,7 @@ package com.muyu.marketing;
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@EnableCustomSwagger2
@EnableMyFeignClients
@SpringBootApplication
+@MapperScan("com.muyu.marketing.team.mapper")
 public class MuYuMarketIngApplication {
    public static void main (String[] args) {
        SpringApplication.run(MuYuMarketIngApplication.class, args);
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
@ -53,16 +53,22 @@ public class ActivityTeamController {
     * @param activityTeamInfoSaveReq 添加请求对象
     * @return 结果集
     */
-    @PostMapping
+    @PostMapping("/save")
    public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
        activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
        return Result.success();
    }

-    @PostMapping("/findById/{id}")
+    /**
+     * 回显
+     * @param id
+     * @return
+     */
+    @PostMapping("/findTeamById/{id}")
    public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
    }
+
    @PutMapping("/updateByTeamId")
    public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java
@ -2,6 +2,8 @@ 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
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java
@ -0,0 +1,11 @@
+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> {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java
@ -0,0 +1,11 @@
+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> {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyHundredMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyHundredMapper.java
@ -1,10 +0,0 @@
-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> {
-    
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyOrdinaryMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyOrdinaryMapper.java
@ -1,10 +0,0 @@
-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> {
-    
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
@ -35,5 +35,5 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     */
    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);

-
+    public boolean update (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel);
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
@ -3,6 +3,7 @@ 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;
@ -45,29 +46,12 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
     */
    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);

+
    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);

-    /**
-     * 根据 业务模型 进行 团购商品修改
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
-     */
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
+    public boolean delByIds(List<Long> id);

-    /**
-     * 根据 业务模型 进行 团购商品批量修改
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
-     */
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
+    public boolean add (List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList);

-    /**
-     * 一键设置
-     * @param activityTeamProductSkuSettingModel 整体修改模型
-     */
-    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
-        this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
-        this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
-        this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
-    }
+    public boolean BathSku(ActivityTeamUpdSKuModel activityTeamUpdSKuModels);
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java
@ -0,0 +1,8 @@
+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> {
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java
@ -0,0 +1,7 @@
+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> {
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java
@ -2,10 +2,7 @@ package com.muyu.marketing.team.service;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;

-/**
- * 免单
- */
-public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService<TeamStrategyExemption> {
+public interface TeamStrategyExemptionService extends IService<TeamStrategyExemption> {
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java
@ -1,11 +0,0 @@
-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> {
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java
@ -1,11 +0,0 @@
-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> {
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
@ -35,10 +35,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
        queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getKeyWord()), ActivityTeamInfo::getName, activityTeamInfoListQueryModel.getKeyWord());
        queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getStatus()), ActivityTeamInfo::getStatus, activityTeamInfoListQueryModel.getStatus());

-        /**
-         * Object<T> -> 创建对象的时候进行的占用
-         * <T> Result<T> 以方法返回值为占用
-         */
        Page<ActivityTeamInfo> activityTeamInfoPage = this.page(activityTeamInfoListQueryModel.buildPage(), queryWrapper);
        List<ActivityTeamInfo> activityTeamInfoList = activityTeamInfoPage.getRecords();
        List<ActivityTeamInfoListModel> activityTeamInfoListModels = activityTeamInfoList.stream()
@ -57,6 +53,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
                                    .productPrice(discountPrice.getProductPrice())
                                    .teamStock(teamProductStockModel.getTeamStock())
                                    .remainStock(teamProductStockModel.getRemainStock())
+                                    .productId(activityTeamInfo.getProductId())
                                    .build();
                        })).toList();
        TableDataInfo<ActivityTeamInfoListModel> tableDataInfo = new TableDataInfo<>();
@ -101,8 +98,18 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
    @Override
    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
-        Assert.isTrue(update,"修改失败");
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
+        io.jsonwebtoken.lang.Assert.isTrue(update,"修改失败");
+        activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
        return update;
    }
+
+    @Override
+    public boolean update(ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel) {
+        //修改商品信息
+        this.updateById(ActivityTeamInfo.updateBuild(activityTeamProductInfoUpdModel));
+
+        //修改商品sku信息
+        activityTeamProductSkuInfoService.BathSku(activityTeamProductInfoUpdModel.getUpdSkuList());
+        return true;
+    }
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
@ -1,7 +1,6 @@
 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;
@ -13,11 +12,8 @@ import com.muyu.product.domain.ProjectSkuInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;

-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;

@ -30,7 +26,6 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT

    /**
     * 通过团购活动ID获取团购中最优惠的价格
-     *
     * @param teamId 团购ID
     * @return 优惠价格
     */
@ -41,7 +36,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
        // 优惠模型集合
        Optional<TeamProductDiscountPriceModel> discountPriceModelOptional = teamProductSkuInfoList.stream()
                .map(activityTeamProductSkuInfo -> {
-                    ProjectSkuInfo projectSkuInfo = projectSkuCache.get(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
+                    ProjectSkuInfo projectSkuInfo = projectSkuCache.getData(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
                    return TeamProductDiscountPriceModel.of(projectSkuInfo.getPrice(), activityTeamProductSkuInfo.getTeamPrice());
                }).min((o1, o2) -> Double.valueOf(o1.getDiscount() * 100 - o2.getDiscount() * 100).intValue());

@ -93,46 +88,44 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
        List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
        return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
-//        return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
+    }
+
+    @Override
+    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
+        if (null != activityTeamProductSkuReqModelList) {
+            return this.updateBatchById(activityTeamProductSkuReqModelList
+                    .stream()
+                    .map(ActivityTeamProductSkuInfo::updateModelBuild)
+                    .toList());
+        }
+        return true;
+    }
+
+    @Override
+    public boolean delByIds(List<Long> id) {
+        if (null != id) {
+            return this.removeBatchByIds(id);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean add(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList) {
+        if (null != activityTeamProductSkuReqModelList){
+            return this.saveBatch(activityTeamProductSkuReqModelList
+                    .stream()
+                    .map(ActivityTeamProductSkuInfo::modelBuild)
+                    .toList());
+        }
+        return true;
    }

    @Transactional
    @Override
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
-        return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
-    }
-
-    /**
-     * 根据 业务模型 进行 团购商品修改
-     *
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
-     */
-    @Override
-    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 batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
-        return this.updateBatchById(
-                activityTeamProductSkuUpdModelList.stream()
-                        .map(ActivityTeamProductSkuInfo::updModelBuild)
-                        .toList()
-        );
+    public boolean BathSku(ActivityTeamUpdSKuModel activityTeamUpdSKuModel){
+        updateBath(activityTeamUpdSKuModel.getSkuList());
+        delByIds(activityTeamUpdSKuModel.getDelSkuIdList());
+        add(activityTeamUpdSKuModel.getAddSkuList());
+        return true;
    }
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java
@ -0,0 +1,16 @@
+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 {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java
@ -0,0 +1,13 @@
+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 {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java
@ -4,62 +4,10 @@ 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;

-@Log4j2
-@Service("team-strategy-exemption")
+@Service
 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) {
-
-    }
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java
@ -1,66 +0,0 @@
-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) {
-
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java
@ -1,66 +0,0 @@
-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) {
-
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java
@ -1,44 +0,0 @@
-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);
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java
@ -1,85 +0,0 @@
-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) {
-
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
@ -1,12 +1,11 @@
 # Tomcat
 server:
  port: 9209
-
 # Spring
 spring:
  application:
    # 应用名称
-    name: muyu-buy
+    name: muyu-marketing
  profiles:
    # 环境配置
    active: dev
@ -14,10 +13,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-marketing/marketing-server/src/test/java/com/muyu/test/TeamStrategyTest.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/test/java/com/muyu/test/TeamStrategyTest.java
@ -1,28 +0,0 @@
-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);
-    }
-}
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java
@ -43,7 +43,7 @@ public class CommentInfoController extends BaseController {
     * 查询商品评论列表
     */
    @ApiOperation("获取商品评论列表")
-    @RequiresPermissions("product:comment:list")
+    //@RequiresPermissions("product:comment:list")
    @GetMapping("/list")
    public Result<TableDataInfo<CommentInfo>> list(CommentInfoQueryReq commentInfoQueryReq) {
        startPage();
@ -108,4 +108,9 @@ public class CommentInfoController extends BaseController {
    public Result<String> remove(@PathVariable List<Long> ids) {
        return toAjax(commentInfoService.removeBatchByIds(ids));
    }
+
+    @GetMapping("listByProductId/{id}")
+    public List<CommentInfo> listByProductId(@PathVariable Long id) {
+        return commentInfoService.listByProductId(id);
+    }
 }
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java
@ -99,7 +99,8 @@ public class ProjectInfoController extends BaseController {
    @GetMapping(value = "/detail/{id}")
    @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
    public Result<ProjectDetailResp> getDetailInfo(@PathVariable("id") Long id) {
-        return Result.success(projectInfoService.getDetailInfo(id));
+        ProjectDetailResp detailInfo = projectInfoService.getDetailInfo(id);
+        return Result.success(detailInfo);
    }

    /**
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java
@ -1,6 +1,8 @@
 package com.muyu.product.service;

 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.muyu.product.domain.CommentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;

@ -19,4 +21,10 @@ public interface CommentInfoService extends IService<CommentInfo> {
     */
    public List<CommentInfo> list(CommentInfo commentInfo);

+    public default List<CommentInfo> listByProductId(Long id){
+        LambdaUpdateWrapper<CommentInfo> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CommentInfo::getProjectId, id);
+        return list(wrapper);
+    }
+
 }
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java
@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.muyu.product.mapper.ProjectInfoMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * 商品信息Service业务层处理
@ -145,6 +146,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
     * @param id 商品ID
     * @return 商品详情
     */
+    @Transactional
    @Override
    public ProjectDetailResp getDetailInfo (Long id) {
        // 商品信息获取
@ -173,7 +175,11 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
                .map(RuleAttrAddModel::infoBuild).toList();


-        CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(projectInfo.getType());
+        String a = String.valueOf(projectInfo.getType());
+        if (projectInfo.getType()==0){
+            a = String.valueOf(projectInfo.getParentType());
+        }
+        CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(Long.valueOf(a));
        List<TemplateAttributeGroupModel> templateAttributeGroupList = templateAttribute.getTemplateAttributeGroupList();
        List<TemplateAttributeModel> templateAttributeList = new ArrayList<>(){{
            addAll(templateAttribute.getTemplateAttributeList());
@ -194,30 +200,34 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
            notInAttributeIdList.addAll( attributeIdList );
        }
        // 添加上，商品的自有属性
-        List<AsProductAttributeInfo> productAttributeList = this.asProductAttributeInfoService.list(
-                new LambdaQueryWrapper<>() {{
-                    eq(AsProductAttributeInfo::getProductId, projectInfo.getId());
-                    notIn(AsProductAttributeInfo::getAttributeId, notInAttributeIdList);
-                }}
-        );

-        List<TemplateAttributeModel> projectAttributeList = new ArrayList<>();
-        if (!productAttributeList.isEmpty()){
-            List<Long> attrIdList = productAttributeList.stream()
-                    .map(AsProductAttributeInfo::getAttributeId)
-                    .toList();
-            projectAttributeList = attributeInfoService.list(
-                                            new LambdaQueryWrapper<>() {{
-                                                in(AttributeInfo::getId, attrIdList);
-                                            }}
-                                        ).stream()
-                                        .map(TemplateAttributeModel::attributeInfoBuild)
-                                        .toList();
-        }
-        // 把自有属性添加到商品属性的集合当中，进行合并
-        if (!projectAttributeList.isEmpty()){
-            templateAttributeList.addAll(projectAttributeList);
+        if (notInAttributeIdList.size()!=0){
+            List<AsProductAttributeInfo> productAttributeList = this.asProductAttributeInfoService.list(
+                    new LambdaQueryWrapper<>() {{
+                        eq(AsProductAttributeInfo::getProductId, projectInfo.getId());
+                        notIn(AsProductAttributeInfo::getAttributeId, notInAttributeIdList);
+                    }}
+            );
+            List<TemplateAttributeModel> projectAttributeList = new ArrayList<>();
+            if (!productAttributeList.isEmpty()){
+                List<Long> attrIdList = productAttributeList.stream()
+                        .map(AsProductAttributeInfo::getAttributeId)
+                        .toList();
+                projectAttributeList = attributeInfoService.list(
+                                new LambdaQueryWrapper<>() {{
+                                    in(AttributeInfo::getId, attrIdList);
+                                }}
+                        ).stream()
+                        .map(TemplateAttributeModel::attributeInfoBuild)
+                        .toList();
+            }
+            // 把自有属性添加到商品属性的集合当中，进行合并
+            if (!projectAttributeList.isEmpty()){
+                templateAttributeList.addAll(projectAttributeList);
+            }
        }
+
+
        return ProjectDetailResp.builder()
                .projectInfo(projectInfo)
                .brandInfo(brandInfo)
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
@ -14,15 +14,18 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
        shared-configs:
          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: gxc-muyu
 logging:
  level:
    com.muyu.product.mapper: DEBUG
--- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java
+++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java
@ -3,12 +3,12 @@ package com.muyu.shop.cart.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;

+import com.muyu.common.core.domain.Result;
 import com.muyu.shop.cart.domain.req.*;
 import com.muyu.shop.cart.domain.resp.CartDetailResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
--- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
+++ b/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: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java
@ -1,6 +1,5 @@
 package com.muyu.system.controller;

-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
-
+import com.muyu.common.core.domain.Result;
 /**
 * 参数配置 信息操作处理
 *
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java
@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java
@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java
@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java
@ -1,5 +1,5 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;

@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java
@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java
@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java
@ -1,7 +1,6 @@
 package com.muyu.system.controller;
-
-import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java
@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java
@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
@ -1,5 +1,4 @@
 package com.muyu.system.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.file.FileTypeUtils;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java
@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
@ -1,5 +1,4 @@
 package com.muyu.system.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java
@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
--- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
+++ b/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: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
+++ b/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: 113.44.75.158:8848
+        namespace: gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
Author	SHA1	Message	Date
gao	6866d3185d	2024/12/5	2024-12-05 10:44:14 +08:00
gao	d5f46c781b	哈哈哈哈哈周六啦	2024-11-30 10:57:31 +08:00
gao	c6ece2c701	高雪慈修改	2024-11-27 22:50:46 +08:00
gao	1c581e05fa	高雪慈初始化	2024-11-27 14:57:30 +08:00