2024/12/5

doc/团购活动修改.java

@@ -30,3 +30,5 @@
 
 "详情": "String"
 }
+
+list:

doc/策略-功能划分

@@ -0,0 +1,17 @@
+
+商品列表 -点击购买 （回显商品详情）
+
+普通
+百人
+团长免单：
+开团-（添加订单的页面 支付）
+开团成功 - （添加订单信息 判断当前人数是否已满）(回显订单信息) 还差x人 邀请好友参团 剩余xx时间
+邀请好友/有人参团 - （添加订单信息 判断当前人数是否已满）
+满员 - （团长支付的钱返还至小钱包） （申请解冻-判断团内订单是否都已完成）
+时间到达但是未邀满 免单失败 但原订单依然生效 可选择继续开团/参团
+
+
+
+
+商品详情
+团购订单列表

muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java

@@ -1,9 +1,8 @@
 package com.muyu.auth.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.auth.form.LoginBody;
 import com.muyu.auth.form.RegisterBody;
 import com.muyu.auth.service.SysLoginService;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.JwtUtils;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.security.auth.AuthUtil;

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

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

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java

@@ -1,9 +1,9 @@
 package com.muyu.common.core.web.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.DateUtils;
 import com.muyu.common.core.utils.PageUtils;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java

@@ -1,5 +1,5 @@
 package com.muyu.common.security.handler;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.HttpStatus;
 import com.muyu.common.core.exception.DemoModeException;
 import com.muyu.common.core.exception.InnerAuthException;
@@ -7,7 +7,6 @@ import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.exception.auth.NotPermissionException;
 import com.muyu.common.core.exception.auth.NotRoleException;
 import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.domain.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;

muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java

@@ -1,7 +1,6 @@
 package com.muyu.gateway.handler;
-
-import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.gateway.service.ValidateCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java

@@ -1,7 +1,6 @@
 package com.muyu.gateway.service;
-
-import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.CaptchaException;
 
 import java.io.IOException;
 

muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -1,5 +1,5 @@
 package com.muyu.gateway.service.impl;
-
+import com.muyu.common.core.domain.Result;
 import com.google.code.kaptcha.Producer;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.constant.Constants;
@@ -7,7 +7,6 @@ import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.sign.Base64;
 import com.muyu.common.core.utils.uuid.IdUtils;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.gateway.config.properties.CaptchaProperties;
 import com.muyu.gateway.model.resp.CaptchaCodeResp;

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

@@ -1,7 +1,6 @@
 # Tomcat
 server:
   port: 8080
-
 # Spring
 spring:
   application:
@@ -14,10 +13,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +34,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 120.46.147.226:8848
+            server-addr: 113.44.75.158:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java

@@ -1,5 +1,4 @@
 package com.muyu.file.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.file.FileUtils;
 import com.muyu.file.service.ISysFileService;

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

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

muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java

@@ -1,8 +1,7 @@
 package com.muyu.gen.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.text.Convert;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

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

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

muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java

@@ -1,11 +1,10 @@
 package com.muyu.job.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.exception.job.TaskException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java

@@ -1,8 +1,7 @@
 package com.muyu.job.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

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

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

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

@@ -7,6 +7,7 @@ import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -129,4 +130,20 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoUpdModel.getStrategyId())
             .build();
   }
+
+  public static ActivityTeamInfo updateBuild (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel){
+    return ActivityTeamInfo.builder()
+            .id(activityTeamProductInfoUpdModel.getTeamId())
+            .productId(activityTeamProductInfoUpdModel.getProductId())
+            .name(activityTeamProductInfoUpdModel.getName())
+            .productImage(activityTeamProductInfoUpdModel.getProductImage())
+            .introduction(activityTeamProductInfoUpdModel.getIntroduction())
+            .unit(activityTeamProductInfoUpdModel.getUnit())
+            .imageList(activityTeamProductInfoUpdModel.getImageList())
+            .endTime(activityTeamProductInfoUpdModel.getEndTime())
+            .strategyType(activityTeamProductInfoUpdModel.getStrategyType())
+            .content(activityTeamProductInfoUpdModel.getContent())
+            .build();
+  }
+
 }

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

