From 1f615d5c6ac7b116c0bb3f075331197f284b998c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 17 六月 2022 09:21:45 +0800
Subject: [PATCH] Merge branch 'huacheng_shuangzheng' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index b553ba3..4087232 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -119,7 +119,6 @@
             comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
         }
         comActActivityVO.setIsApplets(1);
-        comActActivityVO.setAreaCode(this.getAreaCode());
         Integer status = comActActivityVO.getStatus();
         if (null != status && status.intValue() == 4) {
             comActActivityVO.setIsIng(1);
@@ -356,4 +355,14 @@
         }
         return communityService.listActivitySign(activitySignVO);
     }
+    @ApiOperation(value = "新增服务活动")
+    @PostMapping("activity")
+    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
+        Long communityId = this.getCommunityId();
+        comActActivityVO.setCommunityId(communityId);
+        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
+        comActActivityVO.setStatus(2);
+        comActActivityVO.setHasPrize(0);
+        return communityService.addActivity(comActActivityVO);
+    }
 }

--
Gitblit v1.7.1