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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v0.1.1</version>
+	<version>v0.2.1</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 

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

@@ -67,17 +67,22 @@ public class CommConstant {
     /**
      * 签到
      */
-    public final static String POINTS_CHECKIN = "checkin";
+    public final static String POINTS_CHANGE_CHECKIN = "checkin";
     
     /**
      * 分享
      */
-    public final static String POINTS_SHARE = "share";
+    public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
     
     /**
-     * 授权
+     * 注册经纪人
      */
-    public final static String POINTS_AUTHORIZE = "authorize";
+    public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
+
+    /**
+     * 推荐客户
+     */
+    public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
 
 
     /**
@@ -103,17 +108,17 @@ public class CommConstant {
     /**
      * 活动的当前状态1:进行中
      */
-    public static final Integer ACTIVITY_CONDITION_ONE = 1;
+    public static final Integer ACTIVITY_CONDITION_PROCESSING = 1;
 
     /**
      * 活动的当前状态2:未开始
      */
-    public static final Integer ACTIVITY_CONDITION_TWO = 2;
+    public static final Integer ACTIVITY_CONDITION_PREPARE = 2;
 
     /**
      * 活动的当前状态3:结束
      */
-    public static final Integer ACTIVITY_CONDITION_ONE_THREE = 3;
+    public static final Integer ACTIVITY_CONDITION_FINISH = 3;
 
     //=================  首屏广告 / 轮播图 start =======================
 
@@ -205,4 +210,33 @@ public class CommConstant {
     public static final String ENTRY_VERIFY = "verify";
     //=================  客户入口类型 end =======================
 
+    /**
+     * 积分规则开启
+     */
+    public static final Integer POINTS_RULE_ON = 1;
+
+    /**
+     * 积分规则关闭
+     */
+    public static final Integer POINTS_RULE_OFF = 0;
+
+    /**
+     * 签到积分规则
+     */
+    public static final Integer POINTS_RULE_CHECKIN = 1;
+
+    /**
+     * 分享海报积分规则
+     */
+    public static final Integer POINTS_RULE_SHARE_POSTER = 2;
+
+    /**
+     * 推荐客户积分规则
+     */
+    public static final Integer POINTS_RULE_RECOMMENDER_CUSTOMER = 3;
+
+    /**
+     * 注册经纪人积分规则
+     */
+    public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
 }

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

@@ -86,6 +86,21 @@ public class MiniAppController {
         }
     }
 
+    /**
+     * 登陆接口
+     */
+    @PostMapping("/logout")
+    public ResponseBean logout(HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.success("");
+        }
+
+        return ResponseBean.success("");
+    }
+
+
     /**
      * 获取用户信息, 并写入内部人员表
      */

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

@@ -7,6 +7,7 @@ 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.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
@@ -82,7 +83,7 @@ public class TaBuildingDynamicController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                @RequestParam(defaultValue = "false" )boolean mine,
@@ -191,7 +192,11 @@ public class TaBuildingDynamicController extends BaseController {
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         TaBuilding building= taBuildingMapper.selectBuilding(dynamic.getBuildingId());
-        dynamic.setBuildingName(building.getBuildingName());
+
+        if (null != building) {
+            dynamic.setBuildingName(building.getBuildingName());
+        }
+
         responseBean.addSuccess(dynamic);
         return responseBean;
     }

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

@@ -6,13 +6,16 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
@@ -30,9 +33,13 @@ public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
     ITaRecommendCustomerService taRecommendCustomerService;
+
     @Autowired
     ITaPersonService taPersonService;
 