@@ -49,6 +49,10 @@ public class ActivityTeamInfoListModel {
      * 拼团商品图片
      */
     private String productImage;
+    /**
+     * 拼团商品id
+     */
+    private Long productId;
     /**
      * 商品价格
      */
@@ -72,20 +76,6 @@ public class ActivityTeamInfoListModel {
 
 
     public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModel.ActivityTeamInfoListModelBuilder, ActivityTeamInfoListModel> function) {
-        ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder()
-                .id(activityTeamInfo.getId())
-                .name(activityTeamInfo.getName())
-//                .openTeamNumber(teamOpenTypeNumber)
-//                .addTeamNumber(teamInTypeNumber)
-//                .attendNumber(teamOpenTypeNumber + teamInTypeNumber)
-                .endTime(activityTeamInfo.getEndTime())
-                .productImage(activityTeamInfo.getProductImage())
-//                .teamPrice(discountPrice.getTeamPrice())
-//                .productPrice(discountPrice.getProductPrice())
-//                .teamStock(teamProductStockModel.getTeamStock())
-//                .remainStock(teamProductStockModel.getRemainStock())
-                .status(activityTeamInfo.getStatus())
-                .build();
         return function.apply(
                 ActivityTeamInfoListModel.builder()
                         .id(activityTeamInfo.getId())

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

@@ -5,13 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
-import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
  * @description: 添加活动模型
  * @author: AoCi Tian
  * @create: 2024-11-26 10:59
@@ -82,7 +79,7 @@ public class ActivityTeamInfoSaveModel {
                 .unit(activityTeamInfoAddModel.getUnit())
                 .imageList(activityTeamInfoAddModel.getImageList())
                 .endTime(activityTeamInfoAddModel.getEndTime())
-                .sort(activityTeamInfoAddModel.getSort())
+                .sort(Long.valueOf(activityTeamInfoAddModel.getSort()))
                 .content(activityTeamInfoAddModel.getContent())
                 .status(activityTeamInfoAddModel.getStatus())
                 .strategyType(activityTeamInfoAddModel.getStrategyType())

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

@@ -10,8 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
- * @description: 活动商品规格修改模型
+ * 活动商品规格修改模型
  * @author: AoCi Tian
  * @create: 2024-11-26 19:25
  **/

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

@@ -0,0 +1,66 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductInfoUpdModel {
+    /**
+     * 活动ID
+     */
+    private Long teamId;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 活动名称
+     */
+    private String name;
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 商品单位
+     */
+    private String unit;
+    /**
+     * 商品轮播图
+     */
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 商品SkU模型
+     */
+    public ActivityTeamUpdSKuModel updSkuList;
+    /**
+     * 活动详情
+     */
+    private String content;
+}

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

@@ -0,0 +1,29 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamUpdSKuModel {
+    /**
+     * 商品规格修改集合
+     */
+    public List<ActivityTeamProductSkuReqModel> skuList;
+
+    /**
+     * 删除商品规格idList
+     */
+    public List<Long> delSkuIdList;
+
+    /**
+     * 添加商品规格List
+     */
+    public List<ActivityTeamProductSkuAddModel> addSkuList;
+}

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

@@ -2,7 +2,6 @@ package com.muyu.marketing.domain.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

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

@@ -48,6 +48,10 @@ public class TeamInfoListResp {
      * 商品价格
      */
     private BigDecimal productPrice;
+    /**
+     * 商品id
+     */
+    private Long productId;
     /**
      * 剩余库存
      */
@@ -80,6 +84,7 @@ public class TeamInfoListResp {
                 .attendNumber(activityTeamInfoListModel.getAttendNumber())
                 .endTime(activityTeamInfoListModel.getEndTime())
                 .teamPrice(activityTeamInfoListModel.getTeamPrice())
+                .productId(activityTeamInfoListModel.getProductId())
                 .productImage(activityTeamInfoListModel.getProductImage())
                 .productPrice(activityTeamInfoListModel.getProductPrice())
                 .remainStock(activityTeamInfoListModel.getRemainStock())

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java

@@ -3,6 +3,7 @@ package com.muyu.marketing;
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
+@MapperScan("com.muyu.marketing.team.mapper")
 public class MuYuMarketIngApplication {
     public static void main (String[] args) {
         SpringApplication.run(MuYuMarketIngApplication.class, args);

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

@@ -53,16 +53,22 @@ public class ActivityTeamController {
      * @param activityTeamInfoSaveReq 添加请求对象
      * @return 结果集
      */
-    @PostMapping
+    @PostMapping("/save")
     public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
     }
 
-    @PostMapping("/findById/{id}")
+    /**
+     * 回显
+     * @param id
+     * @return
+     */
+    @PostMapping("/findTeamById/{id}")
     public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
         return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
     }
+
     @PutMapping("/updateByTeamId")
     public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
         activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));

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

@@ -35,5 +35,5 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      */
     boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
-
+    public boolean update (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel);
 }

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

@@ -46,6 +46,12 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
 
+
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
 
+    public boolean delByIds(List<Long> id);
+
+    public boolean add (List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList);
+
+    public boolean BathSku(ActivityTeamUpdSKuModel activityTeamUpdSKuModels);
 }

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

@@ -35,10 +35,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getKeyWord()), ActivityTeamInfo::getName, activityTeamInfoListQueryModel.getKeyWord());
         queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getStatus()), ActivityTeamInfo::getStatus, activityTeamInfoListQueryModel.getStatus());
 
