add events

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

@@ -79,6 +79,11 @@ public class CommConstant {
      */
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
 
+    /**
+     * 推荐客户
+     */
+    public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
+
 
     /**
      * 小程序默认首页

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/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/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/event/EventLisenter.java

@@ -2,6 +2,7 @@ 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;
@@ -35,6 +36,7 @@ public class EventLisenter {
 				getCheckinPoints((TaPersonSign) event.getSource());
 				break;
 			case RecommendCustomer:
+				getRecommendCustPoints((TaRecommendCustomer) event.getSource());
 				break;
 			case SignUpAgent:
 				getSignUpPoints((TaPerson) event.getSource());
@@ -54,4 +56,7 @@ public class EventLisenter {
 
 	// 注册送积分
 	private void getSignUpPoints(TaPerson taPerson) { taPointsRecordsService.signUpPoints(taPerson);}
+
+	// 推荐客户送积分
+	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer); }
 }

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

@@ -1,10 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonSign;
-import com.huiju.estateagents.entity.TaPointsRecords;
-import com.huiju.estateagents.entity.TaShare;
+import com.huiju.estateagents.entity.*;
 
 /**
  * <p>
@@ -22,4 +19,7 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
 	void signUpPoints(TaPerson taPerson);
 
+	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer);
+
+	void consumeGoodsPoints(TaGoods taGoods);
 }

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

@@ -59,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;

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

@@ -161,6 +161,69 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 	}
 
+	@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());