Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -95,9 +95,14 @@ public class CommConstant {
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
     
     /**
-     * 注册经纪人
+     * 授权手机号
      */
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
+    
+    /**
+     * 拼团
+     */
+    public final static String POINTS_CHANGE_GROUP = "group";
 
     /**
      * 推荐客户
@@ -447,4 +452,9 @@ public class CommConstant {
      * 必须存在表   td_miniapp_template_type 中
      */
     public static final String MINIAPP_TPL_GROUP = "group-result";
+    
+    /**
+     * 活动以结束
+     */
+    public static final Integer ACTIVITY_STATUS_FINISH = 2;
 }

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

@@ -512,9 +512,8 @@ public class HelpActivityController extends BaseController {
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) String buildingId,
-                                               @RequestParam(value = "type",required = false)Integer type) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
+                                               @RequestParam(value = "buildingId",required = false) String buildingId) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId);
                 return lsit;
         }
 

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

@@ -6,9 +6,13 @@ 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.TaPerson;
+import com.huiju.estateagents.service.IHelpActivityService;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +27,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,8 +51,13 @@ public class HelpInitiateRecordController extends BaseController {
     
     @Autowired
     private ITaPersonService taPersonService;
-
-
+    
+    @Autowired
+    public IHelpRecordService helpRecordService;
+    
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+    
     /**
      * 分页查询列表
      * @param pageNum
@@ -202,6 +214,14 @@ public class HelpInitiateRecordController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        HelpActivity helpActivity = taHelpActivityService.getById(helpInitiateRecord.getHelpActivityId());
+        if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         try {
  
             //查看是否发起过助力
@@ -212,7 +232,14 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecordQueryWrapper.ne("status",-1);
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
             if (null != recordServiceOne){
-                responseBean.addSuccess(recordServiceOne);
+                map.put("helpInitiateRecord",recordServiceOne);
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_record_initiate_id",recordServiceOne.getHelpRecordInitiateId());
+                List<HelpRecord> list = helpRecordService.list(helpRecordQueryWrapper);
+                map.put("helpRecordList",list);
+                responseBean.addSuccess(map);
                 return responseBean;
             }
  
@@ -222,7 +249,9 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
-                responseBean.addSuccess(helpInitiateRecord);
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",new ArrayList<>());
+                responseBean.addSuccess(map);
             }else {
                 responseBean.addError("fail");
             }

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

@@ -161,7 +161,7 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }

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

@@ -128,10 +128,13 @@ public class TaPersonController extends BaseController {
             person.setDepartment(user.getDepartment());
             person.setPost(user.getPosition());
             person.setPhoto(user.getPhoto());
+            if(StringUtils.isEmpty(person.getPhone())){
+                person.setPhone(user.getPhone());
+            }
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("手机号不存在。");
+            responseBean.addError("此手机号未录入到后台系统，请联系营销云管理员。");
         }
         return responseBean;
     }

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

@@ -120,7 +120,13 @@ public class TaPointsRecordsController extends BaseController {
                         result.getRecords().get(i).setRecordName("推荐客户");
                         break;
                     case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
-                        result.getRecords().get(i).setRecordName("注册经纪人");
+                        result.getRecords().get(i).setRecordName("授权手机号");
+                        break;
+                    case CommConstant.POINTS_CHANGE_GROUP:
+                        result.getRecords().get(i).setRecordName("拼团");
+                        break;
+                    case CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN:
+                        result.getRecords().get(i).setRecordName("活动签到");
                         break;
                 }
             }

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

@@ -176,6 +176,9 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String recommendTel;
 
+    @TableField(exist = false)
+    private String intentionName;
+
     /**
      * 推广人
      */

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

@@ -69,4 +69,9 @@ public class TdPointsRules implements Serializable {
      * 积分说明
      */
     private String remark;
+    
+    /**
+     * code
+     */
+    private String code;
 }

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

@@ -40,9 +40,10 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
     /**
      * 微信端查询拼团和助力推首页的活动的
      * @param orgId
+     * @param buildingId
      * @return
      */
-    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
+    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId);
 
     /**
      * 列表 已开始 和 未开始

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

@@ -130,7 +130,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -83,7 +83,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 

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

@@ -52,4 +52,13 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param orgId
 	 */
 	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
+	
+	/**
+	 * 消费拼团积分
+	 * @param person
+	 * @param integral
+	 * @param buildingId
+	 * @param groupActivityId
+	 */
+	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
 }

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