-        /**
-         * Object<T> -> 创建对象的时候进行的占用
-         * <T> Result<T> 以方法返回值为占用
-         */
         Page<ActivityTeamInfo> activityTeamInfoPage = this.page(activityTeamInfoListQueryModel.buildPage(), queryWrapper);
         List<ActivityTeamInfo> activityTeamInfoList = activityTeamInfoPage.getRecords();
         List<ActivityTeamInfoListModel> activityTeamInfoListModels = activityTeamInfoList.stream()
@@ -57,6 +53,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
                                     .productPrice(discountPrice.getProductPrice())
                                     .teamStock(teamProductStockModel.getTeamStock())
                                     .remainStock(teamProductStockModel.getRemainStock())
+                                    .productId(activityTeamInfo.getProductId())
                                     .build();
                         })).toList();
         TableDataInfo<ActivityTeamInfoListModel> tableDataInfo = new TableDataInfo<>();
@@ -105,4 +102,14 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
         return update;
     }
+
+    @Override
+    public boolean update(ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel) {
+        //修改商品信息
+        this.updateById(ActivityTeamInfo.updateBuild(activityTeamProductInfoUpdModel));
+
+        //修改商品sku信息
+        activityTeamProductSkuInfoService.BathSku(activityTeamProductInfoUpdModel.getUpdSkuList());
+        return true;
+    }
 }

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

@@ -12,11 +12,8 @@ import com.muyu.product.domain.ProjectSkuInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,7 +26,6 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
 
     /**
      * 通过团购活动ID获取团购中最优惠的价格
-     *
      * @param teamId 团购ID
      * @return 优惠价格
      */