+    @Resource
+    private ApplicationContext applicationContext;
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -236,6 +243,10 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
     public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam String verifyRemark){
+        if (null == verifyStatus) {
+            return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
@@ -243,6 +254,12 @@ public class TaRecommendCustomerController extends BaseController {
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 taRecommendCustomer.setVerifyRemark(verifyRemark);
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+
+                    // 审核通过增加积分
+                    if (CommConstant.VERIFY_AGREE == verifyStatus) {
+                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
+                    }
+
                     responseBean.addSuccess(taRecommendCustomer);
                 }else {
                     responseBean.addError("fail");

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

@@ -38,4 +38,18 @@ public class TaShareController extends BaseController {
 
         return taShareService.getListOf(id, typeOf, pageNumber, pageSize);
     }
+
+    /**
+     * 确认分享, 送积分
+     * @param typeOf
+     * @param id
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/{typeOf}/share/{id}")
+    public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        taShareService.makeSure(openid, typeOf, id);
+        return ResponseBean.success("");
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -106,5 +107,9 @@ public class TaGoods implements Serializable {
      */
     private String address;
 
-
+    /**
+     * 兑换人
+     */
+    @TableField(exist = false)
+    private TaPerson exchanger;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -44,4 +45,7 @@ public class TaPersonSign implements Serializable {
      */
     private Integer durationDays;
 
+    @TableField(exist = false)
+    private TaPerson person;
+
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -60,5 +61,9 @@ public class TaShare implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 分享打开人
+     */
+    @TableField(exist = false)
+    private TaPerson openUser;
 }

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

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.event;
+
+import lombok.Data;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 积分自定义积分事件
+ * @author FXF
+ * @date 2019-07-30
+ */
+@Data
+public class EventBus extends ApplicationEvent {
+	EventType type;
+	
+	public EventBus(Object source, EventType type) {
+		super(source);
+		this.type = type;
+	}
+
+	public enum EventType {
+		// 分享海报
+		SharePoster(1),
+
+		// 签到
+		DailyCheckin(2),
+
+		// 推荐客户
+		RecommendCustomer(3),
+
+		// 注册经纪人
+		SignUpAgent(4);
+
+		private Integer type;
+
+		EventType(Integer type) {
+			this.type = type;
+		}
+
+		public Integer toInt() {
+			return type;
+		}
+	}
+}

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

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.event;
+
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonSign;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TaShare;
+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 EventLisenter {
+	
+	@Autowired
+	private ITaPointsRecordsService taPointsRecordsService;
+
+	/**
+	 * 获取积分
+	 * @param event
+	 */
+	@EventListener
+	public void handler(EventBus event) {
+		switch (event.getType()) {
+			case SharePoster:
+				getSharePoints((TaShare) event.getSource());
+				break;
+			case DailyCheckin:
+				getCheckinPoints((TaPersonSign) event.getSource());
+				break;
+			case RecommendCustomer:
+				getRecommendCustPoints((TaRecommendCustomer) event.getSource());
+				break;
+			case SignUpAgent:
+				getSignUpPoints((TaPerson) event.getSource());
+				break;
+			default:
+				break;
+		}
+	}
+
+	// 分享赚积分
+	private void getSharePoints(TaShare taShare) {
+		taPointsRecordsService.sharePoints(taShare);
+	}
+
+	// 签到赚积分
+	private void getCheckinPoints(TaPersonSign taPersonSign) { taPointsRecordsService.checkinPoints(taPersonSign); }
+
+	// 注册送积分
+	private void getSignUpPoints(TaPerson taPerson) { taPointsRecordsService.signUpPoints(taPerson);}
+
+	// 推荐客户送积分
+	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer); }
+}

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

@@ -1,21 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,8 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaPointsRecords;
-import com.huiju.estateagents.event.PointsEvent;
+import com.huiju.estateagents.entity.*;
 
 /**
  * <p>
@@ -13,8 +12,14 @@ import com.huiju.estateagents.event.PointsEvent;
  * @since 2019-07-25
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
-	
-	void sharePoints(String personId);
-	
-	void authPoints(String personId);
+
+	void sharePoints(TaShare taShare);
+
+	void checkinPoints(TaPersonSign taPersonSign);
+
+	void signUpPoints(TaPerson taPerson);
+
+	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer);
+
+	void consumeGoodsPoints(TaGoods taGoods);
 }

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

@@ -17,4 +17,6 @@ public interface ITaShareService extends IService<TaShare> {
     ResponseBean saveData(String openid, String typeOf, String id);
 
     ResponseBean getListOf(String id, String typeOf, Integer pageNumber, Integer pageSize);
+
+    void makeSure(String openid, String typeOf, String id);
 }

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

@@ -7,6 +7,7 @@ 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.common.StringUtils;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
@@ -98,7 +99,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("building_id", buildingId);
+        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.orderByDesc("create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
@@ -266,15 +267,15 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
         // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
         if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PROCESSING);
         }
         //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
         if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_TWO);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PREPARE);
         }
         //(3:结束)当前时间大于报名结束时间,并且报名状态为1
         if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE_THREE);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_FINISH);
         }
         return taBuildingDynamic;
     }

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

@@ -71,6 +71,9 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		if (taGoods.getTotalNum() < 1){
 			return "此商品无库存";
 		}
+
+		taGoods.setExchanger(taPerson);
+
 		//插入积分消费流水表
 		insertTaPointRecords(taPerson,taGoods);
 		//插入积分兑换记录

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

@@ -12,12 +12,11 @@ import com.huiju.estateagents.common.DateUtils;
 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.event.EventBus;
 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;
@@ -60,12 +59,6 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     TaChatMapper taChatMapper;
-    
-    @Autowired
-    private TdPointsRulesMapper tdPointsRulesMapper;
-    
-    @Autowired
-    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
@@ -153,8 +146,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         iTaRecommendCustomerService.newByPerson(person);
         
-        //发放积分(成为经纪人ID 是4)
-        applicationContext.publishEvent(new PointsEvent(person.getPersonId(),CommConstant.POINTS_AUTHORIZE));
+        // 发放积分
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
         
         return person;
     }
@@ -350,39 +343,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             return ResponseBean.error("签到失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        // 增加积分
-        // 1-7 天积分 1-7, 超过7天按 7 个积分算
-        int points = durationDays >= 7 ? 7 : durationDays;
-        //签到获取积分
-        //TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(1);
-        //int points = tdPointsRules.getPointsAmount();
-        UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
-        wrapper.eq("person_id", taPerson.getPersonId());
-        wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(points));
-//        wrapper.set("points", "points + " + String.valueOf(points));
-        taPersonMapper.update(new TaPerson(), wrapper);
-        
-        //插入积分消费流水表
-        TaPointsRecords taPointsRecords = new TaPointsRecords();
-        taPointsRecords.setPersonId(taPerson.getPersonId());
-        taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-        taPointsRecords.setPersonType(taPerson.getPersonType());
-        taPointsRecords.setPointsAmount(points);
-        taPointsRecords.setChangeType(CommConstant.POINTS_CHECKIN);
-        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);
-
-        Map<String, Object> result = new HashMap<>();
-
-        Integer oldPoints = taPerson.getPoints();
-        if (null == oldPoints) oldPoints = 0;
+        sign.setPerson(taPerson);
+        applicationContext.publishEvent(new EventBus(sign, EventBus.EventType.DailyCheckin));
 
-        result.put("integral", oldPoints + points);
-        return ResponseBean.success(result, "签到成功");
+        return ResponseBean.success("success");
     }
 
     @Override

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

@@ -5,19 +5,19 @@ 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.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 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.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,26 +39,218 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	
 	@Autowired
 	private TaPointsRecordsMapper taPointsRecordsMapper;
-	
+
+	/**
+	 * 获取规则积分, 0 代表未启用
+	 * @param ruleId
+	 * @return
+	 */
+	private Integer getRulePoints(Integer ruleId) {
+		TdPointsRules rule = tdPointsRulesMapper.selectById(ruleId);
+		if (null == rule) {
+			return 0;
+		}
+
+		Integer status = rule.getStatus();
+		return null != status && status.equals(CommConstant.POINTS_RULE_ON) ? rule.getPointsAmount() : 0;
+	}
+
+	private boolean isPointsRecordsExist(String personId, String changeType, String changeParams) {
+		QueryWrapper<TaPointsRecords> query = new QueryWrapper<>();
+		query.eq("person_id", personId)
+			.eq("change_type", changeType)
+			.like(!StringUtils.isEmpty(changeParams), "change_params", changeParams)
+			.eq("status", CommConstant.STATUS_NORMAL);
+
+		Integer count = taPointsRecordsMapper.selectCount(query);
+		return null != count && count > 0;
+	}
+
 	@Override
-	public void sharePoints(String personId) {
-		TaPerson person = taPersonMapper.selectById(personId);
-		sendPoints(person,2,CommConstant.POINTS_SHARE);
+	public void sharePoints(TaShare taShare) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+
+		// 已经领取过的不会再次领取
+		String[] params = {
+				"shareId="+String.valueOf(taShare.getShareId()),
+				"openUser="+taShare.getOpenUser().getPersonId()
+		};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taShare.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
 	}
-	
+
+	@Override
+	public void checkinPoints(TaPersonSign taPersonSign) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
+
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			add("date="+DateUtils.today());
+			add("user="+taPersonSign.getPerson().getPersonId());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taPersonSign.getPerson().getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 添加参数
+		params.add("recId="+taPersonSign.getRecId());
+		changeParams = String.join("&", params);
+
+
+		// 增加积分
+		// 1-7 天积分 1-7, 超过7天按 7 个积分算
+//		Integer durationDays = taPersonSign.getDurationDays();
+//		int points = durationDays >= 7 ? 7 : durationDays;
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
 	@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);