@@ -207,28 +207,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
-        // 根据楼盘id查助力
-        if ("1".equals(type)){
-            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
-            helpActivityQuery.eq("building_id",buildingId);
-            helpActivityQuery.eq("org_id",orgId);
-            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-        // 根据楼盘id查拼团
-        if ("2".equals(type)){
-            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
-            taShareActivityQuery.eq("building_id",buildingId);
-            taShareActivityQuery.eq("org_id",orgId);
-            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
+        // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId);
         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
@@ -76,6 +77,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
 		}
+		if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+			return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+			return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
 		//查看每个人的助力次数
 		Integer helpNum = helpActivity.getHelpNum();
 		

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

@@ -357,9 +357,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
         if(!StringUtils.isEmpty(building)){
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
         }

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

@@ -19,9 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -44,11 +42,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	/**
 	 * 获取规则积分, 0 代表未启用
-	 * @param ruleId
+	 * @param code
 	 * @return
 	 */
-	private Integer getRulePoints(Integer ruleId) {
-		TdPointsRules rule = tdPointsRulesMapper.selectById(ruleId);
+	private Integer getRulePoints(String code,Integer orgId) {
+		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+		tdPointsRulesQueryWrapper.eq("code",code);
+		tdPointsRulesQueryWrapper.eq("org_id",orgId);
+		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
 		if (null == rule) {
 			return 0;
 		}
@@ -70,15 +71,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void sharePoints(TaShare taShare, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-
 		// 已经领取过的不会再次领取
 		String[] params = {
 				"shareId="+String.valueOf(taShare.getShareId()),
@@ -99,14 +100,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void sharePosterAll(String recommenderId, Integer orgId) {
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-
 		String[] params = {
 				"openUser="+recommenderId
 		};
@@ -121,15 +121,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("date="+DateUtils.today());
@@ -160,12 +160,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
+		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_CHECKIN);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
-		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
+		
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taActivityDynamicEnlist.getPersonId());
@@ -188,15 +189,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void signUpPoints(TaPerson taPerson, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taPerson.getPersonId());
@@ -215,15 +215,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			// 推荐人
@@ -343,15 +343,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_DOCUMENT_VERIFY);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
-
 		// 已经领取过的不会再次领取
 		String[] params = {
 				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
@@ -372,14 +371,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_VERIFICATION);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
+		
 
 		// 已经领取过的不会再次领取
 		String[] params = {
@@ -398,4 +398,27 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
+	
+	/**
+	 * 消费拼团积分
+	 *  @param person
+	 * @param integral
+	 * @param buildingId
+	 * @param groupActivityId
+	 */
+	@Override
+	public void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId) {
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
+		taPointsRecords.setPersonId(person.getPersonId());
+		taPointsRecords.setPersonName(person.getNickname());
+		taPointsRecords.setPersonType(person.getPersonType());
+		taPointsRecords.setPointsAmount(-integral);
+		taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GROUP);
+		taPointsRecords.setChangeParams("{\"group_activity_id\":"+groupActivityId+"}");
+		taPointsRecords.setCreateDate(LocalDateTime.now());
+		taPointsRecords.setOrgId(person.getOrgId());
+		taPointsRecords.setBuildingId(buildingId);
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+		taPointsRecordsMapper.insert(taPointsRecords);
+	}
 }

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

@@ -13,16 +13,19 @@ import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaPointsRecordsService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +51,10 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     private TaShareRecordMapper tashareRecordmapper;
     @Autowired
     private IMiniAppService miniAppService;
-
+    
+    @Autowired
+    public ITaPointsRecordsService taPointsRecordsService;
+    
     @Override
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
         IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
@@ -133,6 +139,12 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
         }
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         
         //查看这个人是否是团员
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
@@ -158,6 +170,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecord.setOrgId(orgId);
         taShareChildRecord.setStatus(CommConstant.STATUS_NORMAL);
         taShareChildRecord.setPersonId(person.getPersonId());
+        taShareChildRecord.setCreateTime(LocalDateTime.now());
         taShareChildRecordMapper.insert(taShareChildRecord);
         if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
             //发送微信模板消息所有人都发送
@@ -174,6 +187,11 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             taShareRecord.setEndTime(LocalDateTime.now());
         }
         tashareRecordmapper.updateById(taShareRecord);
+        //扣取积分,更新参团人数
+        person.setPoints(person.getPoints() - taShareActivity.getIntegral());
+        taPersonMapper.updateById(person);
+        //写入积分流水表
+        taPointsRecordsService.saveGroupRecord(person,taShareActivity.getIntegral(),taShareActivity.getBuildingId(),taShareActivity.getGroupActivityId());
         Map<String,Object> map = new HashMap<>();
         map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
         map.put("taShareRecord",taShareRecord);

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

