拼团助力

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -10,15 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.HelpInitiateRecord;
-import com.huiju.estateagents.entity.HelpRecord;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPoster;
-import com.huiju.estateagents.entity.TaShareContent;
-import com.huiju.estateagents.entity.TdPosterTemplate;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -159,6 +151,13 @@ public class HelpActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
         helpActivity.setActivityStatus(1);
@@ -201,6 +200,13 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
@@ -264,6 +270,30 @@ public class HelpActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/admin/helpActivity/send/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean send(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(helpActivityQueryWrapper);
+        helpActivity.setStatus(1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, helpActivityQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/helpActivity/cancel/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean cancel(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(taShareActivityQueryWrapper);
+        helpActivity.setStatus(-1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, taShareActivityQueryWrapper);
+        return responseBean;
+    }
+
     @ApiOperation(value = "助力记录", notes = "助力记录")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -132,6 +132,13 @@ public class TaShareActivityController extends BaseController {
                 responseBean.addError("拼团人数必须大于等于2人");
                 return responseBean;
             }
+
+            Integer heavyCount = iTaShareActivityService.countNumByHeavy(taShareActivity.getHeavy());
+            if (heavyCount != 0){
+                responseBean.addError("权重已存在，请重新编辑");
+                return responseBean;
+            }
+
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
@@ -186,6 +193,15 @@ public class TaShareActivityController extends BaseController {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
+
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
+            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+            if (heavyCount != 0){
+                responseBean.addError("权重已存在，请重新编辑");
+                return responseBean;
+            }
+
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -114,7 +114,12 @@ public class TaShareActivity implements Serializable {
      * 置顶
      */
     private Integer weight;
-    
+
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * Initiate 发起者  Booster 助力者
      */

src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java

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

src/main/resources/mapper/HelpActivityMapper.xml

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

src/main/resources/mapper/TaShareActivityMapper.xml

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