合并

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

@@ -67,7 +67,7 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
             @ApiImplicitParam(dataTypeClass = Data.class, name = "startDate", paramType = "query",value = "活动开始时间"),
             @ApiImplicitParam(dataTypeClass = Data.class, name = "endDate", paramType = "query",value = "活动结束时间"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "活动状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query",value = "活动状态")
     })
     @RequestMapping(value="admin/helpActivity/list",method= RequestMethod.GET)
     public ResponseBean helpActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -77,10 +77,10 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value ="title",required = false) String title,
                                          @RequestParam(value ="startDate",required = false) Data startDate,
                                          @RequestParam(value ="endDate",required = false) Data endDate,
-                                         @RequestParam(value ="status",required = false) Integer status,
+                                         @RequestParam(value ="activityStatus",required = false) Integer activityStatus,
                                          HttpServletRequest request){
         Integer orgId = getOrgId(request);
-        ResponseBean  helpActivityList= taHelpActivityService.helpActivityList(pageNum,pageSize,cityId,buildingId,title,startDate,endDate,status,orgId);
+        ResponseBean  helpActivityList= taHelpActivityService.helpActivityList(pageNum,pageSize,cityId,buildingId,title,startDate,endDate,activityStatus,orgId);
         return helpActivityList;
     }
 
@@ -96,7 +96,7 @@ public class HelpActivityController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
-        helpActivity.setStatus(0);
+        helpActivity.setActivityStatus(0);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
         taHelpActivityService.helpActivityAdd(helpActivity,orgId);
@@ -164,20 +164,20 @@ public class HelpActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
         // 根据状态值判断是置顶还是推首页的操作
-        String  status= object.getString("status");
+        String  activityStatus= object.getString("status");
         String  helpActivityId= object.getString("helpActivityId");
         HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
         // 置顶操作
-        if (status.equals("0")) {
+        if (activityStatus.equals("0")) {
             helpActivity.setWeight(Integer.valueOf(helpActivity.getWeight().equals(0)? 1:0));
         }
         // 推首页
-        if (status.equals("1")){
+        if (activityStatus.equals("1")){
             helpActivity.setIsMain(true==helpActivity.getIsMain()?false:true);
         }
         // 结束活动操作
-        if (status.equals("2")){
-            helpActivity.setStatus(2);
+        if (activityStatus.equals("2")){
+            helpActivity.setActivityStatus(2);
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);
         responseBean.addSuccess(isA);
@@ -188,7 +188,7 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query",value = "助力ID"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "status: 0助力成功，1进行中，2助力失败")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败")
     })
     @RequestMapping(value="admin/helpRecord",method= RequestMethod.GET)
     public ResponseBean helpRecord(@RequestParam(value ="helpActivityId",required = false) Integer helpActivityId,
@@ -220,7 +220,7 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query",value = "发起助力ID"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query",value = "核销码"),
     })
-    @RequestMapping(value="admin/helpInitiateRecordVerify/",method= RequestMethod.POST)
+    @RequestMapping(value="admin/helpInitiateRecordVerify",method= RequestMethod.POST)
     public ResponseBean helpInitiateRecordVerify(@RequestParam(value ="helpRecordInitiateId",required = false) Integer helpRecordInitiateId,
                                                  @RequestParam(value ="verifyCode",required = false) Integer verifyCode){
         ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId,verifyCode);

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

@@ -106,5 +106,9 @@ public class HelpActivity implements Serializable {
      */
     private int cityId;
 
+    /**
+     * 活动状态
+     */
+    private int activityStatus;
 
 }

src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java

@@ -26,9 +26,9 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param title
      * @param startDate
      * @param endDate
-     * @param status
+     * @param activityStatus
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("status")Integer status, @Param("orgId")Integer orgId);
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -24,11 +24,11 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param title
      * @param startDate
      * @param endDate
-     * @param status
+     * @param activityStatus
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer status, Integer orgId);
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId);
 
     /**
      * 活动助力添加

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

@@ -41,10 +41,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     HelpRecordMapper helpRecordMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer status, Integer orgId) {
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, status, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
         responseBean.addSuccess(result);
         return responseBean;
     }
@@ -88,14 +88,14 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
                 }
             }
             // 助力进行中（活动进行中，未结束）
-            if ("helpUnderway".equals(status) && "1".equals(helpActivity.getStatus())) {
+            if ("helpUnderway".equals(status) && helpActivity.getStatus().equals(1)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
             }
             // 活动助力失败
             // 活动进行中（活动已结束）
-            if ("helpUnfinished".equals(status) && "2".equals(helpActivity.getStatus())) {
+            if ("helpUnfinished".equals(status) && helpActivity.getStatus().equals(2)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
@@ -129,7 +129,9 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             return responseBean;
         }
 
-        if (helpInitiateRecord.getVerification().equals(verifyCode)){
+        if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
+            helpInitiateRecord.setVerificationStatus(1);
+            helpInitiateRecordMapper.updateById(helpInitiateRecord);
             responseBean.addSuccess("成功");
         }else {
             responseBean.addError("核销码错误");

src/main/resources/mapper/HelpActivityMapper.xml

@@ -15,8 +15,8 @@
         </if>
         <if test="startDate != null and endDate != null">
         </if>
-        <if test="status != null and status != null">
-            and status = #{status}
+        <if test="activityStatus != null and activityStatus != null">
+            and activity_status = #{activityStatus}
         </if>
             and org_id=#{orgId}
         </where>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -15,12 +15,12 @@
         </if>
        <if test="status == 'helpUnderway'">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`status` = 1
+           AND ha.`activity_status` = 1
        </if>
 
        <if test="status == 'helpUnfinished '">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`status` = 2
+           AND ha.`activity_status` = 2
        </if>
        </where>
     </select>