+	public void signUpPoints(TaPerson taPerson) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
+
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			add("user="+taPerson.getPersonId());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taPerson.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
+
+	@Override
+	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
+
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			// 推荐人
+			add("person="+taRecommendCustomer.getPersonId());
+			// 推荐客户手机
+			add("phone="+taRecommendCustomer.getPhone());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taRecommendCustomer.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getPersonId());
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void consumeGoodsPoints(TaGoods taGoods) {
+		Integer minusPoints = taGoods.getPointPrice();
+		if (null == minusPoints || minusPoints <= 0) {
+			return;
+		}
+
+		TaPerson taPerson = taGoods.getExchanger();
+		Integer origPoints = taPerson.getPoints();
+		if (null == origPoints) {
+			origPoints = 0;
+		}
+
+		// 积分不足
+		if (minusPoints > origPoints) {
+			return;
+		}
+
+		String[] params = {
+				"person="+taPerson.getPersonId(),
+				"goods="+String.valueOf(taGoods.getGoodsId()),
+				"points="+String.valueOf(minusPoints)
+		};
+		String changeParams = String.join("&", params);
+
+		// 发放积分
+		Integer pointsAmount = 0 - minusPoints;
+		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount) {
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
+		taPointsRecords.setPersonId(person.getPersonId());
+		taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(),person.getNickname()));
+		taPointsRecords.setPersonType(person.getPersonType());
+		taPointsRecords.setPointsAmount(pointsAmount);
+		taPointsRecords.setChangeType(changeType);
+		taPointsRecords.setChangeParams(changeParams);
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+		taPointsRecords.setCreateDate(LocalDateTime.now());
+
+		return taPointsRecordsMapper.insert(taPointsRecords) > 0;
+	}
+
+//	@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) {
 		//发放积分

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

