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

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

@@ -9,10 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
-import com.huiju.estateagents.entity.TaCustomerPerson;
-import com.huiju.estateagents.entity.TaMiniappQrcode;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.mapper.TaShareMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaCustomerPersonService;
 import com.huiju.estateagents.service.ITaPersonService;
@@ -22,8 +21,10 @@ import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -47,6 +48,12 @@ public class MiniAppController {
     @Autowired
     private ITaCustomerPersonService taCustomerPersonService;
 
+    @Resource
+    private ApplicationContext applicationContext;
+
+    @Autowired
+    private TaShareMapper taShareMapper;
+
 
 
     /**
@@ -80,8 +87,10 @@ public class MiniAppController {
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
             personQueryWrapper.eq("mini_openid",session.getOpenid());
             int count = taPersonService.count(personQueryWrapper);
-            if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
 
+            if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+                // 添加积分
+                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid());
             if (null == taPerson) {
@@ -112,6 +121,7 @@ public class MiniAppController {
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
+
             return ResponseBean.success(result);
         } catch (WxErrorException e) {
             System.err.println(e.getError());

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

@@ -28,7 +28,10 @@ public class EventBus extends ApplicationEvent {
 		RecommendCustomer(3),
 
 		// 注册经纪人
-		SignUpAgent(4);
+		SignUpAgent(4),
+
+		// 没有限制的 分享海报加积分
+		SharePosterAll(5);
 
 		private Integer type;
 

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

@@ -41,6 +41,9 @@ public class EventLisenter {
 			case SignUpAgent:
 				getSignUpPoints((TaPerson) event.getSource());
 				break;
+			case SharePosterAll:
+				getSharePointsAll((String) event.getSource());
+				break;
 			default:
 				break;
 		}
@@ -51,6 +54,11 @@ public class EventLisenter {
 		taPointsRecordsService.sharePoints(taShare);
 	}
 
+	// 无限制 分享赚积分
+	private void getSharePointsAll(String recommenderId) {
+		taPointsRecordsService.sharePosterAll(recommenderId);
+	}
+
 	// 签到赚积分
 	private void getCheckinPoints(TaPersonSign taPersonSign) { taPointsRecordsService.checkinPoints(taPersonSign); }
 

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

@@ -22,4 +22,10 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer);
 
 	void consumeGoodsPoints(TaGoods taGoods);
+
+	/**
+	 * 分享积分增加  人员不限制
+	 * @param recommenderId
+	 */
+    void sharePosterAll(String recommenderId);
 }

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

@@ -95,6 +95,28 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 	}
 
+	@Override
+	public void sharePosterAll(String recommenderId) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+
+		String[] params = {
+				"openUser="+recommenderId
+		};
+		String changeParams = String.join("&", params);
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(recommenderId);
+		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
 	@Override
 	public void checkinPoints(TaPersonSign taPersonSign) {
 		// 是否开启积分规则