Kaynağa Gözat

拼团助力

魏超 5 yıl önce
ebeveyn
işleme
7ff6d92167

+ 39
- 9
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Dosyayı Görüntüle

@@ -10,15 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10 10
 import com.huiju.estateagents.base.BaseController;
11 11
 import com.huiju.estateagents.base.ResponseBean;
12 12
 import com.huiju.estateagents.common.CommConstant;
13
-import com.huiju.estateagents.entity.HelpActivity;
14
-import com.huiju.estateagents.entity.HelpInitiateRecord;
15
-import com.huiju.estateagents.entity.HelpRecord;
16
-import com.huiju.estateagents.entity.TaBuildingDynamic;
17
-import com.huiju.estateagents.entity.TaChannel;
18
-import com.huiju.estateagents.entity.TaPerson;
19
-import com.huiju.estateagents.entity.TaPoster;
20
-import com.huiju.estateagents.entity.TaShareContent;
21
-import com.huiju.estateagents.entity.TdPosterTemplate;
13
+import com.huiju.estateagents.entity.*;
22 14
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
23 15
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
24 16
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -159,6 +151,13 @@ public class HelpActivityController extends BaseController {
159 151
         ResponseBean responseBean = new ResponseBean();
160 152
         Integer orgId = getOrgId(request);
161 153
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
154
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
155
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
156
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
157
+        if (heavyCount != 0){
158
+            responseBean.addError("权重已存在,请重新编辑");
159
+            return responseBean;
160
+        }
162 161
         helpActivity.setCityId(cityId);
163 162
         // 活动暂且定位为未开始
164 163
         helpActivity.setActivityStatus(1);
@@ -201,6 +200,13 @@ public class HelpActivityController extends BaseController {
201 200
     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
202 201
         ResponseBean responseBean = new ResponseBean();
203 202
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
203
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
204
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
205
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
206
+        if (heavyCount != 0){
207
+            responseBean.addError("权重已存在,请重新编辑");
208
+            return responseBean;
209
+        }
204 210
         Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
205 211
         helpActivity.setCityId(cityId);
206 212
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
@@ -264,6 +270,30 @@ public class HelpActivityController extends BaseController {
264 270
         return responseBean;
265 271
     }
266 272
 
273
+    @RequestMapping(value = "/admin/helpActivity/send/{helpActivityId}", method = RequestMethod.PUT)
274
+    public ResponseBean send(@PathVariable String helpActivityId, HttpServletRequest request) {
275
+        ResponseBean responseBean = new ResponseBean();
276
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
277
+        helpActivityQueryWrapper.eq("help_activity_id", helpActivityId);
278
+        HelpActivity helpActivity = taHelpActivityService.getOne(helpActivityQueryWrapper);
279
+        helpActivity.setStatus(1);
280
+        helpActivity.setOrgId(getOrgId(request));
281
+        taHelpActivityService.update(helpActivity, helpActivityQueryWrapper);
282
+        return responseBean;
283
+    }
284
+
285
+    @RequestMapping(value = "/admin/helpActivity/cancel/{helpActivityId}", method = RequestMethod.PUT)
286
+    public ResponseBean cancel(@PathVariable String helpActivityId, HttpServletRequest request) {
287
+        ResponseBean responseBean = new ResponseBean();
288
+        QueryWrapper<HelpActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
289
+        taShareActivityQueryWrapper.eq("help_activity_id", helpActivityId);
290
+        HelpActivity helpActivity = taHelpActivityService.getOne(taShareActivityQueryWrapper);
291
+        helpActivity.setStatus(-1);
292
+        helpActivity.setOrgId(getOrgId(request));
293
+        taHelpActivityService.update(helpActivity, taShareActivityQueryWrapper);
294
+        return responseBean;
295
+    }
296
+
267 297
     @ApiOperation(value = "助力记录", notes = "助力记录")
268 298
     @ApiImplicitParams({
269 299
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),

+ 16
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Dosyayı Görüntüle

@@ -132,6 +132,13 @@ public class TaShareActivityController extends BaseController {
132 132
                 responseBean.addError("拼团人数必须大于等于2人");
133 133
                 return responseBean;
134 134
             }
135
+
136
+            Integer heavyCount = iTaShareActivityService.countNumByHeavy(taShareActivity.getHeavy());
137
+            if (heavyCount != 0){
138
+                responseBean.addError("权重已存在,请重新编辑");
139
+                return responseBean;
140
+            }
141
+
135 142
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
136 143
             taShareActivity.setCityId(cityId);
137 144
             taShareActivity.setOrgId(getOrgId(request));
@@ -186,6 +193,15 @@ public class TaShareActivityController extends BaseController {
186 193
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
187 194
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
188 195
             taShareActivity.setCityId(cityId);
196
+
197
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
198
+            taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
199
+            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
200
+            if (heavyCount != 0){
201
+                responseBean.addError("权重已存在,请重新编辑");
202
+                return responseBean;
203
+            }
204
+
189 205
             if (iTaShareActivityService.updateById(taShareActivity)){
190 206
                 responseBean.addSuccess(taShareActivity);
191 207
             }else {

+ 6
- 1
src/main/java/com/huiju/estateagents/entity/TaShareActivity.java Dosyayı Görüntüle

@@ -114,7 +114,12 @@ public class TaShareActivity implements Serializable {
114 114
      * 置顶
115 115
      */
116 116
     private Integer weight;
117
-    
117
+
118
+    /**
119
+     * 权重,用于排序
120
+     */
121
+    private Integer heavy;
122
+
118 123
     /**
119 124
      * Initiate 发起者  Booster 助力者
120 125
      */

+ 1
- 2
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java Dosyayı Görüntüle

@@ -48,8 +48,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
48 48
         queryWrapper.eq(endTime != null, "end_time", endTime);
49 49
         queryWrapper.eq(orgId != null, "org_id", orgId);
50 50
         queryWrapper.eq(cityId != null, "city_id", cityId);
51
-        queryWrapper.orderByAsc("activity_status");
52
-        queryWrapper.orderByAsc("start_time");
51
+        queryWrapper.orderByDesc("heavy");
53 52
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
54 53
 
55 54
         List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();

+ 1
- 4
src/main/resources/mapper/HelpActivityMapper.xml Dosyayı Görüntüle

@@ -31,10 +31,7 @@
31 31
             and ha.org_id=#{orgId}
32 32
         </where>
33 33
         GROUP BY ha.help_activity_id
34
-        order by ha.activity_status = 0 desc,
35
-                  ha.activity_status = 1 desc,
36
-                  ha.activity_status = 2 desc,
37
-                  ha.start_date asc
34
+        order by ha.heavy desc
38 35
     </select>
39 36
 
40 37
     <update id="updateActivityToUnStart">

+ 1
- 1
src/main/resources/mapper/TaShareActivityMapper.xml Dosyayı Görüntüle

@@ -39,5 +39,5 @@
39 39
     <select id="calParticipateNum" resultType="java.lang.Integer">
40 40
         select t.join_people as num from ta_share_record t where t.group_activity_id = #{groupActivityId} group by t.group_activity_id
41 41
     </select>
42
-
42
+    
43 43
 </mapper>