@@ -1,17 +1,14 @@
 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.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.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +17,7 @@ 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>
@@ -39,12 +34,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
 
     @Autowired
     TaShareMapper taShareMapper;
-    
-    @Autowired
-    private TdPointsRulesMapper tdPointsRulesMapper;
-    
-    @Autowired
-    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Autowired
     private TaBuildingMapper taBuildingMapper;
@@ -103,10 +92,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             taBuildingMapper.setFieldNum(id, "share_num", 1);
         }
 
-        //发放分享积分
-        if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
-            applicationContext.publishEvent(new PointsEvent(taPerson.getPersonId(),CommConstant.POINTS_SHARE));
-        }
         return ResponseBean.success("");
     }
 
@@ -122,6 +107,47 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         return ResponseBean.success(result);
     }
 
+    @Override
+    public void makeSure(String openid, String typeOf, String id) {
+        // 查找分享记录
+        TaShare taShare = taShareMapper.selectById(id);
+        if (null == taShare) {
+            return;
+        }
+
+        // 记录分享人
+        TaPerson shareUsr = taPersonMapper.getById(taShare.getPersonId());
+        if (null == shareUsr) {
+            return;
+        }
+
+        // 如果分享人没有授权手机号
+        if (StringUtils.isEmpty(shareUsr.getPhone()) && StringUtils.isEmpty(shareUsr.getTel())) {
+            return;
+        }
+
+        // 查找打开人
+        List<TaPerson> persons = taPersonMapper.getPersonByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return;
+        }
+        TaPerson openUsr = persons.get(0);
+
+        // 如果打开人员与分享人员是同一个人
+        // 此处通过 personId 来判断，其实并不准确
+        // todo
+        if (openUsr.getPersonId().equals(shareUsr.getPersonId())) {
+            return;
+        }
+
+        taShare.setOpenUser(openUsr);
+
+        // 赠送积分
+        // 发放分享积分
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
+            applicationContext.publishEvent(new EventBus(taShare, EventBus.EventType.SharePoster));
+        }
+    }
 
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);