bugfix

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -64,7 +64,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		taShareRecordQueryWrapper.eq("org_id",orgId);
 		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
 		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
-		//判断是否报名了助力活动
+		//判断是否发起了助力活动
 		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
 		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
 		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());

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

@@ -164,7 +164,7 @@ public class HelpInitiateRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
-    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         String openid = getOpenId(request);

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

@@ -227,9 +227,9 @@ public class TaChannelController extends BaseController {
     }
 
     /**
-     * 渠道邀请经纪人
+     * 渠道邀请经纪人列表
      */
-    @ApiOperation(value = "渠道邀请经纪人", notes = "渠道邀请经纪人")
+    @ApiOperation(value = "渠道邀请经纪人列表", notes = "渠道邀请经纪人列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "query",value = "姓名"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),

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

@@ -71,8 +71,7 @@ public class TaDocumentVerifyController extends BaseController {
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerifyModel> result = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
-            responseBean.addSuccess(result);
+            responseBean = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("documentVerifyList -=- {}",e.toString());

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

@@ -289,15 +289,15 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="recommendName",required = false) String recommendName,
-                                         @RequestParam(value ="recommendTel",required = false) String recommendTel,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -511,7 +511,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(null == taRecommendCustomer.getVerifyStatus()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
+            if(null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);

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

@@ -108,10 +108,11 @@ public class TaShareActivityController extends BaseController {
     public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
+                                            @RequestParam(value ="buildingId",required = false)String buildingId,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, getOrgId(request));
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

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

@@ -285,7 +285,7 @@ public class TaShareRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

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

@@ -70,7 +70,7 @@ public class TdPointsRulesController extends BaseController {
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             Integer orgId = getOrgId(request);
-            //queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -74,8 +75,8 @@ public class TaDrainageRecordController extends BaseController {
     public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) String startTime,
-                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             @RequestParam(value = "startTime",required = false) LocalDate startTime,
+                                             @RequestParam(value = "endTime",required = false) LocalDate endTime,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -84,8 +85,8 @@ public class TaDrainageRecordController extends BaseController {
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("drainage_id",drainageId);
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.gt(null != startTime,"create_date",startTime);
+            queryWrapper.lt(null != endTime,"create_date",endTime);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainageRecord> result = iTaDrainageRecordService.page(pg, queryWrapper);

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

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.entity;
 import lombok.Data;
-
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -13,6 +12,7 @@ import java.time.LocalDateTime;
  * @since 2019-10-23
  */
 @Data
+
 public class TaDocumentVerifyModel implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -2,12 +2,14 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -22,6 +24,6 @@ public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
     IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("personId") String personId, @Param("orgId")Integer orgId);
 
-    IPage<TaDocumentVerifyModel> getAdminDocumentList(IPage<TaDocumentVerifyModel> page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate,@Param("endDate")LocalDateTime endDate);
+    List<TaDocumentVerifyModel> getAdminDocumentList(Page page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate, @Param("endDate")LocalDateTime endDate);
 
 }

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

@@ -29,4 +29,11 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity();
+
+    /**
+     * 计算成团数
+     * @param groupActivityId
+     * @return
+     */
+    Integer countGroupBuyPeople(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 
@@ -18,7 +19,7 @@ import java.time.LocalDateTime;
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
     IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId);
-
-    IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel,Integer orgId,  LocalDateTime startDate, LocalDateTime endDate);
+    
+    ResponseBean getAdminDocumentList(Integer pageNum, Integer pageSize, String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate);
 
 }

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

@@ -37,5 +37,5 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId);
 }

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

@@ -65,13 +65,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
-			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
-			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaDocumentVerifyModel;
@@ -63,10 +64,11 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
     }
 
     @Override
-    public IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
-        IPage<TaDocumentVerifyModel>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerifyModel> data = documentVerifyMapper.getAdminDocumentList(page,name,tel,orgId,startDate,endDate);
-        return data;
+    public ResponseBean getAdminDocumentList(Integer pageNum, Integer pageSize, String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
+        Page page = new Page<>(pageNum,pageSize);
+        List<TaDocumentVerifyModel> taDocumentVerifyModelList = documentVerifyMapper.getAdminDocumentList(page, name, tel, orgId, startDate, endDate);
+        page.setRecords(taDocumentVerifyModelList);
+        return ResponseBean.success(page);
     }
 
 }

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,8 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
 
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
+    @Autowired
+    private TaShareRecordMapper taShareRecordMapper;
 
     @Override
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
@@ -52,7 +55,9 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
         for (TaShareActivity taShareActivity : taShareActivities){
             Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
+            Integer groupPeoplePeople = taShareRecordMapper.countGroupBuyPeople(taShareActivity.getGroupActivityId());
             taShareActivity.setParticipateNum(participateNum);
+            taShareActivity.setGroupBuyPeople(groupPeoplePeople);
         }
         taNewsIPage.setRecords(taShareActivities);
         responseBean.addSuccess(taNewsIPage);
@@ -70,7 +75,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -80,6 +85,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.in("activity_status", 0, 1);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
+        queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.orderByAsc("activity_status");
         queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -34,5 +34,6 @@
             </trim>
         GROUP BY
             tpir.person_id, tpir.building_id
+        ORDER BY SUM(tpir.intention) DESC
     </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -341,20 +341,20 @@ FROM
             SELECT
               count( 1 )
             FROM
-              ta_recommend_customer tarc
-            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
+              ta_person tp
             WHERE
-              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') = 'customer'
-        ) AS recommedCount,
+              tp.recommend_agent = a.person_id
+        ) AS agentCount,
         (
             SELECT
               count( 1 )
             FROM
               ta_recommend_customer tarc
-            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
             WHERE
-              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') in ('channel agent', 'estate agent')
-        ) AS agentCount
+              tarc.recommend_person = a.person_id
+              and tarc.status = 1
+              and tarc.org_id = #{orgId}
+        ) AS recommedCount
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -131,6 +131,7 @@
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         SELECT
             t.record_id AS id,
+            t.record_id,
             t.group_activity_id,
             t.nickname,
             t.phone,
@@ -154,6 +155,7 @@
 	UNION ALL
         SELECT
             t.child_record_id AS id,
+            t.record_id,
             t.group_activity_id,
             t.nickname,
             t.phone,
@@ -176,4 +178,8 @@
             AND t.person_id = #{personId}
         order by status,create_time desc
     </select>
+
+    <select id="countGroupBuyPeople" resultType="java.lang.Integer">
+        select count(1) From ta_share_record t where t.group_activity_id = #{groupActivityId} GROUP BY t.group_activity_id
+    </select>
 </mapper>