回显

doc/团购查询单条数据结构.java

@@ -1,24 +1,24 @@
 $.{
-    "活动ID": "Long",
+        "团购ID": "Long",
-    "商品ID": "Long", //activity_team_info.product_id
+        "商品ID": "Long", //activity_team_info.product_id
-    "商品图片": "String",
+        "商品图片": "String",
-    "活动名称": "String",
+        "活动名称": "String",
-    "活动简介": "String",
+        "活动简介": "String",
-    "商品单位": "String",
+        "商品单位": "String",
-    "商品的轮播图": [
+        "商品的轮播图": [
         "String", "String"
-    ],
+        ],
-    "活动时间": "date",
+        "活动时间": "date",
-    "策略类型": "String",
+        "策略类型": "String",
-    "策略ID": "Long",
+        "策略ID": "Long",
-    "商品规格List": [ // activity_team_product_sku_info
+        "商品规格List": [ // activity_team_product_sku_info
         {
-            "活动商品规格ID": "Long",
+        "活动商品规格ID": "Long",
-            "规格SKU": "String", // activity_team_product_sku_info.product_sku
+        "规格SKU": "String", // activity_team_product_sku_info.product_sku
-            "拼团价格": "BigDecimal",
+        "拼团价格": "BigDecimal",
-            "拼团库存": "Long"
+        "拼团库存": "Long"
         }
-    ],
+        ],
-    "排序": "Integer",
+        "排序": "Integer",
-    "详情": "String"
+        "详情": "String"
-}
+  }

doc/团购活动修改.java

@@ -1,32 +0,0 @@
-{
-    "活动ID": "Long",
-    "商品ID": "Long",
-    "活动名称": "String",
-    "商品名称": "String",
-    "商品图片": "String",
-    "活动简介": "String",
-    "商品单位": "String",
-    "商品的轮播图": [
-            "String", "String"
-        ],
-    "活动时间": "date",
-    "策略类型": "String",
-    "商品规格": {
-        "修改商品规格List": [ // 修改
-                {
-                    "团购规格ID": "Long",
-                    "拼团价格": "BigDecimal",
-                    "拼团库存": "Long"
-                }
-            ],
-        "删除商品规格IdList" : ["Long", "Long"],
-        "添加商品规格List": [
-                "商品SKU": "String",
-                "商品价格": "BigDecimal",
-                "拼团价格": "BigDecimal",
-                "拼团库存": "Long"
-            ]
-    },
-
-"详情": "String"
-}

doc/团购添加数据结构.java

@@ -21,6 +21,7 @@ $.{
   "详情": "String"
 }
 
+
 activity_team_info 团购活动表 -> ActivityTeamInfo(实体类)
 activity_team_info.id(主键) -> 自增 -> 回填 -> ActivityTeamInfo.id
 activity_team_info.name(拼团名称) <- ActivityTeamInfo.name <- $.活动名称

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

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

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java

@@ -58,7 +58,7 @@ public class IpUtils {
             ip = request.getRemoteAddr();
         }
 
-        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "150.158.86.96" : getMultistageReverseProxyIp(ip);
     }
 
     /**
@@ -70,7 +70,7 @@ public class IpUtils {
      */
     public static boolean internalIp (String ip) {
         byte[] addr = textToNumericFormatV4(ip);
-        return internalIp(addr) || "127.0.0.1".equals(ip);
+        return internalIp(addr) || "150.158.86.96".equals(ip);
     }
 
     /**
@@ -197,7 +197,7 @@ public class IpUtils {
             return InetAddress.getLocalHost().getHostAddress();
         } catch (UnknownHostException e) {
         }
-        return "127.0.0.1";
+        return "150.158.86.96";
     }
 
     /**

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -28,12 +30,13 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 150.158.86.96:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 150.158.86.96:8848
+            namespace: 2204a
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

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

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

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

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

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

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

@@ -5,8 +5,6 @@ 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.ActivityTeamInfoAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -95,38 +93,4 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
-
-  public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
-    return ActivityTeamInfo.builder()
-            .name(activityTeamInfoSaveModel.getName())
-            .productId(activityTeamInfoSaveModel.getProductId())
-            .productImage(activityTeamInfoSaveModel.getProductImage())
-            .introduction(activityTeamInfoSaveModel.getIntroduction())
-            .unit(activityTeamInfoSaveModel.getUnit())
-            .imageList(activityTeamInfoSaveModel.getImageList())
-            .endTime(activityTeamInfoSaveModel.getEndTime())
-            .sort(activityTeamInfoSaveModel.getSort())
-            .content(activityTeamInfoSaveModel.getContent())
-            .status(activityTeamInfoSaveModel.getStatus())
-            .strategyType(activityTeamInfoSaveModel.getStrategyType())
-            .strategyId(activityTeamInfoSaveModel.getStrategyId())
-            .build();
-  }
-  public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){
-    return ActivityTeamInfo.builder()
-            .id(activityTeamInfoUpdModel.getId())
-            .name(activityTeamInfoUpdModel.getName())
-            .productId(activityTeamInfoUpdModel.getProductId())
-            .productImage(activityTeamInfoUpdModel.getProductImage())
-            .introduction(activityTeamInfoUpdModel.getIntroduction())
-            .unit(activityTeamInfoUpdModel.getUnit())
-            .imageList(activityTeamInfoUpdModel.getImageList())
-            .endTime(activityTeamInfoUpdModel.getEndTime())
-            .sort(activityTeamInfoUpdModel.getSort())
-            .content(activityTeamInfoUpdModel.getContent())
-            .status(activityTeamInfoUpdModel.getStatus())
-            .strategyType(activityTeamInfoUpdModel.getStrategyType())
-            .strategyId(activityTeamInfoUpdModel.getStrategyId())
-            .build();
-  }
 }

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

@@ -5,9 +5,6 @@ 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;
 
@@ -50,7 +47,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
    * 拼团价格
    */
   private BigDecimal teamPrice;
