Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/event/PointsEvent.java

+package com.huiju.estateagents.event;
+
+import lombok.Data;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 积分自定义积分事件
+ * @author FXF
+ * @date 2019-07-30
+ */
+@Data
+public class PointsEvent extends ApplicationEvent {
+	String type = "";
+	
+	public PointsEvent(Object source,String type) {
+		super(source);
+		this.type = type;
+	}
+	
+	
+}

src/main/java/com/huiju/estateagents/lisenter/PointsLisenter.java

+package com.huiju.estateagents.lisenter;
+
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.event.PointsEvent;
+import com.huiju.estateagents.service.ITaPointsRecordsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author FXF
+ * @date 2019-07-30
+ */
+
+@Component
+@Slf4j
+public class PointsLisenter {
+	
+	@Autowired
+	private ITaPointsRecordsService taPointsRecordsService;
+	/**
+	 * 获取积分
+	 * @param event
+	 */
+	@EventListener
+	public void earnPoints(PointsEvent event) {
+		log.info("======发放积分======");
+		if (CommConstant.POINTS_SHARE.equals(event.getType())){
+				taPointsRecordsService.sharePoints(event.getSource().toString());
+		}else if (CommConstant.POINTS_AUTHORIZE.equals(event.getType())){
+			taPointsRecordsService.authPoints(event.getSource().toString());
+		}
+		
+		
+	}
+}

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

 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPointsRecords;
+import com.huiju.estateagents.event.PointsEvent;
 
 /**
  * <p>
  * @since 2019-07-25
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
-
+	
+	void sharePoints(String personId);
+	
+	void authPoints(String personId);
 }

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

 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.PointsEvent;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
+    
+    @Resource
+    private ApplicationContext applicationContext;
 
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
         }
 
         iTaRecommendCustomerService.newByPerson(person);
-
-        //查看是否领取过授权积分
-        QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
-        taPointsRecordsQueryWrapper.eq("person_id", person.getPersonId());
-        taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
-
-        List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
-        if (taPointsRecordsList.size() < 0){
-            //发放积分
-            QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("rule_id",2);
-            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
-            if (null != tdPointsRules) {
-                //插入积分消费流水表
-                TaPointsRecords taPointsRecords = new TaPointsRecords();
-                taPointsRecords.setPersonId(person.getPersonId());
-                taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
-                taPointsRecords.setPersonType(person.getPersonType());
-                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-                taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("person_id",person.getPersonId());
-                taPointsRecords.setChangeParams(jsonObject.toJSONString());
-                taPointsRecords.setCreateDate(LocalDateTime.now());
-                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-                taPointsRecordsMapper.insert(taPointsRecords);
-                //添加积分
-                UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
-                wrapper.eq("person_id", person.getPersonId());
-                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-                taPersonMapper.update(new TaPerson(), taPersonwrapper);
-            }
-        }
-
+        
+        //发放积分(成为经纪人ID 是4)
+        applicationContext.publishEvent(new PointsEvent(person.getPersonId(),CommConstant.POINTS_AUTHORIZE));
+        
         return person;
     }
 

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

 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPointsRecords;
+import com.huiju.estateagents.entity.TdPointsRules;
+import com.huiju.estateagents.event.PointsEvent;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
+import com.huiju.estateagents.mapper.TdPointsRulesMapper;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 积分消费流水表  服务实现类
  */
 @Service
 public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMapper, TaPointsRecords> implements ITaPointsRecordsService {
-
+	@Autowired
+	TaPersonMapper taPersonMapper;
+	
+	@Autowired
+	private TdPointsRulesMapper tdPointsRulesMapper;
+	
+	@Autowired
+	private TaPointsRecordsMapper taPointsRecordsMapper;
+	
+	@Override
+	public void sharePoints(String personId) {
+		TaPerson person = taPersonMapper.selectById(personId);
+		sendPoints(person,2,CommConstant.POINTS_SHARE);
+	}
+	
+	@Override
+	public void authPoints(String personId) {
+		//查看是否领取过授权积分
+		QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
+		taPointsRecordsQueryWrapper.eq("person_id", personId);
+		taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
+		
+		List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
+		if (taPointsRecordsList.size() < 1){
+			TaPerson person = taPersonMapper.selectById(personId);
+			sendPoints(person,4,CommConstant.POINTS_AUTHORIZE);
+		}
+	}
+	
+	private void sendPoints(TaPerson person,Integer rulesId,String shareType) {
+		//发放积分
+		QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("rule_id",rulesId);
+		queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+		TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
+		if (null != tdPointsRules) {
+			//插入积分消费流水表
+			TaPointsRecords taPointsRecords = new TaPointsRecords();
+			taPointsRecords.setPersonId(person.getPersonId());
+			taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
+			taPointsRecords.setPersonType(person.getPersonType());
+			taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+			taPointsRecords.setChangeType(shareType);
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("person_id",person.getPersonId());
+			taPointsRecords.setChangeParams(jsonObject.toJSONString());
+			taPointsRecords.setCreateDate(LocalDateTime.now());
+			taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+			taPointsRecordsMapper.insert(taPointsRecords);
+			//添加积分
+			UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
+			taPersonwrapper.eq("person_id", person.getPersonId());
+			taPersonwrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+			taPersonMapper.update(new TaPerson(), taPersonwrapper);
+		}
+	}
 }

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

 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.google.common.collect.Maps;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.PointsEvent;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
 
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
+    
+    @Resource
+    private ApplicationContext applicationContext;
 
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
 
         //发放分享积分
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
-            QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("rule_id",2);
-            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
-            if (null != tdPointsRules){
-                //插入积分消费流水表
-                TaPointsRecords taPointsRecords = new TaPointsRecords();
-                taPointsRecords.setPersonId(taPerson.getPersonId());
-                taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-                taPointsRecords.setPersonType(taPerson.getPersonType());
-                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-                taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("person_id",taPerson.getPersonId());
-                taPointsRecords.setChangeParams(jsonObject.toJSONString());
-                taPointsRecords.setCreateDate(LocalDateTime.now());
-                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-                taPointsRecordsMapper.insert(taPointsRecords);
-                //添加积分
-                UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
-                wrapper.eq("person_id", taPerson.getPersonId());
-                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-                taPersonMapper.update(new TaPerson(), wrapper);
-            }
+            applicationContext.publishEvent(new PointsEvent(taPerson.getPersonId(),CommConstant.POINTS_SHARE));
         }
         return ResponseBean.success("");
     }