11.26功能查看详情和修改

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

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

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

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

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

@@ -5,6 +5,8 @@ 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.ActivityTeamInfoupdMoudel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -54,7 +56,7 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 活动排序
    */
-  private long sort;
+  private Integer sort;
   /**
    * 活动详情
    */
@@ -93,4 +95,22 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
+  public static ActivityTeamInfo updreq(ActivityTeamInfoupdMoudel activityTeamInfoupdMoudel){
+    return ActivityTeamInfo.builder()
+            .id(activityTeamInfoupdMoudel.getId())
+            .name(activityTeamInfoupdMoudel.getName())
+            .productId(activityTeamInfoupdMoudel.getProductId())
+            .productImage(activityTeamInfoupdMoudel.getProductImage())
+            .introduction(activityTeamInfoupdMoudel.getIntroduction())
+            .unit(activityTeamInfoupdMoudel.getUnit())
+            .imageList(activityTeamInfoupdMoudel.getImageList())
+            .endTime(activityTeamInfoupdMoudel.getEndTime())
+            .sort(activityTeamInfoupdMoudel.getSort())
+            .content(activityTeamInfoupdMoudel.getContent())
+            .status(activityTeamInfoupdMoudel.getStatus())
+            .strategyType(activityTeamInfoupdMoudel.getStrategyType())
+            .strategyId(activityTeamInfoupdMoudel.getStrategyId())
+            .build();
+  }
+
 }

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

@@ -26,7 +26,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
   /**
    * 活动ID
    */
-  private long teamId;
+  private Long teamId;
   /**
    * 商品ID
    */
@@ -60,6 +60,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
             .remainStock(activityTeamProductSkuAddModel.getTeamStock())
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
-            .build()
+            .build();
   }
 }

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

@@ -101,4 +101,6 @@ public class ActivityTeamInfoAddModel {
                                 .toList()
                 ).build();
     }
+
+
 }

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