@@ -5,6 +5,7 @@ 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.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
@@ -17,13 +18,17 @@ import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.po.TaShareRecordPO;
+import com.huiju.estateagents.service.ITaPointsRecordsService;
 import com.huiju.estateagents.service.ITaShareRecordService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,6 +49,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareRecordMapper taShareRecordMapper;
     @Autowired
     private TaShareChildRecordMapper taShareChildRecordMapper;
+    
+    @Autowired
+    public ITaPointsRecordsService taPointsRecordsService;
 
     @Override
     public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
@@ -181,15 +189,28 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
      */
     @Override
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
-        TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
-    
+        Map<String,Object> map = new HashMap<>();
+        TaShareActivity taShareActivity = activityMapper.selectById(taShareRecord.getGroupActivityId());
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taShareRecord.getPersonId());
         queryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
         TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
     
         if (record != null){
-            return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
+            map.put("record",record);
+            QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+            taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
+            taShareChildRecordQueryWrapper.eq("org_id",orgId);
+            taShareChildRecordQueryWrapper.eq("record_id",record.getRecordId());
+            List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+            map.put("shareChildRecordList",shareChildRecordList);
+            return ResponseBean.success(map);
         }
         if (null == taShareActivity.getIntegral()){
             taShareActivity.setIntegral(0);
@@ -200,6 +221,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         //扣取积分,更新参团人数
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
         taPersonMapper.updateById(person);
+        //写入积分流水表
+        taPointsRecordsService.saveGroupRecord(person,taShareActivity.getIntegral(),taShareActivity.getBuildingId(),taShareActivity.getGroupActivityId());
+        
         taShareRecord.setJoinPeople(1);
         //保存拼团团长数据
         taShareRecord.setOrgId(orgId);
@@ -207,6 +231,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         taShareRecord.setCreateTime(LocalDateTime.now());
         taShareRecord.setStatus(1);
         taShareRecordMapper.insert(taShareRecord);
-        return ResponseBean.success(taShareRecord);
+        map.put("record",taShareRecord);
+        map.put("shareChildRecordList",new ArrayList<>());
+        return ResponseBean.success(map);
     }
 }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -38,44 +38,18 @@
     </select>
 
     <update id="updateUnStartHelpActivity">
-        update ta_help_activity
+        update ta_help_activity t
         set activity_status = 0
         where
-        help_activity_id in (
-            select
-            help_activity_id
-            from
-            (
-            select
-            t.help_activity_id
-            from
-            ta_help_activity t
-            where
-            t.activity_status != '2'
-            and NOW() > t.start_date
-            and NOW() &lt; t.end_date
-            ) s
-        )
+        t.activity_status != '2' and NOW() BETWEEN t.start_date  and t.end_date
     </update>
 
     <update id="updateProcessingHelpActivity">
-        update ta_help_activity
+        update ta_help_activity t
         set activity_status = 2
         where
-            help_activity_id in (
-                select
-                    help_activity_id
-                from
-                    (
-                        select
-                            t.help_activity_id
-                        from
-                            ta_help_activity t
-                        where
-                            t.activity_status != '2'
+             t.activity_status != '2'
                         and NOW() > t.end_date
-                    ) s
-            )
     </update>
 
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
@@ -86,8 +60,14 @@
 				1 AS type
 			FROM
 				ta_help_activity a
-				WHERE a.is_main = 1
-				and org_id =#{orgId}
+				WHERE
+                  org_id =#{orgId}
+                <if test="buildingId  == null ">
+                  and  a.is_main = 1
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                  and a.building_id = #{buildingId}
+                </if>
 		)
 		UNION ALL
 			(
@@ -97,8 +77,14 @@
 					2 AS type
 				FROM
 					ta_share_activity s
-					WHERE s.sort = 1
-					and org_id =#{orgId}
+					WHERE
+                        org_id =#{orgId}
+                <if test="buildingId  == null ">
+                    and  s.sort = 1
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and s.building_id = #{buildingId}
+                </if>
 			)
     </select>
 

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -3,17 +3,21 @@
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
 
     <update id="updateHelpActivityProcessToEnd">