-
   /**
    * 通过模型钢构件对象
    * @param activityTeamProductSkuAddModel 模型
@@ -61,28 +57,8 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .productId(activityTeamProductSkuAddModel.getProductId())
             .teamId(activityTeamProductSkuAddModel.getTeamId())
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
-            .productSku(activityTeamProductSkuAddModel.getSku())
             .remainStock(activityTeamProductSkuAddModel.getTeamStock())
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }
-  public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuReqModel activityTeamProductSkuReqModel) {
-    return ActivityTeamProductSkuInfo.builder()
-            .id(activityTeamProductSkuReqModel.getId())
-            .productId(activityTeamProductSkuReqModel.getProductId())
-            .teamStock(activityTeamProductSkuReqModel.getTeamStock())
-            .productSku(activityTeamProductSkuReqModel.getProductSku())
-            .teamPrice(activityTeamProductSkuReqModel.getTeamPrice())
-            .build();
-  }
-
-  public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuUpdModel teamProductSkuUpdModel){
-    return ActivityTeamProductSkuInfo.builder()
-            .id(teamProductSkuUpdModel.getId())
-            .teamPrice(teamProductSkuUpdModel.getTeamPrice())
-            .teamStock(teamProductSkuUpdModel.getTeamStock())
-            .remainStock(teamProductSkuUpdModel.getTeamStock())
-            .build();
-  }
-
 }

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 {
 
   /**
    * 主键

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 {
 
   /**
    * 主键

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

@@ -1,102 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.marketing.domain.ActivityTeamInfo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-import java.util.function.Function;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 活动回显总模型
- * @author: AoCi Tian
- * @create: 2024-11-26 16:00
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamDetailModel {
-    /**
-     * 拼团id
-     */
-    private Long id;
-    /**
-     * 拼团名称
-     */
-    private String name;
-    /**
-     * 商品ID
-     */
-    private Long productId;
-    /**
-     * 商品活动图
-     */
-    private String productImage;
-    /**
-     * 活动简介
-     */
-    private String introduction;
-    /**
-     * 单位
-     */
-
-    private String unit;
-    /**
-     * 轮播图
-     */
-
-    private String imageList;
-    /**
-     * 活动结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private Date endTime;
-    /**
-     * 活动排序
-     */
-    private Long sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ActivityTeamProductSkuModel> projectSkuInfoAddReqList;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-    public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
-                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
-        return function.apply(ActivityTeamDetailModel.builder()
-                .id(activityTeamInfo.getId())
-                .name(activityTeamInfo.getName())
-                .productId(activityTeamInfo.getProductId())
-                .productImage(activityTeamInfo.getProductImage())
-                .introduction(activityTeamInfo.getIntroduction())
-                .unit(activityTeamInfo.getUnit())
-                .imageList(activityTeamInfo.getImageList())
-                .endTime(activityTeamInfo.getEndTime())
-                .sort(activityTeamInfo.getSort())
-                .content(activityTeamInfo.getContent())
-                .status(activityTeamInfo.getStatus())
-                .strategyType(activityTeamInfo.getStrategyType())
-                .strategyId(activityTeamInfo.getStrategyId())
-        );
-    }
-}

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集合
      */

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

@@ -1,92 +0,0 @@
-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 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
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoSaveModel {
-
-    /**
-     * 拼团名称
-     */
-    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 Long sort;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-    public static ActivityTeamInfoSaveModel activityTeamInfoSaveModelBuild (ActivityTeamInfoAddModel activityTeamInfoAddModel){
-        return ActivityTeamInfoSaveModel.builder()
-                .name(activityTeamInfoAddModel.getName())
-                .productId(activityTeamInfoAddModel.getProductId())
-                .productImage(activityTeamInfoAddModel.getProductImage())
-                .introduction(activityTeamInfoAddModel.getIntroduction())
-                .unit(activityTeamInfoAddModel.getUnit())
-                .imageList(activityTeamInfoAddModel.getImageList())
-                .endTime(activityTeamInfoAddModel.getEndTime())
-                .sort(activityTeamInfoAddModel.getSort())
-                .content(activityTeamInfoAddModel.getContent())
-                .status(activityTeamInfoAddModel.getStatus())
-                .strategyType(activityTeamInfoAddModel.getStrategyType())
-                .strategyId(activityTeamInfoAddModel.getStrategyId())
-                .build();
-    }
-}

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

@@ -1,65 +0,0 @@
-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
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoUpdModel {
-    private Long id;
-    private String name;
-    private Long productId;
-    private String productImage;
-    private String introduction;
-    private String unit;
-    private String imageList;
-    private Date endTime;
-    private Long sort;
-    private String content;
-    private String status;
-    private String strategyType;
-    private Long strategyId;
-    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
-
-    public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
-        return ActivityTeamInfoUpdModel.builder()
-                .id(activityTeamInfoUpdReq.getId())
-                .name(activityTeamInfoUpdReq.getName())
-                .productId(activityTeamInfoUpdReq.getProductId())
-                .productImage(activityTeamInfoUpdReq.getProductImage())
-                .introduction(activityTeamInfoUpdReq.getIntroduction())
-                .unit(activityTeamInfoUpdReq.getUnit())
-                .imageList(activityTeamInfoUpdReq.getImageList())
-                .endTime(activityTeamInfoUpdReq.getEndTime())
-                .sort(activityTeamInfoUpdReq.getSort())
-                .content(activityTeamInfoUpdReq.getContent())
-                .status(activityTeamInfoUpdReq.getStatus())
-                .strategyType(activityTeamInfoUpdReq.getStrategyType())
-                .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
-                .build();
-    }
-}

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