@@ -1,6 +1,8 @@
 package com.muyu.marketing.domain.model;
 
 
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import com.muyu.marketing.domain.TeamStrategyExemption;
 import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -36,7 +38,7 @@ public class ActivityTeamProductSkuAddModel {
     /**
      * 规格SKU
      */
-    private String sku;
+    private String productSku;
 
     /**
      * 拼团价格
@@ -48,12 +50,16 @@ public class ActivityTeamProductSkuAddModel {
      */
     private Long teamStock;
 
+    private Long remainStock;
+
     public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
+
         return ActivityTeamProductSkuAddModel.builder()
                 .productId(productId.get())
-                .sku(teamProjectSkuInfoAddReq.getSku())
+                .productSku(teamProjectSkuInfoAddReq.getProductSku())
                 .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
                 .teamPrice(teamProjectSkuInfoAddReq.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) {
-        TeamProductDiscountPriceModel.builder()
+     return    TeamProductDiscountPriceModel.builder()
                 .productPrice(productPrice)
                 .teamPrice(teamPrice)
                 .discount(

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

@@ -3,9 +3,10 @@ package com.muyu.marketing.domain.req;
 import com.muyu.common.core.web.page.PageDomain;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)

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

@@ -19,7 +19,9 @@ public class TeamProjectSkuInfoAddReq {
     /**
      * 规格SKU
      */
-    private String sku;
+    private Long id;
+
+    private String productSku;
 
     /**
      * 拼团价格

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

@@ -6,6 +6,7 @@ import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+
 /**
  * 系统模块
  *

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

@@ -1,19 +1,19 @@
 package com.muyu.marketing.team.controller;
-
+import com.dtflys.forest.annotation.Post;
-
 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.ActivityTeamInfoupdMoudel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 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.ActivityTeamInfoByIdResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -28,7 +28,10 @@ import java.util.List;
 public class ActivityTeamController {
 
     @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;;
+    private ActivityTeamInfoService activityTeamInfoService;
+
+
+
 
     /**
      * 查询营销团购活动列表
@@ -58,4 +61,22 @@ public class ActivityTeamController {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
     }
+
+    @GetMapping("/{teamId}")
+    public Result<ActivityTeamInfoByIdResp> getByid(@PathVariable Long teamId){
+      return Result.success(activityTeamInfoService.getupdId(teamId) ) ;
+
+    }
+
+    @PostMapping("/upd")
+    public Result<String> upd( @RequestBody ActivityTeamInfoupdReq activityTeamInfoupdReq){
+        boolean gettoupd = activityTeamInfoService.gettoupd(ActivityTeamInfoupdMoudel.updreq(activityTeamInfoupdReq));
+       if(gettoupd){
+            return Result.success("修改成功");
+       }else{
+           return Result.success("修改成功");
+       }
+
+    }
+
 }

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

@@ -1,11 +1,11 @@
 package com.muyu.marketing.team.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.*;
-import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoByIdResp;
-import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 
 import java.util.List;
 
@@ -24,4 +24,8 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+    ActivityTeamInfoByIdResp getupdId(Long teamId);
+
+    boolean gettoupd( ActivityTeamInfoupdMoudel updsku);
+
 }

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

@@ -8,7 +8,11 @@ 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.req.TeamProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.req.TeamProjectSkuUpdReq;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoByIdResp;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
@@ -82,4 +86,90 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
         this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
+
+    @Override
+    public ActivityTeamInfoByIdResp getupdId(Long teamId) {
+        ActivityTeamInfo byId = this.getById(teamId);
+
+        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
+
+        List<ActivityTeamProductSkuInfo> list = activityTeamProductSkuInfoService.list(queryWrapper);
+
+        List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqs = list.stream().map(activityTeamProductSkuInfo -> {
+            TeamProjectSkuInfoAddReq build = TeamProjectSkuInfoAddReq.builder()
+                    .productSku(activityTeamProductSkuInfo.getProductSku())
+                    .teamStock(activityTeamProductSkuInfo.getTeamStock())
+                    .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                    .id(activityTeamProductSkuInfo.getId())
+                    .build();
+            return build;
+        }).toList();
+
+       return   ActivityTeamInfoByIdResp.builder()
+                .name(byId.getName())
+                .name(byId.getName())
+                .productId(byId.getProductId())
+                .productImage(byId.getProductImage())
+                .introduction(byId.getIntroduction())
+                .unit(byId.getUnit())
+                .imageList(byId.getImageList())
+                .endTime(byId.getEndTime())
+                .sort(byId.getSort())
+                .teamProjectSkuInfoAddReqList(teamProjectSkuInfoAddReqs)
+                .content(byId.getContent())
+                .status(byId.getStatus())
+                .strategyType(byId.getStrategyType())
+                .strategyId(byId.getStrategyId())
+                .build();
+
+    }
+
+//        private Long id;
+//
+//    private String productSku;
+//
+//    /**
+//     * 拼团价格
+//     */
+//    private BigDecimal teamPrice;
+//
+//    /**
+//     * 拼团库存
+//     */
+//    private Long teamStock;
+
+    @Override
+    public boolean gettoupd(ActivityTeamInfoupdMoudel updsku) {
+        boolean updateById = this.updateById(ActivityTeamInfo.updreq(updsku));
+
+
+        if(updateById){
+            LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,updateById);
+            List<ActivityTeamProductSkuInfo> list = this.activityTeamProductSkuInfoService.list(queryWrapper);
+
+
+//             list.stream().map(
+//                    activityTeamProductSkuInfo -> {
+//                        TeamProjectSkuUpdReq build = TeamProjectSkuUpdReq.builder()
+//                                .id(activityTeamProductSkuInfo.getId())
+//                                .productSku(activityTeamProductSkuInfo.getProductSku())
+//                                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+//                                .teamStock(activityTeamProductSkuInfo.getTeamStock())
+//                                .build();
+//                          return build;
+//                    }).toList();
+
+
+            activityTeamProductSkuInfoService.saveBatch(list);
+
+        }
+        return updateById;
+
+    }
+
+
+
+
 }

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

@@ -13,7 +13,6 @@ import com.muyu.product.cache.ProjectSkuCache;
 import com.muyu.product.domain.ProjectSkuInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;

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

@@ -1,13 +1,11 @@
 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.team.mapper.TeamStrategyExemptionMapper;
 import com.muyu.marketing.team.service.TeamStrategyExemptionService;
 import org.springframework.stereotype.Service;
-
 @Service
 public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption>
     implements TeamStrategyExemptionService {
-    
+
 }

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

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-marketing
+    name: muyu-activity
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.221.130.240:8848
+        namespace: cloud-wang
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.221.130.240:8848
+        namespace: cloud-wang
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpdResp.java

@@ -16,16 +16,12 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class AttributeGroupUpdResp {
-
     /** 属性组编号 */
     private Long id;
-
     /** 组名称 */
     private String name;
-
     /** 状态 */
     private String states;
-
     /**
      * 属性ID集合
      */

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: 124.221.130.240:8848
+        namespace: cloud-wang
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.221.130.240:8848
+        namespace: cloud-wang
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

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