2204A-cyj(卡片)

doc/加团.md

@@ -0,0 +1,21 @@
+# 拼团活动列表(活动页面)
+    
+# 拼团详情(展示活动页面)
+    #优惠券
+# 开团/加团(用户拼团页面)
+    #选择商品（选择拼团的商品页面）
+    #拼团中  （等待拼团页面）
+    #品团 成功 
+# 订单 
+    # 支付 成功/失败
+# 拼团 
+
+商品详情 
+拼团活动详情 
+拼团类型
+评论 
+
+
+
+
+    

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java

@@ -20,12 +20,12 @@ public class PageDomain {
     /**
      * 当前记录起始索引
      */
-    private Integer pageNum;
+    private Integer pageNum=1;
 
     /**
      * 每页显示记录数
      */
-    private Integer pageSize;
+    private Integer pageSize=3;
 
     /**
      * 排序列

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 18080
 
 # Spring
 spring:
@@ -28,12 +28,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 60.204.150.30:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 60.204.150.30:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

muyu-modules/muyu-marketing/marketing-common/pom.xml

@@ -19,6 +19,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
+
         <!-- 系统公共core -->
         <dependency>
             <groupId>com.muyu</groupId>
@@ -26,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

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

@@ -15,6 +15,7 @@ import com.muyu.marketing.domain.req.TeamInfoListReq;
 import com.muyu.marketing.domain.resp.ActivityTeamInfoResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
+import io.swagger.v3.oas.annotations.security.OAuthScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,11 +39,11 @@ public class ActivityTeamController {
      * 客户端拼团列表
      */
     @PostMapping("/clientList")
-    public Result<PageInfo<ActivityTeamInfoResp>> clientList(@RequestBody TeamInfoListReq teamInfoListReq){
+    public Result<List<ActivityTeamInfoResp>> clientList(@RequestBody TeamInfoListReq teamInfoListReq){
         PageUtils.startPage(teamInfoListReq.getPageNum(),teamInfoListReq.getPageSize());
         List<ActivityTeamInfoResp> activityTeamInfoRespList=activityTeamInfoService.clientList(teamInfoListReq);
         PageInfo<ActivityTeamInfoResp> pageInfo = new PageInfo<>(activityTeamInfoRespList);
-        return Result.success(pageInfo);
+        return Result.success(pageInfo.getList());
 
     }
 

muyu-modules/muyu-marketing/pom.xml

@@ -20,4 +20,5 @@
     <description>
         muyu-marketing营销模块
     </description>
+
 </project>

muyu-visual/muyu-monitor/pom.xml

@@ -15,6 +15,11 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
+
 
         <!-- SpringBoot Admin -->
         <dependency>