@@ -1,5 +1,10 @@
-package com.muyu.marketing.domain.model;
+package com.muyu.marketing.domain.model;/**
-
+ * @Author：尚志豪
+ * @Package：com.muyu.marketing.domain.model
+ * @Project：2204a-cloud-server-DongZeLiang
+ * @name：ActivityTeamProductSkuInfoModel
+ * @Date：2024/11/26 16:03
+ */
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -9,41 +14,37 @@ import lombok.NoArgsConstructor;
 import java.math.BigDecimal;
 
 /**
- * 商品活动SKU信息模型
+ * @program: 2204a-cloud-server-DongZeLiang
- *
+ * @description: 商品活动SKU信息模型
- * @author DongZeLiang
+ * @author: CuiFu Bo
- * @date 2024-11-26 15:35
+ * @create: 2024-11-26 16:03
- */
+ **/
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ActivityTeamProductSkuInfoModel {
+
     /**
      * 团购商品SKU的ID
      */
     private Long id;
-
     /**
-     * 团ID
+     * 团Id
      */
     private Long teamId;
-
     /**
-     * 商品ID
+     * 商品Id
      */
     private Long productId;
-
     /**
      * 规格SKU
      */
     private String sku;
-
     /**
      * 拼团价格
      */
     private BigDecimal teamPrice;
-
     /**
      * 拼团库存
      */

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

@@ -1,50 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 回显sku模型
- * @author: AoCi Tian
- * @create: 2024-11-26 16:03
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuModel {
-    /**
-     * 规格id
-     */
-    private Long id;
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-
-    public static ActivityTeamProductSkuModel FindBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) {
-        return ActivityTeamProductSkuModel.builder()
-                .id(activityTeamProductSkuInfo.getId())
-                .sku(activityTeamProductSkuInfo.getProductSku())
-                .teamStock(activityTeamProductSkuInfo.getTeamStock())
-                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
-                .build();
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: sku修改模型
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuReqModel {
-    private Long id;
-    private Long teamId;
-    private Long productId;
-    private String productSku;
-    private Long teamStock;
-    private Long remainStock;
-    private BigDecimal teamPrice;
-    public static ActivityTeamProductSkuReqModel activityTeamProductSkuReqModelBuild(ActivityTeamProductSkuReq activityTeamProductSkuReq){
-        return ActivityTeamProductSkuReqModel.builder()
-                .id(activityTeamProductSkuReq.getId())
-                .productId(activityTeamProductSkuReq.getProductId())
-                .teamId(activityTeamProductSkuReq.getTeamId())
-                .productSku(activityTeamProductSkuReq.getProductSku())
-                .remainStock(activityTeamProductSkuReq.getRemainStock())
-                .teamStock(activityTeamProductSkuReq.getTeamStock())
-                .teamPrice(activityTeamProductSkuReq.getTeamPrice())
-                .build();
-    }
-}

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();
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * 拼团活动商品SKU
- *
- * @author DongZeLiang
- * @date 2024-11-27 14:18
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuUpdModel {
-
-    /**
-     * 商品规格ID
-     */
-    private Long id;
-
-    /**
-     * 团购价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 团购库存
-     */
-    private Long teamStock;
-
-    public static ActivityTeamProductSkuUpdModel updReqBuild(TeamProjectSkuInfoUpdReq teamProjectSkuInfoUpdReq){
-        return ActivityTeamProductSkuUpdModel.builder()
-                .id(teamProjectSkuInfoUpdReq.getId())
-                .teamStock(teamProjectSkuInfoUpdReq.getTeamStock())
-                .teamPrice(teamProjectSkuInfoUpdReq.getTeamPrice())
-                .build();
-    }
-}

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) {
-        return TeamProductDiscountPriceModel.builder()
+        return  TeamProductDiscountPriceModel.builder()
                 .productPrice(productPrice)
                 .teamPrice(teamPrice)
                 .discount(

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集合
      */

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

@@ -1,36 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 活动商品规格修改入参
- * @author: AoCi Tian
- * @create: 2024-11-26 19:25
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoUpdReq {
-    private Long id;
-    private String name;
-    private Long productId;
-    private String productImage;
-    private String introduction;
-    private String unit;
-    private String imageList;
-    private Date endTime;
-    private Long sort;
-    private String content;
-    private String status;
-    private String strategyType;
-    private Long strategyId;
-    private ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
-}

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

@@ -1,28 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: sku修改入参
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuReq {
-    private Long id;
-    private Long teamId;
-    private Long productId;
-    private String productSku;
-    private Long teamStock;
-    private Long remainStock;
-    private BigDecimal teamPrice;
-}

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;
-}

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;
-}

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

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -18,7 +19,6 @@ import java.util.List;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class ActivityTeamDetailResp extends BaseEntity {
-
     /**
      * 团购ID
      */
@@ -61,7 +61,7 @@ public class ActivityTeamDetailResp extends BaseEntity {
     /**
      * 商品SkU集合
      */
-    private List<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
+    private List<ActivityTeamProjectSkuResp> ActivityTeamProjectSkuRespList;
     /**
      * 活动详情
      */
@@ -78,4 +78,12 @@ public class ActivityTeamDetailResp extends BaseEntity {
      * 策略ID
      */
     private Long strategyId;
+
+    @NoArgsConstructor
+    @Data
+    public static class ActivityTeamProjectSkuResp{
+        private Long teamStock;
+        private String sku;
+        private BigDecimal teamPrice;
+    }
 }

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

@@ -17,10 +17,9 @@ import java.math.BigDecimal;
 public class ActivityTeamProjectSkuResp {
 
     /**
-     * 团购商品SKU的ID
+     * id
      */
-    private Long productSkuId;
+    private Long id;
-
     /**
      * 规格SKU
      */

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

@@ -1,48 +0,0 @@
-package com.muyu.marketing.domain.resp;
-
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 回显resp
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProjectFindSkuInfoResp {
-    /**
-     * 规格id
-     */
-    private Long id;
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-
-    public static ProjectFindSkuInfoResp projectFindSkuInfoBuild (ActivityTeamProductSkuModel activityTeamProductSkuModel)  {
-        return ProjectFindSkuInfoResp.builder()
-                .teamStock(activityTeamProductSkuModel.getTeamStock())
-                .teamPrice(activityTeamProductSkuModel.getTeamPrice())
-                .id(activityTeamProductSkuModel.getId())
-                .sku(activityTeamProductSkuModel.getSku())
-                .build();
-    }
-}

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

@@ -1,107 +0,0 @@
-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;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 团购活动回显响应
- * @author: AoCi Tian
- * @create: 2024-11-26 15:19
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class TeamInfoFindByIdResp {
-   /**
-    * 拼团id
-    */
-    private Long id;
-    /**
-     * 拼团名称
-     */
-    private String name;
-    /**
-     * 商品ID
-     */
-    private Long productId;
-    /**
-     * 商品活动图
-     */
-    private String productImage;
-    /**
-     * 活动简介
-     */
-    private String introduction;
-    /**
-     * 单位
-     */
-
-    private String unit;
-    /**
-     * 轮播图
-     */
-
-    private String imageList;
-    /**
-     * 活动结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private Date endTime;
-    /**
-     * 活动排序
-     */
-    private Long sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ProjectFindSkuInfoResp> projectSkuInfoAddList;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-
-    public static TeamInfoFindByIdResp teamInfoFindByIdBuild (ActivityTeamDetailModel activityTeamDetailModel){
-     return TeamInfoFindByIdResp.builder()
-              .id(activityTeamDetailModel.getId())
-              .name(activityTeamDetailModel.getName())
-              .productId(activityTeamDetailModel.getProductId())
-              .productImage(activityTeamDetailModel.getProductImage())
-              .introduction(activityTeamDetailModel.getIntroduction())
-              .unit(activityTeamDetailModel.getUnit())
-              .imageList(activityTeamDetailModel.getImageList())
-              .endTime(activityTeamDetailModel.getEndTime())
-              .sort(activityTeamDetailModel.getSort())
-              .projectSkuInfoAddList(activityTeamDetailModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
-//              .projectSkuInfoAddList(
-//                      teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(activityTeamProductSkuModel ->
-//                              ProjectFindSkuInfoResp.projectFindSkuInfoBuild(activityTeamProductSkuModel)).toList()
-//              )
-              .content(activityTeamDetailModel.getContent())
-              .status(activityTeamDetailModel.getStatus())
-              .strategyType(activityTeamDetailModel.getStrategyType())
-              .strategyId(activityTeamDetailModel.getStrategyId())
-              .build();
- }
-}

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

@@ -5,13 +5,13 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
-import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
-import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
+import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,7 +28,9 @@ import java.util.List;
 public class ActivityTeamController {
 
     @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;;
+    private ActivityTeamInfoService activityTeamInfoService;
+    @Autowired
+    private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
     /**
      * 查询营销团购活动列表
@@ -46,6 +48,13 @@ public class ActivityTeamController {
                 }}
         );
     }
+//  "msg": "\r\n### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Unknown column 'remain_stock' in 'field list'" +
+//          "\r\n### The error may exist in com/muyu/marketing/team/mapper/ActivityTeamProductSkuInfoMapper.java (best guess)" +
+//          "\r\n### The error may involve defaultParameterMap" +
+//          "\r\n### The error occurred while setting parameters" +
+//          "\r\n### SQL: SELECT id,team_id,product_id,product_sku,team_stock,remain_stock,team_price,create_by,create_time,update_by,update_time,remark FROM activity_team_product_sku_info WHERE id=?" +
+//          "\r\n### Cause: java.sql.SQLSyntaxErrorException: Unknown column 'remain_stock' in 'field list'" +
+//          "\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Unknown column 'remain_stock' in 'field list'",
 
 
     /**
@@ -53,19 +62,17 @@ public class ActivityTeamController {
      * @param activityTeamInfoSaveReq 添加请求对象
      * @return 结果集
      */
-    @PostMapping
+    @PostMapping("/add")
     public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
     }
-
+    /**
-    @PostMapping("/findById/{id}")
+     * 回显团购活动
-    public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
+     */
-        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
+    @PostMapping("/detail")
-    }
+    public Result<ActivityTeamDetailResp> findListByTeamId(@RequestParam Long teamId) {
-    @PutMapping("/updateByTeamId")
+        ActivityTeamDetailResp activityTeamDetailResp = activityTeamInfoService.findListByTeamId(teamId);
-    public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
+        return Result.success(activityTeamDetailResp);
-        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
-        return Result.success();
     }
 }

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

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

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

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> {
-    
-}

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> {
-    
-}

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

@@ -3,7 +3,12 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
+
+import java.util.List;
 
 public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
 
@@ -20,20 +25,8 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
-
     /**
-     * 根据ID查询商品的详情
+     * 回显团购活动
-     * @param id 团购活动ID
-     * @return 团购详情
      */
-    ActivityTeamDetailModel findDetailById(Long id);
+    ActivityTeamDetailResp findListByTeamId(Long teamId);
-
-    /**
-     * 修改团购活动信息
-     * @param activityTeamInfoUpdModel 团购活动信息
-     * @return 是否成功
-     */
-    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
-
-
 }

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

@@ -3,7 +3,11 @@ 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.model.*;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
+import com.muyu.marketing.domain.model.TeamProductStockModel;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
 
 import java.util.List;
 
@@ -38,36 +42,4 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
-    /**
-     * 通过拼团活动ID获取拼团下商品SKU集合
-     * @param teamId 活动ID
-     * @return 拼团商品SKU集合
-     */
-    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
-
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
-
-    /**
-     * 根据 业务模型 进行 团购商品修改
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
-     */
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
-
-    /**
-     * 根据 业务模型 进行 团购商品批量修改
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
-     */
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
-
-    /**
-     * 一键设置
-     * @param activityTeamProductSkuSettingModel 整体修改模型
-     */
-    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
-        this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
-        this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
-        this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
-    }
 }

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

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

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 IService<TeamStrategyExemption> {
- * 免单
- */
-public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService<TeamStrategyExemption> {
 }

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> {
-}

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> {
-}

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

@@ -1,21 +1,29 @@
 package com.muyu.marketing.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -78,31 +86,21 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
         this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
-
-    /**
-     * 根据ID查询商品的详情
-     * @param id 团购活动ID
-     * @return 团购详情
-     */
     @Override
-    public ActivityTeamDetailModel findDetailById(Long id) {
+    public ActivityTeamDetailResp findListByTeamId(Long teamId) {
-        ActivityTeamInfo activityTeamInfo = this.getById(id);
+        ActivityTeamDetailResp activityTeamDetailResp = new ActivityTeamDetailResp();
-        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
+        ActivityTeamInfo teamInfo = getById(teamId);
-        return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
+        if (null != teamInfo){
-                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
+            BeanUtils.copyProperties(teamInfo,activityTeamDetailResp);
-        );
+            List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamProductSkuInfoService.getActivityTeamProductSkuInfoByTeamId(teamId);
-    }
+            activityTeamDetailResp.setActivityTeamProjectSkuRespList(activityTeamProductSkuInfoList.stream().map(item ->{
-
+                ActivityTeamDetailResp.ActivityTeamProjectSkuResp activityTeamProjectSkuResp = new ActivityTeamDetailResp.ActivityTeamProjectSkuResp();
-    /**
+                BeanUtils.copyProperties(item,activityTeamProjectSkuResp);
-     * 修改团购活动信息
+                activityTeamProjectSkuResp.setTeamStock(item.getTeamStock());
-     * @param activityTeamInfoUpdModel 团购活动信息
+                activityTeamProjectSkuResp.setTeamPrice(item.getTeamPrice());
-     * @return 是否成功
+                return activityTeamProjectSkuResp;
-     */
+            }).collect(Collectors.toList()));
-    @Override
+        }
-    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+        return activityTeamDetailResp;
-        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
-        Assert.isTrue(update,"修改失败");
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
-        return update;
     }
 }

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

