魏熙美 5 gadus atpakaļ
vecāks
revīzija
0eb8203e90

+ 20
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Parādīt failu

@@ -67,6 +67,9 @@ public class TaBuildingDynamicController extends BaseController {
67 67
     @Autowired
68 68
     private ITaBuildingService iTaBuildingService;
69 69
 
70
+    @Autowired
71
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
72
+
70 73
     @InitBinder
71 74
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
72 75
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -210,9 +213,9 @@ public class TaBuildingDynamicController extends BaseController {
210 213
      * @param request
211 214
      * @return
212 215
      */
213
-    @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
216
+    @ApiOperation(value = "微信端添加活动报名", notes = "微信端添加活动报名")
214 217
     @ApiImplicitParams({
215
-            @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "活动详细信息")
218
+            @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "")
216 219
     })
217 220
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
218 221
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
@@ -222,6 +225,21 @@ public class TaBuildingDynamicController extends BaseController {
222 225
         if (null == taPersons || taPersons.size() != 1) {
223 226
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
224 227
         }
228
+
229
+        TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(taActivityDynamicEnlist.getDynamicId());
230
+
231
+        // 携带的报名人数(是已经包括自己了),不能超过活动总人数
232
+
233
+        // 当前活动已报名的总人数
234
+        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), getOrgId(request));
235
+        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
236
+            return ResponseBean.error("报名失败,超过活动报名的最大人数!", ResponseBean.ERROR_UNAVAILABLE);
237
+        }
238
+
239
+
240
+
241
+
242
+
225 243
         TaPerson person = taPersons.get(0);
226 244
         Integer orgId = getOrgId(request);
227 245
         taActivityDynamicEnlist.setPersonId(person.getPersonId());

+ 15
- 0
src/main/java/com/huiju/estateagents/controller/TaMiniappController.java Parādīt failu

@@ -12,6 +12,7 @@ import com.huiju.estateagents.common.WxUtils;
12 12
 import com.huiju.estateagents.entity.TaMiniapp;
13 13
 import com.huiju.estateagents.service.IMiniAppService;
14 14
 import com.huiju.estateagents.service.ITaMiniappService;
15
+import io.swagger.annotations.ApiOperation;
15 16
 import org.apache.tomcat.jni.Mmap;
16 17
 import org.slf4j.Logger;
17 18
 import org.slf4j.LoggerFactory;
@@ -200,4 +201,18 @@ public class TaMiniappController extends BaseController {
200 201
             return ResponseBean.error("校验不通过", ResponseBean.ERROR_UNAVAILABLE);
201 202
         }
202 203
     }
204
+
205
+    @ApiOperation(value = "获取小程序名称", notes = "获取小程序名称")
206
+    @GetMapping(value = "/admin/getMiniappName")
207
+    public ResponseBean getMiniappName(HttpServletRequest request){
208
+        Integer orgId = getOrgId(request);
209
+        QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
210
+        queryWrapper.eq("org_id", orgId);
211
+        TaMiniapp one = iTaMiniappService.getOne(queryWrapper);
212
+
213
+        ResponseBean responseBean = new ResponseBean();
214
+        responseBean.addSuccess((Object) one.getName());
215
+
216
+        return responseBean;
217
+    }
203 218
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java Parādīt failu

@@ -56,4 +56,9 @@ public class TaActivityDynamicEnlist implements Serializable {
56 56
 
57 57
     private String sharePersonType;
58 58
 
59
+    /**
60
+     * 报名人数
61
+     */
62
+    private Integer attendNum;
63
+
59 64
 }

+ 7
- 0
src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java Parādīt failu

@@ -26,4 +26,11 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
26 26
      * @return
27 27
      */
28 28
     List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
29
+
30
+    /**
31
+     * 查询活动已经报名的总人数
32
+     * @param dynamicId
33
+     * @return
34
+     */
35
+    Integer selectEnlistCount(@Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
29 36
 }

+ 4
- 0
src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml Parādīt failu

@@ -4,4 +4,8 @@
4 4
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
5 5
             select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
6 6
         </select>
7
+
8
+        <select id="selectEnlistCount" resultType="Integer" >
9
+            select sum(attend_num) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
10
+        </select>
7 11
 </mapper>