-      update ta_help_initiate_record a
-        set a.`status` = '2'
-        where
-            a.help_activity_id in (
-                select
-                    t.help_activity_id
-                from
-                    ta_help_activity t
-                where (NOW() > t.end_date or t.activity_status = '2')
-            )
-        and a.`status` = '1'
+--       update ta_help_initiate_record a
+--         set a.`status` = '2'
+--         where
+--             a.help_activity_id in (
+--                 select
+--                     t.help_activity_id
+--                 from
+--                     ta_help_activity t
+--                 where (NOW() > t.end_date or t.activity_status = '2')
+--             )
+--         and a.`status` = '1'
+        update ta_help_initiate_record a
+        left join ta_help_activity b on a.help_activity_id = b.help_activity_id
+        set a.status = '2'
+        where  (NOW() > b.end_date or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
     <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -96,44 +96,17 @@
     </update>
 
     <update id="updateUnStartActivity">
-        update ta_building_dynamic
+        update ta_building_dynamic t
         set activity_status = 0
         where
-        dynamic_id in (
-            select
-            dynamic_id
-            from
-            (
-            select
-            t.dynamic_id
-            from
-            ta_building_dynamic t
-            where
-            t.activity_status != '2'
-            and NOW() > t.create_date
-            and NOW() &lt; t.end_date
-            ) s
-        )
+        t.activity_status = 1 and NOW() between  t.create_date and  t.end_date
     </update>
 
     <update id="updateProcessingActivity">
-        update ta_building_dynamic
+        update ta_building_dynamic t
         set activity_status = 2
         where
-            dynamic_id in (
-                select
-                    dynamic_id
-                from
-                    (
-                        select
-                            t.dynamic_id
-                        from
-                            ta_building_dynamic t
-                        where
-                            t.activity_status != '2'
-                        and NOW() > t.end_date
-                    ) s
-            );
+        t.activity_status =0 and NOW() > t.end_date
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaBuildingMapper.xml

@@ -105,8 +105,8 @@
                     </foreach>
                 </if>
                 <if test="name != null and name !=''">
-                    AND `name` LIKE CONCAT('%',#{name},'%')
-                    OR `building_name` LIKE CONCAT('%',#{name},'%')
+                    AND (`name` LIKE CONCAT('%',#{name},'%')
+                    OR `building_name` LIKE CONCAT('%',#{name},'%'))
                 </if>
             ) as tb
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -106,10 +106,12 @@ FROM
         a.*,
         a.customer_id AS customerId,
         b.NAME AS consultantName,
-        b.tel AS consultTel
+        b.tel AS consultTel,
+        c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
             and a.report_recommend_status = 1

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -16,24 +16,10 @@
     </select>
 
     <update id="updateUnStartGroupActivity">
-        update ta_share_activity
+        update ta_share_activity t
         set activity_status = 0
-        where
-        group_activity_id in (
-            select
-            group_activity_id
-            from
-            (
-            select
-            t.group_activity_id
-            from
-            ta_share_activity t
-            where
-            t.activity_status != '2'
-            and NOW() > t.start_time
-            and NOW() &lt; t.end_time
-            ) s
-        )
+        where t.activity_status != '2'
+            and NOW() BETWEEN t.start_time and t.end_time
     </update>
 
     <update id="updateProcessGroupActivity">

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -3,15 +3,19 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
 
     <update id="updateEndGroupActivity">
+--         update ta_share_child_record a
+--         set a.`status` = '2'
+--         where a.group_activity_id in (
+--             select
+--                     t.group_activity_id
+--                 from
+--                     ta_share_activity t
+--                 where (NOW() > t.end_time or t.activity_status = '2')
+--         ) and a.`status` = '1';
         update ta_share_child_record a
+        LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'
-        where a.group_activity_id in (
-            select
-                    t.group_activity_id
-                from
-                    ta_share_activity t
-                where (NOW() > t.end_time or t.activity_status = '2')
-        ) and a.`status` = '1';
+        where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -3,17 +3,21 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
 
     <update id="updateEndGroupActivity">
+--         update ta_share_record a
+--         set a.`status` = '2'
+--         where
+--             a.group_activity_id in (
+--                 select
+--                     t.group_activity_id
+--                 from
+--                     ta_share_activity t
+--                 where (NOW() > t.end_time or t.activity_status = '2')
+--             )
+--         and a.`status` = '1';
         update ta_share_record a
+        LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'
-        where
-            a.group_activity_id in (
-                select
-                    t.group_activity_id
-                from
-                    ta_share_activity t
-                where (NOW() > t.end_time or t.activity_status = '2')
-            )
-        and a.`status` = '1';
+        where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">