From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
index 81df0a7..665b19a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
 import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderBargainVo;
@@ -48,7 +49,10 @@
     @ApiOperation(value = "分页查询活动列表",response = ComBatteryCommodityActivityVo.class)
     @PostMapping("/page")
     public R queryByPage(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
-        comBatteryCommodityActivity.setStatus(1);
+        comBatteryCommodityActivity.setIsApplets(1);
+        if(comBatteryCommodityActivity.getIsUser().equals(1)){
+            comBatteryCommodityActivity.setUserId(this.getUserId());
+        }
         return this.comBatteryCommodityActivityService.queryByPage(comBatteryCommodityActivity);
     }
 
@@ -63,7 +67,12 @@
     @ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
     @GetMapping("/detail")
     public R detailById(@RequestParam("id") Long id) {
-        return this.comBatteryCommodityActivityService.detailById(id);
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        Long userId = 0L;
+        if(loginUserInfo != null){
+            userId = loginUserInfo.getUserId();
+        }
+        return this.comBatteryCommodityActivityService.detailById(id,userId);
     }
 
     /**
@@ -77,7 +86,7 @@
     @ApiOperation(value = "查询活动列表",response = ComBatteryCommodityActivityVo.class)
     @PostMapping("/list")
     public R queryByList(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
-        comBatteryCommodityActivity.setStatus(1);
+        comBatteryCommodityActivity.setIsApplets(1);
         return this.comBatteryCommodityActivityService.queryByList(comBatteryCommodityActivity);
     }
 
@@ -85,13 +94,22 @@
     @PostMapping("/assorted/dough")
     public R queryByAssortedDoughList(@RequestBody PageComBatteryCommodityOrderCollageTeamDto orderCollageTeamDto) {
         orderCollageTeamDto.setStatus(1);
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        if(loginUserInfo != null){
+            orderCollageTeamDto.setUserId(loginUserInfo.getUserId());
+        }
         return this.orderCollageTeamService.queryByPage(orderCollageTeamDto);
     }
 
     @ApiOperation(value = "查询拼团团队详情",response = ComBatteryCommodityOrderCollageTeamVo.class)
-    @PostMapping("/assorted/dough/detail")
+    @GetMapping("/assorted/dough/detail")
     public R queryByAssortedDoughDetail(@RequestParam("id") Long id) {
-        return this.orderCollageTeamService.detailById(id);
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+        Long userId = 0L;
+        if(loginUserInfo != null){
+            userId = loginUserInfo.getUserId();
+        }
+        return this.orderCollageTeamService.detailById(id,userId);
     }
 
     /**
@@ -102,6 +120,7 @@
     @ApiOperation(value = "创建拼团订单")
     @PostMapping("/start/fight")
     public R startFight(@RequestBody StartFightOrderDto orderDto){
+        orderDto.setUserId(this.getUserId());
         return this.comBatteryCommodityActivityService.startFight(orderDto);
     }
 
@@ -113,6 +132,7 @@
     @ApiOperation(value = "创建砍价订单")
     @PostMapping("/start/bargain")
     public R startBargain(@RequestBody StartBargainOrderDto orderDto){
+        orderDto.setUserId(this.getUserId());
         return this.comBatteryCommodityActivityService.startBargain(orderDto);
     }
 
@@ -124,6 +144,7 @@
     @ApiOperation(value = "帮好友砍价")
     @PostMapping("/start/user/bargain")
     public R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto){
+        orderDto.setUserId(this.getUserId());
         return this.comBatteryCommodityActivityService.startUserBargain(orderDto);
     }
 
@@ -146,6 +167,7 @@
     @ApiOperation(value = "创建秒杀订单")
     @PostMapping("/start/seckill")
     public R startSeckill(@RequestBody StartSeckillOrderDto orderDto){
+        orderDto.setUserId(this.getUserId());
         return this.comBatteryCommodityActivityService.startSeckill(orderDto);
     }
 

--
Gitblit v1.7.1