@@ -1,18 +1,21 @@
 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.ActivityTeamInfo;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
+import com.muyu.marketing.domain.model.TeamProductStockModel;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import com.muyu.product.cache.ProjectSkuCache;
 import com.muyu.product.domain.ProjectSkuInfo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -20,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityTeamProductSkuInfoMapper, ActivityTeamProductSkuInfo>
@@ -27,6 +31,8 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
 
     @Autowired
     private ProjectSkuCache projectSkuCache;
+    @Autowired
+    private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
     /**
      * 通过团购活动ID获取团购中最优惠的价格
@@ -81,58 +87,5 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         );
     }
 
-    /**
-     * 通过拼团活动ID获取拼团下商品SKU集合
-     *
-     * @param teamId 活动ID
-     * @return 拼团商品SKU集合
-     */
-    @Override
-    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
-        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
-        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();
-    }
 
-    @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()
-        );
-    }
 }

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

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

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
-@Service("team-strategy-exemption")
 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) {
-
-    }
 }

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) {
-
-    }
-}

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) {
-
-    }
-}

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);
-}

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) {
-
-    }
-}

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

@@ -4,9 +4,11 @@ server:
 
 # Spring
 spring:
+  main:
+    allow-circular-references: true
   application:
     # 应用名称
-    name: muyu-buy
+    name: muyu-marketing
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +16,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
         # 配置文件格式
         file-extension: yml
         # 共享配置

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);
-    }
-}

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
         # 配置文件格式
         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: 150.158.86.96:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