@@ -40,7 +36,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         // 优惠模型集合
         Optional<TeamProductDiscountPriceModel> discountPriceModelOptional = teamProductSkuInfoList.stream()
                 .map(activityTeamProductSkuInfo -> {
-                    ProjectSkuInfo projectSkuInfo = projectSkuCache.get(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
+                    ProjectSkuInfo projectSkuInfo = projectSkuCache.getData(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
                     return TeamProductDiscountPriceModel.of(projectSkuInfo.getPrice(), activityTeamProductSkuInfo.getTeamPrice());
                 }).min((o1, o2) -> Double.valueOf(o1.getDiscount() * 100 - o2.getDiscount() * 100).intValue());
 
@@ -92,12 +88,44 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
         List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
         return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
-//        return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
+    }
+
+    @Override
+    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
+        if (null != activityTeamProductSkuReqModelList) {
+            return this.updateBatchById(activityTeamProductSkuReqModelList
+                    .stream()
+                    .map(ActivityTeamProductSkuInfo::updateModelBuild)
+                    .toList());
+        }
+        return true;
+    }
+
+    @Override
+    public boolean delByIds(List<Long> id) {
+        if (null != id) {
+            return this.removeBatchByIds(id);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean add(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList) {
+        if (null != activityTeamProductSkuReqModelList){
+            return this.saveBatch(activityTeamProductSkuReqModelList
+                    .stream()
+                    .map(ActivityTeamProductSkuInfo::modelBuild)
+                    .toList());
+        }
+        return true;
     }
 
     @Transactional
     @Override
-    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
-        return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
+    public boolean BathSku(ActivityTeamUpdSKuModel activityTeamUpdSKuModel){
+        updateBath(activityTeamUpdSKuModel.getSkuList());
+        delByIds(activityTeamUpdSKuModel.getDelSkuIdList());
+        add(activityTeamUpdSKuModel.getAddSkuList());
+        return true;
     }
 }

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

@@ -1,12 +1,11 @@
 # Tomcat
 server:
   port: 9209
-
 # Spring
 spring:
   application:
     # 应用名称
-    name: muyu-buy
+    name: muyu-marketing
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +13,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 113.44.75.158:8848
+        namespace: gxc-muyu
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java

@@ -43,7 +43,7 @@ public class CommentInfoController extends BaseController {
      * 查询商品评论列表
      */
     @ApiOperation("获取商品评论列表")
-    @RequiresPermissions("product:comment:list")
+    //@RequiresPermissions("product:comment:list")
     @GetMapping("/list")
     public Result<TableDataInfo<CommentInfo>> list(CommentInfoQueryReq commentInfoQueryReq) {
         startPage();
@@ -108,4 +108,9 @@ public class CommentInfoController extends BaseController {
     public Result<String> remove(@PathVariable List<Long> ids) {
         return toAjax(commentInfoService.removeBatchByIds(ids));
     }
+
+    @GetMapping("listByProductId/{id}")
+    public List<CommentInfo> listByProductId(@PathVariable Long id) {
+        return commentInfoService.listByProductId(id);
+    }
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java

@@ -99,7 +99,8 @@ public class ProjectInfoController extends BaseController {
     @GetMapping(value = "/detail/{id}")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     public Result<ProjectDetailResp> getDetailInfo(@PathVariable("id") Long id) {
-        return Result.success(projectInfoService.getDetailInfo(id));
+        ProjectDetailResp detailInfo = projectInfoService.getDetailInfo(id);
+        return Result.success(detailInfo);
     }
 
     /**

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java

@@ -1,6 +1,8 @@
 package com.muyu.product.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.muyu.product.domain.CommentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -19,4 +21,10 @@ public interface CommentInfoService extends IService<CommentInfo> {
      */
     public List<CommentInfo> list(CommentInfo commentInfo);
 
+    public default List<CommentInfo> listByProductId(Long id){
+        LambdaUpdateWrapper<CommentInfo> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CommentInfo::getProjectId, id);
+        return list(wrapper);
+    }
+
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.muyu.product.mapper.ProjectInfoMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 商品信息Service业务层处理
@@ -145,6 +146,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
      * @param id 商品ID
      * @return 商品详情
      */
+    @Transactional
     @Override
     public ProjectDetailResp getDetailInfo (Long id) {
         // 商品信息获取
@@ -173,7 +175,11 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
                 .map(RuleAttrAddModel::infoBuild).toList();
 
 
-        CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(projectInfo.getType());
+        String a = String.valueOf(projectInfo.getType());
+        if (projectInfo.getType()==0){
+            a = String.valueOf(projectInfo.getParentType());
+        }
+        CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(Long.valueOf(a));
         List<TemplateAttributeGroupModel> templateAttributeGroupList = templateAttribute.getTemplateAttributeGroupList();
         List<TemplateAttributeModel> templateAttributeList = new ArrayList<>(){{
             addAll(templateAttribute.getTemplateAttributeList());
@@ -194,13 +200,14 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
             notInAttributeIdList.addAll( attributeIdList );
         }
         // 添加上，商品的自有属性
+
+        if (notInAttributeIdList.size()!=0){
             List<AsProductAttributeInfo> productAttributeList = this.asProductAttributeInfoService.list(
                     new LambdaQueryWrapper<>() {{
                         eq(AsProductAttributeInfo::getProductId, projectInfo.getId());
                         notIn(AsProductAttributeInfo::getAttributeId, notInAttributeIdList);
                     }}
             );
-
             List<TemplateAttributeModel> projectAttributeList = new ArrayList<>();
             if (!productAttributeList.isEmpty()){
                 List<Long> attrIdList = productAttributeList.stream()
@@ -218,6 +225,9 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
             if (!projectAttributeList.isEmpty()){
                 templateAttributeList.addAll(projectAttributeList);
             }
+        }
+
+
         return ProjectDetailResp.builder()
                 .projectInfo(projectInfo)
                 .brandInfo(brandInfo)

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

@@ -14,15 +14,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 113.44.75.158:8848
+
+        namespace: gxc-muyu
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 113.44.75.158:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: gxc-muyu
 logging:
   level:
     com.muyu.product.mapper: DEBUG

muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java

@@ -3,12 +3,12 @@ package com.muyu.shop.cart.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.muyu.common.core.domain.Result;
 import com.muyu.shop.cart.domain.req.*;
 import com.muyu.shop.cart.domain.resp.CartDetailResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

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

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

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java

@@ -1,6 +1,5 @@
 package com.muyu.system.controller;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
@@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
-
+import com.muyu.common.core.domain.Result;
 /**
  * 参数配置 信息操作处理
  *

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java

@@ -1,5 +1,5 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java

@@ -1,7 +1,6 @@
 package com.muyu.system.controller;
-
-import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java

@@ -1,5 +1,4 @@
 package com.muyu.system.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.file.FileTypeUtils;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java

@@ -1,5 +1,4 @@
 package com.muyu.system.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

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

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

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

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