魏超 5 年之前
父節點
當前提交
c5490c6d1e

+ 4
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java 查看文件

107
         ResponseBean responseBean = new ResponseBean();
107
         ResponseBean responseBean = new ResponseBean();
108
         try {
108
         try {
109
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
109
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
110
+            if  (taShareActivity.getGroupBuyPeople() <= 1){
111
+                responseBean.addError("拼团人数必须大于等于2人");
112
+                return responseBean;
113
+            }
110
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
114
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
111
             taShareActivity.setCityId(cityId);
115
             taShareActivity.setCityId(cityId);
112
             taShareActivity.setOrgId(getOrgId(request));
116
             taShareActivity.setOrgId(getOrgId(request));

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java 查看文件

44
         queryWrapper.eq(endTime != null, "end_time", endTime);
44
         queryWrapper.eq(endTime != null, "end_time", endTime);
45
         queryWrapper.eq(orgId != null, "org_id", orgId);
45
         queryWrapper.eq(orgId != null, "org_id", orgId);
46
         queryWrapper.eq(cityId != null, "city_id", cityId);
46
         queryWrapper.eq(cityId != null, "city_id", cityId);
47
-        queryWrapper.orderByDesc("group_activity_id");
47
+        queryWrapper.orderByAsc("activity_status");
48
+        queryWrapper.orderByAsc("start_time");
48
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
49
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
49
 
50
 
50
         responseBean.addSuccess(taNewsIPage);
51
         responseBean.addSuccess(taNewsIPage);

+ 1
- 0
src/main/resources/mapper/TaShareRecordMapper.xml 查看文件

65
         t.phone,
65
         t.phone,
66
         t.create_time,
66
         t.create_time,
67
         a.group_buy_people,
67
         a.group_buy_people,
68
+        t.join_people,
68
         t.status,
69
         t.status,
69
         t.verification_status,
70
         t.verification_status,
70
         t.verification_code
71
         t.verification_code