+        namespace: 2204a
         # 配置文件格式
         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: 150.158.86.96:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 150.158.86.96:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

sql/product.sql

@@ -4,7 +4,7 @@
  Source Server         : 本地5.7
  Source Server Type    : MySQL
  Source Server Version : 50737
- Source Host           : 127.0.0.1:3306
+ Source Host           : 150.158.86.96:3306
  Source Schema         : product
 
  Target Server Type    : MySQL
@@ -356,10 +356,10 @@ CREATE TABLE `brand_info`  (
 -- ----------------------------
 -- Records of brand_info
 -- ----------------------------
-INSERT INTO `brand_info` VALUES (2, '华为', 'http://127.0.0.1:9300/statics/2024/03/05/仓鼠_20240305092606A001.png', 'Y', '无', ' 几乎一个', 'admin', '2024-03-05 09:26:09', 'admin', '2024-03-08 20:48:35');
+INSERT INTO `brand_info` VALUES (2, '华为', 'http://150.158.86.96:9300/statics/2024/03/05/仓鼠_20240305092606A001.png', 'Y', '无', ' 几乎一个', 'admin', '2024-03-05 09:26:09', 'admin', '2024-03-08 20:48:35');
-INSERT INTO `brand_info` VALUES (3, '苹果', 'http://127.0.0.1:9300/statics/2024/03/05/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240305092615A002.png', 'Y', '无', 'i看机会', 'admin', '2024-03-05 09:26:18', 'admin', '2024-03-08 20:48:26');
+INSERT INTO `brand_info` VALUES (3, '苹果', 'http://150.158.86.96:9300/statics/2024/03/05/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240305092615A002.png', 'Y', '无', 'i看机会', 'admin', '2024-03-05 09:26:18', 'admin', '2024-03-08 20:48:26');
-INSERT INTO `brand_info` VALUES (4, '小米', 'http://127.0.0.1:9300/statics/2024/03/21/1688525436945_20240321112835A002.jpg', 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:39', NULL, NULL);
+INSERT INTO `brand_info` VALUES (4, '小米', 'http://150.158.86.96:9300/statics/2024/03/21/1688525436945_20240321112835A002.jpg', 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:39', NULL, NULL);
-INSERT INTO `brand_info` VALUES (5, '苹果', 'http://127.0.0.1:9300/statics/2024/03/26/647726DD13E751DA201EE4D5E9D2A280_20240326135516A015.jpg', 'Y', '而东风', '他又何必', 'admin', '2024-03-26 13:55:47', NULL, NULL);
+INSERT INTO `brand_info` VALUES (5, '苹果', 'http://150.158.86.96:9300/statics/2024/03/26/647726DD13E751DA201EE4D5E9D2A280_20240326135516A015.jpg', 'Y', '而东风', '他又何必', 'admin', '2024-03-26 13:55:47', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for category_info
@@ -383,23 +383,23 @@ CREATE TABLE `category_info`  (
 -- ----------------------------
 -- Records of category_info
 -- ----------------------------
-INSERT INTO `category_info` VALUES (1, '节点1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170131A002.png', 0, 'Y', '介绍', NULL, 'admin', '2024-02-28 17:09:11', NULL, NULL);
+INSERT INTO `category_info` VALUES (1, '节点1', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170131A002.png', 0, 'Y', '介绍', NULL, 'admin', '2024-02-28 17:09:11', NULL, NULL);
-INSERT INTO `category_info` VALUES (2, '节点1-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170926A003.png', 1, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:31', NULL, NULL);
+INSERT INTO `category_info` VALUES (2, '节点1-1', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170926A003.png', 1, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:31', NULL, NULL);
-INSERT INTO `category_info` VALUES (3, '节点1-1-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170944A004.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:48', NULL, NULL);
+INSERT INTO `category_info` VALUES (3, '节点1-1-1', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170944A004.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:48', NULL, NULL);
-INSERT INTO `category_info` VALUES (4, '节点2', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170956A005.png', 0, 'Y', '', NULL, 'admin', '2024-02-28 17:09:58', NULL, NULL);
+INSERT INTO `category_info` VALUES (4, '节点2', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170956A005.png', 0, 'Y', '', NULL, 'admin', '2024-02-28 17:09:58', NULL, NULL);
-INSERT INTO `category_info` VALUES (5, '节点2-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171012A006.png', 4, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:14', NULL, NULL);
+INSERT INTO `category_info` VALUES (5, '节点2-1', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171012A006.png', 4, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:14', NULL, NULL);
-INSERT INTO `category_info` VALUES (6, '节点2-1-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171031A007.png', 5, 'Y', '', NULL, 'admin', '2024-02-28 17:10:34', NULL, NULL);
+INSERT INTO `category_info` VALUES (6, '节点2-1-1', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171031A007.png', 5, 'Y', '', NULL, 'admin', '2024-02-28 17:10:34', NULL, NULL);
-INSERT INTO `category_info` VALUES (7, '节点1-1-2', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171047A008.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:50', NULL, NULL);
+INSERT INTO `category_info` VALUES (7, '节点1-1-2', 'http://150.158.86.96:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171047A008.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:50', NULL, NULL);
-INSERT INTO `category_info` VALUES (13, '测试-1', 'http://127.0.0.1:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114154A001.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:03', NULL, NULL);
+INSERT INTO `category_info` VALUES (13, '测试-1', 'http://150.158.86.96:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114154A001.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:03', NULL, NULL);
-INSERT INTO `category_info` VALUES (14, '测试1-1', 'http://127.0.0.1:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114209A002.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:22', NULL, NULL);
+INSERT INTO `category_info` VALUES (14, '测试1-1', 'http://150.158.86.96:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114209A002.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:22', NULL, NULL);
-INSERT INTO `category_info` VALUES (15, '测试1-2', 'http://127.0.0.1:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114446A003.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:44:56', NULL, NULL);
+INSERT INTO `category_info` VALUES (15, '测试1-2', 'http://150.158.86.96:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114446A003.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:44:56', NULL, NULL);
-INSERT INTO `category_info` VALUES (16, '测试1-1-1', 'http://127.0.0.1:9300/statics/2024/03/06/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240306162814A001.png', 14, 'Y', NULL, NULL, 'admin', '2024-03-06 16:28:27', NULL, NULL);
+INSERT INTO `category_info` VALUES (16, '测试1-1-1', 'http://150.158.86.96:9300/statics/2024/03/06/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240306162814A001.png', 14, 'Y', NULL, NULL, 'admin', '2024-03-06 16:28:27', NULL, NULL);
-INSERT INTO `category_info` VALUES (17, '顶级1', 'http://127.0.0.1:9300/statics/2024/03/08/花木兰_20240308170205A043.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-08 17:02:31', NULL, NULL);
+INSERT INTO `category_info` VALUES (17, '顶级1', 'http://150.158.86.96:9300/statics/2024/03/08/花木兰_20240308170205A043.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-08 17:02:31', NULL, NULL);
-INSERT INTO `category_info` VALUES (18, '测试1-2-1', 'http://127.0.0.1:9300/statics/2024/03/21/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240321112815A001.png', 15, 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:17', NULL, NULL);
+INSERT INTO `category_info` VALUES (18, '测试1-2-1', 'http://150.158.86.96:9300/statics/2024/03/21/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240321112815A001.png', 15, 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:17', NULL, NULL);
-INSERT INTO `category_info` VALUES (19, '二〇二四年四月九日', 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212327A001.jpg', 15, 'Y', NULL, NULL, 'admin', '2024-04-09 21:23:29', NULL, NULL);
+INSERT INTO `category_info` VALUES (19, '二〇二四年四月九日', 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212327A001.jpg', 15, 'Y', NULL, NULL, 'admin', '2024-04-09 21:23:29', NULL, NULL);
-INSERT INTO `category_info` VALUES (20, '2024年5月15日-1', 'http://127.0.0.1:9300/statics/2024/05/15/1688525436945_20240515194730A001.jpg', 0, 'Y', NULL, NULL, 'admin', '2024-05-15 19:47:42', NULL, NULL);
+INSERT INTO `category_info` VALUES (20, '2024年5月15日-1', 'http://150.158.86.96:9300/statics/2024/05/15/1688525436945_20240515194730A001.jpg', 0, 'Y', NULL, NULL, 'admin', '2024-05-15 19:47:42', NULL, NULL);
-INSERT INTO `category_info` VALUES (21, '2024年5月15日-1-1', 'http://127.0.0.1:9300/statics/2024/05/15/1688527462686_20240515194817A002.jpg', 20, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:19', NULL, NULL);
+INSERT INTO `category_info` VALUES (21, '2024年5月15日-1-1', 'http://150.158.86.96:9300/statics/2024/05/15/1688527462686_20240515194817A002.jpg', 20, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:19', NULL, NULL);
-INSERT INTO `category_info` VALUES (22, '2024年5月15日-1-1-1', 'http://127.0.0.1:9300/statics/2024/05/15/1688527462686_20240515194838A003.jpg', 21, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:46', NULL, NULL);
+INSERT INTO `category_info` VALUES (22, '2024年5月15日-1-1-1', 'http://150.158.86.96:9300/statics/2024/05/15/1688527462686_20240515194838A003.jpg', 21, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:46', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for comment_info
@@ -470,12 +470,12 @@ CREATE TABLE `project_info`  (
 -- ----------------------------
 -- Records of project_info
 -- ----------------------------
-INSERT INTO `project_info` VALUES (1, '测试', '123', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:44:47', NULL, NULL);
+INSERT INTO `project_info` VALUES (1, '测试', '123', '13', '14', '16', 'http://150.158.86.96:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:44:47', NULL, NULL);
-INSERT INTO `project_info` VALUES (2, '测试', '123', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg,http://127.0.0.1:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:45:17', NULL, NULL);
+INSERT INTO `project_info` VALUES (2, '测试', '123', '13', '14', '16', 'http://150.158.86.96:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg,http://150.158.86.96:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:45:17', NULL, NULL);
-INSERT INTO `project_info` VALUES (3, '小米10 pro max ', '<p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092431_20240326110040A008.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092537_20240326110045A009.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092613_20240326110052A010.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092820_20240326110059A011.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/T20210125092733_20240326110106A012.png\"></p>', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 10:58:09', NULL, NULL);
+INSERT INTO `project_info` VALUES (3, '小米10 pro max ', '<p><img src=\"http://150.158.86.96:9300/statics/2024/03/26/20210125092431_20240326110040A008.png\"></p><p><img src=\"http://150.158.86.96:9300/statics/2024/03/26/20210125092537_20240326110045A009.png\"></p><p><img src=\"http://150.158.86.96:9300/statics/2024/03/26/20210125092613_20240326110052A010.png\"></p><p><img src=\"http://150.158.86.96:9300/statics/2024/03/26/20210125092820_20240326110059A011.png\"></p><p><img src=\"http://150.158.86.96:9300/statics/2024/03/26/T20210125092733_20240326110106A012.png\"></p>', '13', '14', '16', 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://150.158.86.96:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://150.158.86.96:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://150.158.86.96:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 10:58:09', NULL, NULL);
-INSERT INTO `project_info` VALUES (4, '小米11 pro max ', '商品非常不错', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 11:17:12', NULL, NULL);
+INSERT INTO `project_info` VALUES (4, '小米11 pro max ', '商品非常不错', '13', '14', '16', 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://150.158.86.96:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://150.158.86.96:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://150.158.86.96:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 11:17:12', NULL, NULL);
-INSERT INTO `project_info` VALUES (5, '测试', '出生时', '13', '15', '19', 'http://127.0.0.1:9300/statics/2024/04/09/1688525436945_20240409212344A002.jpg', 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212346A003.jpg', 'Y', 5, 4, NULL, 'admin', '2024-04-09 21:24:36', NULL, NULL);
+INSERT INTO `project_info` VALUES (5, '测试', '出生时', '13', '15', '19', 'http://150.158.86.96:9300/statics/2024/04/09/1688525436945_20240409212344A002.jpg', 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212346A003.jpg', 'Y', 5, 4, NULL, 'admin', '2024-04-09 21:24:36', NULL, NULL);
-INSERT INTO `project_info` VALUES (6, '测试法违法', '啊收发文', '13', '15', '18', 'http://127.0.0.1:9300/statics/2024/05/15/1688525436945_20240515194921A004.jpg', 'http://127.0.0.1:9300/statics/2024/05/15/1688527462686_20240515194923A005.jpg', 'Y', 5, 4, NULL, 'admin', '2024-05-15 19:50:34', NULL, NULL);
+INSERT INTO `project_info` VALUES (6, '测试法违法', '啊收发文', '13', '15', '18', 'http://150.158.86.96:9300/statics/2024/05/15/1688525436945_20240515194921A004.jpg', 'http://150.158.86.96:9300/statics/2024/05/15/1688527462686_20240515194923A005.jpg', 'Y', 5, 4, NULL, 'admin', '2024-05-15 19:50:34', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for project_sku_info
@@ -499,38 +499,38 @@ CREATE TABLE `project_sku_info`  (
 -- ----------------------------
 -- Records of project_sku_info
 -- ----------------------------
-INSERT INTO `project_sku_info` VALUES (1, 2, '骁龙888-8G-128G', 12, 12.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (1, 2, '骁龙888-8G-128G', 12, 12.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (2, 2, '骁龙888-8G-512G', 565, 565.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (2, 2, '骁龙888-8G-512G', 565, 565.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (3, 2, '骁龙888-16G-128G', 485, 485.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (3, 2, '骁龙888-16G-128G', 485, 485.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (4, 2, '骁龙888-16G-512G', 658, 658.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (4, 2, '骁龙888-16G-512G', 658, 658.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (5, 2, '骁龙888plus-8G-128G', 425, 425.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (5, 2, '骁龙888plus-8G-128G', 425, 425.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (6, 2, '骁龙888plus-8G-512G', 963, 963.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (6, 2, '骁龙888plus-8G-512G', 963, 963.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (7, 2, '骁龙888plus-16G-128G', 875, 875.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (7, 2, '骁龙888plus-16G-128G', 875, 875.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (8, 2, '骁龙888plus-16G-512G', 458, 458.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (8, 2, '骁龙888plus-16G-512G', 458, 458.000000, 'http://150.158.86.96:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (17, 3, '骁龙888-8G-128G', 25, 2999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (17, 3, '骁龙888-8G-128G', 25, 2999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (18, 3, '骁龙888-8G-512G', 25, 3999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (18, 3, '骁龙888-8G-512G', 25, 3999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (19, 3, '骁龙888-16G-128G', 25, 3666.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (19, 3, '骁龙888-16G-128G', 25, 3666.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (20, 3, '骁龙888-16G-512G', 25, 4999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (20, 3, '骁龙888-16G-512G', 25, 4999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (21, 3, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (21, 3, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (22, 3, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (22, 3, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (23, 3, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (23, 3, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (24, 3, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (24, 3, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (25, 4, '骁龙888-8G-128G', 25, 2999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (25, 4, '骁龙888-8G-128G', 25, 2999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (26, 4, '骁龙888-8G-512G', 25, 3999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (26, 4, '骁龙888-8G-512G', 25, 3999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (27, 4, '骁龙888-16G-128G', 25, 3666.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (27, 4, '骁龙888-16G-128G', 25, 3666.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (28, 4, '骁龙888-16G-512G', 25, 4999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (28, 4, '骁龙888-16G-512G', 25, 4999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (29, 4, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (29, 4, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (30, 4, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (30, 4, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (31, 4, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (31, 4, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (32, 4, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (32, 4, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://150.158.86.96:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (33, 5, '骁龙888-8G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (33, 5, '骁龙888-8G-128G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (34, 5, '骁龙888-8G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (34, 5, '骁龙888-8G-512G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (35, 5, '骁龙888-16G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (35, 5, '骁龙888-16G-128G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (36, 5, '骁龙888-16G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (36, 5, '骁龙888-16G-512G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (37, 5, '骁龙888plus-8G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (37, 5, '骁龙888plus-8G-128G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (38, 5, '骁龙888plus-8G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (38, 5, '骁龙888plus-8G-512G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (39, 5, '骁龙888plus-16G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (39, 5, '骁龙888plus-16G-128G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (40, 5, '骁龙888plus-16G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (40, 5, '骁龙888plus-16G-512G', 25, 1256.000000, 'http://150.158.86.96:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for rule_attr_info

sql/ry-config.sql

@@ -4,7 +4,7 @@
  Source Server         : 本地5.7
  Source Server Type    : MySQL
  Source Server Version : 50737
- Source Host           : 127.0.0.1:3306
+ Source Host           : 150.158.86.96:3306
  Source Schema         : ry-config
 
  Target Server Type    : MySQL
@@ -47,16 +47,16 @@ CREATE TABLE `config_info`  (
 -- Records of config_info
 -- ----------------------------
 INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n', 'aaa73b809cfd4d0058893aa13da57806', '2020-05-20 12:00:00', '2022-04-24 10:26:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', '通用配置', 'null', 'null', 'yaml', NULL, '');
-INSERT INTO `config_info` VALUES (2, 'muyu-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  cloud:\n    gateway:\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: muyu-auth\n          uri: lb://muyu-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: muyu-gen\n          uri: lb://muyu-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: muyu-job\n          uri: lb://muyu-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: muyu-system\n          uri: lb://muyu-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: muyu-file\n          uri: lb://muyu-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: muyu-product\n          uri: lb://muyu-product\n          predicates:\n            - Path=/product/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: shopCart\n          uri: lb://muyu-shop-cart\n          predicates:\n            - Path=/shopCart/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n', 'f03d72cd72f12479a46f8aa2889833cf', '2020-05-14 14:17:55', '2024-03-29 06:56:29', 'nacos', '127.0.0.1', '', '', '网关模块', 'null', 'null', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (2, 'muyu-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  cloud:\n    gateway:\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: muyu-auth\n          uri: lb://muyu-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: muyu-gen\n          uri: lb://muyu-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: muyu-job\n          uri: lb://muyu-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: muyu-system\n          uri: lb://muyu-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: muyu-file\n          uri: lb://muyu-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: muyu-product\n          uri: lb://muyu-product\n          predicates:\n            - Path=/product/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: shopCart\n          uri: lb://muyu-shop-cart\n          predicates:\n            - Path=/shopCart/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n', 'f03d72cd72f12479a46f8aa2889833cf', '2020-05-14 14:17:55', '2024-03-29 06:56:29', 'nacos', '150.158.86.96', '', '', '网关模块', 'null', 'null', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (3, 'muyu-auth-dev.yml', 'DEFAULT_GROUP', 'spring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n', '8bd9dada9a94822feeab40de55efced6', '2020-11-20 00:00:00', '2022-09-29 02:48:42', 'nacos', '0:0:0:0:0:0:0:1', '', '', '认证中心', 'null', 'null', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (4, 'muyu-monitor-dev.yml', 'DEFAULT_GROUP', '# spring\nspring:\n  security:\n    user:\n      name: muyu\n      password: 123456\n  boot:\n    admin:\n      ui:\n        title: 若依服务状态监控\n', '6f122fd2bfb8d45f858e7d6529a9cd44', '2020-11-20 00:00:00', '2022-09-29 02:48:54', 'nacos', '0:0:0:0:0:0:0:1', '', '', '监控中心', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (5, 'muyu-system-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n\ngaode:\n  key: 9d17aa33a6d6d32bd34944f0d8ae60cf', '1389042777f9f091c7f95627534a56e3', '2020-11-20 00:00:00', '2024-04-11 03:31:57', 'nacos', '127.0.0.1', '', '', '系统模块', 'null', 'null', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (5, 'muyu-system-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n\ngaode:\n  key: 9d17aa33a6d6d32bd34944f0d8ae60cf', '1389042777f9f091c7f95627534a56e3', '2020-11-20 00:00:00', '2024-04-11 03:31:57', 'nacos', '150.158.86.96', '', '', '系统模块', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (6, 'muyu-gen-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.gen.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 代码生成接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n  # 作者\n  author: DongZeLiang\n  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n  packageName: com.muyu.product\n  # 自动去除表前缀，默认是false\n  autoRemovePre: false\n  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n  tablePrefix: sys_\n', '2eb9f41bee0332235f3baca38e603abb', '2020-11-20 00:00:00', '2024-02-27 03:00:52', 'nacos', '127.0.0.1', '', '', '代码生成', 'null', 'null', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (6, 'muyu-gen-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.gen.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 代码生成接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n  # 作者\n  author: DongZeLiang\n  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n  packageName: com.muyu.product\n  # 自动去除表前缀，默认是false\n  autoRemovePre: false\n  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n  tablePrefix: sys_\n', '2eb9f41bee0332235f3baca38e603abb', '2020-11-20 00:00:00', '2024-02-27 03:00:52', 'nacos', '150.158.86.96', '', '', '代码生成', 'null', 'null', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (7, 'muyu-job-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password: \n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.job.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 定时任务接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n', 'edcf0e3fe13fea07b4ec08b1088f30b3', '2020-11-20 00:00:00', '2022-09-29 02:50:50', 'nacos', '0:0:0:0:0:0:0:1', '', '', '定时任务', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (8, 'muyu-file-dev.yml', 'DEFAULT_GROUP', '# 本地文件上传    \r\nfile:\r\n    domain: http://127.0.0.1:9300\r\n    path: D:/muyu/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://8.129.231.12\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n  url: http://8.129.231.12:9000\r\n  accessKey: minioadmin\r\n  secretKey: minioadmin\r\n  bucketName: test', '5382b93f3d8059d6068c0501fdd41195', '2020-11-20 00:00:00', '2020-12-21 21:01:59', NULL, '0:0:0:0:0:0:0:1', '', '', '文件服务', 'null', 'null', 'yaml', NULL, '');
+INSERT INTO `config_info` VALUES (8, 'muyu-file-dev.yml', 'DEFAULT_GROUP', '# 本地文件上传    \r\nfile:\r\n    domain: http://150.158.86.96:9300\r\n    path: D:/muyu/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://8.129.231.12\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n  url: http://8.129.231.12:9000\r\n  accessKey: minioadmin\r\n  secretKey: minioadmin\r\n  bucketName: test', '5382b93f3d8059d6068c0501fdd41195', '2020-11-20 00:00:00', '2020-12-21 21:01:59', NULL, '0:0:0:0:0:0:0:1', '', '', '文件服务', 'null', 'null', 'yaml', NULL, '');
 INSERT INTO `config_info` VALUES (9, 'sentinel-muyu-gateway', 'DEFAULT_GROUP', '[\r\n    {\r\n        \"resource\": \"muyu-auth\",\r\n        \"count\": 500,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-system\",\r\n        \"count\": 1000,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-gen\",\r\n        \"count\": 200,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-job\",\r\n        \"count\": 300,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    }\r\n]', '9f3a3069261598f74220bc47958ec252', '2020-11-20 00:00:00', '2020-11-20 00:00:00', NULL, '0:0:0:0:0:0:0:1', '', '', '限流策略', 'null', 'null', 'json', NULL, '');
-INSERT INTO `config_info` VALUES (10, 'muyu-product-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/product?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.product\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '644efaa3b18b043cb536b40f0eb2b6bf', '2024-02-26 08:13:17', '2024-02-26 08:13:46', 'nacos', '127.0.0.1', '', '', '系统模块', '', '', 'yaml', '', NULL);
+INSERT INTO `config_info` VALUES (10, 'muyu-product-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/product?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.product\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '644efaa3b18b043cb536b40f0eb2b6bf', '2024-02-26 08:13:17', '2024-02-26 08:13:46', 'nacos', '150.158.86.96', '', '', '系统模块', '', '', 'yaml', '', NULL);
-INSERT INTO `config_info` VALUES (11, 'muyu-shop-cart-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/shop_cart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.shop.cart\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '13a3eadf2d1484790b582fcf76192c1f', '2024-03-29 03:50:12', '2024-03-29 03:51:28', 'nacos', '127.0.0.1', '', '', '系统模块', '', '', 'yaml', '', NULL);
+INSERT INTO `config_info` VALUES (11, 'muyu-shop-cart-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/shop_cart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.shop.cart\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '13a3eadf2d1484790b582fcf76192c1f', '2024-03-29 03:50:12', '2024-03-29 03:51:28', 'nacos', '150.158.86.96', '', '', '系统模块', '', '', 'yaml', '', NULL);
 
 -- ----------------------------
 -- Table structure for config_info_aggr

sql/shop_cart.sql

@@ -4,7 +4,7 @@
  Source Server         : 本地5.7
  Source Server Type    : MySQL
  Source Server Version : 50737
- Source Host           : 127.0.0.1:3306
+ Source Host           : 150.158.86.96:3306
  Source Schema         : shop_cart
 
  Target Server Type    : MySQL