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";
 
     /**
      * 推荐客户

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/TdPointsRules.java

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

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/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,10 +13,12 @@ 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;
@@ -49,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);
@@ -182,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

@@ -18,6 +18,7 @@ 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;
@@ -48,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) {
@@ -186,7 +190,7 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     @Override
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
         Map<String,Object> map = new HashMap<>();
-        TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
+        TaShareActivity taShareActivity = activityMapper.selectById(taShareRecord.getGroupActivityId());
         if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
             return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -217,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);