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

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

@@ -123,7 +123,7 @@ public class MiniAppController extends BaseController {
 
             if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
-                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
+                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
             }
 
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);

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

@@ -342,8 +342,9 @@ public class TaPersonController extends BaseController {
     @PostMapping("/wx/user/signin")
     public ResponseBean userSign(HttpServletRequest request) {
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
 
-        return taPersonService.getWxUserSign(openid);
+        return taPersonService.getWxUserSign(openid, orgId);
     }
 
 

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

@@ -503,11 +503,11 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam(required = false) String verifyRemark){
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam(required = false) String verifyRemark, HttpServletRequest request){
         if (null == verifyStatus) {
             return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-
+        Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
@@ -523,7 +523,7 @@ public class TaRecommendCustomerController extends BaseController {
 
                     // 审核通过增加积分
                     if (CommConstant.VERIFY_AGREE == verifyStatus) {
-                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
+                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer, orgId));
                     }
 
                     responseBean.addSuccess(taRecommendCustomer);

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

@@ -49,7 +49,8 @@ public class TaShareController extends BaseController {
     @PutMapping("/wx/{typeOf}/share/{id}")
     public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
         String openid = getOpenId(request);
-        taShareService.makeSure(openid, typeOf, id);
+        Integer orgId = getOrgId(request);
+        taShareService.makeSure(openid, typeOf, id, orgId);
         return ResponseBean.success("");
     }
 }

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

@@ -11,10 +11,12 @@ import org.springframework.context.ApplicationEvent;
 @Data
 public class EventBus extends ApplicationEvent {
 	EventType type;
+	private Integer orgId;
 	
-	public EventBus(Object source, EventType type) {
+	public EventBus(Object source, EventType type, Integer orgId) {
 		super(source);
 		this.type = type;
+		this.orgId = orgId;
 	}
 
 	public enum EventType {

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

@@ -30,19 +30,19 @@ public class EventLisenter {
 	public void handler(EventBus event) {
 		switch (event.getType()) {
 			case SharePoster:
-				getSharePoints((TaShare) event.getSource());
+				getSharePoints((TaShare) event.getSource(), event.getOrgId());
 				break;
 			case DailyCheckin:
-				getCheckinPoints((TaPersonSign) event.getSource());
+				getCheckinPoints((TaPersonSign) event.getSource(), event.getOrgId());
 				break;
 			case RecommendCustomer:
-				getRecommendCustPoints((TaRecommendCustomer) event.getSource());
+				getRecommendCustPoints((TaRecommendCustomer) event.getSource(), event.getOrgId());
 				break;
 			case SignUpAgent:
-				getSignUpPoints((TaPerson) event.getSource());
+				getSignUpPoints((TaPerson) event.getSource(), event.getOrgId());
 				break;
 			case SharePosterAll:
-				getSharePointsAll((String) event.getSource());
+				getSharePointsAll((String) event.getSource(), event.getOrgId());
 				break;
 			default:
 				break;
@@ -50,21 +50,21 @@ public class EventLisenter {
 	}
 
 	// 分享赚积分
-	private void getSharePoints(TaShare taShare) {
-		taPointsRecordsService.sharePoints(taShare);
+	private void getSharePoints(TaShare taShare, Integer orgId) {
+		taPointsRecordsService.sharePoints(taShare, orgId);
 	}
 
 	// 无限制 分享赚积分
-	private void getSharePointsAll(String recommenderId) {
-		taPointsRecordsService.sharePosterAll(recommenderId);
+	private void getSharePointsAll(String recommenderId, Integer orgId) {
+		taPointsRecordsService.sharePosterAll(recommenderId, orgId);
 	}
 
 	// 签到赚积分
-	private void getCheckinPoints(TaPersonSign taPersonSign) { taPointsRecordsService.checkinPoints(taPersonSign); }
+	private void getCheckinPoints(TaPersonSign taPersonSign, Integer orgId) { taPointsRecordsService.checkinPoints(taPersonSign, orgId); }
 
 	// 注册送积分
-	private void getSignUpPoints(TaPerson taPerson) { taPointsRecordsService.signUpPoints(taPerson);}
+	private void getSignUpPoints(TaPerson taPerson, Integer orgId) { taPointsRecordsService.signUpPoints(taPerson, orgId);}
 
 	// 推荐客户送积分
-	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer); }
+	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer, orgId); }
 }

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

@@ -36,7 +36,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     ResponseBean getWxUser(String openid);
 
-    ResponseBean getWxUserSign(String openid);
+    ResponseBean getWxUserSign(String openid, Integer orgId);
 
     TaPerson getPersonByTel(String userPhone);
 

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

@@ -14,15 +14,15 @@ import com.huiju.estateagents.entity.*;
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
-	void sharePoints(TaShare taShare);
+	void sharePoints(TaShare taShare, Integer orgId);
 
-	void checkinPoints(TaPersonSign taPersonSign);
+	void checkinPoints(TaPersonSign taPersonSign, Integer orgId);
 
-	void signUpPoints(TaPerson taPerson);
+	void signUpPoints(TaPerson taPerson, Integer orgId);
 
-	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer);
+	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId);
 
-	void consumeGoodsPoints(TaGoods taGoods);
+	void consumeGoodsPoints(TaGoods taGoods, Integer orgId);
 
 	IPage<TaPointsRecords> getWxRecords(Integer pageNum,Integer pageSize,String personId);
 
@@ -30,5 +30,5 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * 分享积分增加  人员不限制
 	 * @param recommenderId
 	 */
-    void sharePosterAll(String recommenderId);
+    void sharePosterAll(String recommenderId, Integer orgId);
 }

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

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

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

@@ -167,7 +167,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
        // iTaRecommendCustomerService.newByPerson(person);
         
         // 发放积分
-        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
         
         return person;
     }
@@ -368,7 +368,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean getWxUserSign(String openid) {
+    public ResponseBean getWxUserSign(String openid, Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -396,8 +396,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
 
         sign.setPerson(taPerson);
-        pointsRecordsService.checkinPoints(sign);
-        applicationContext.publishEvent(new EventBus(sign, EventBus.EventType.DailyCheckin));
+        pointsRecordsService.checkinPoints(sign, orgId);
+        applicationContext.publishEvent(new EventBus(sign, EventBus.EventType.DailyCheckin, orgId));
 
         return ResponseBean.success("success");
     }

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

@@ -69,7 +69,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 	@Override
-	public void sharePoints(TaShare taShare) {
+	public void sharePoints(TaShare taShare, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
 		if (pointsAmount == 0) {
@@ -92,13 +92,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void sharePosterAll(String recommenderId) {
+	public void sharePosterAll(String recommenderId, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
 		if (pointsAmount == 0) {
@@ -114,13 +114,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson person = taPersonMapper.selectById(recommenderId);
-		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void checkinPoints(TaPersonSign taPersonSign) {
+	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
 		if (pointsAmount == 0) {
@@ -153,13 +153,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount)) {
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void signUpPoints(TaPerson taPerson) {
+	public void signUpPoints(TaPerson taPerson, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
 		if (pointsAmount == 0) {
@@ -180,13 +180,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 
 		// 发放积分
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
 
 	@Override
-	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer) {
+	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
 		// 是否开启积分规则
 		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
 		if (pointsAmount == 0) {
@@ -211,7 +211,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount)) {
+		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
@@ -223,7 +223,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 	@Override
-	public void consumeGoodsPoints(TaGoods taGoods) {
+	public void consumeGoodsPoints(TaGoods taGoods, Integer orgId) {
 		Integer minusPoints = taGoods.getPointPrice();
 		if (null == minusPoints || minusPoints <= 0) {
 			return;
@@ -249,12 +249,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		Integer pointsAmount = 0 - minusPoints;
-		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount)) {
+		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
 
-	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount) {
+	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount, Integer orgId) {
 		TaPointsRecords taPointsRecords = new TaPointsRecords();
 		taPointsRecords.setPersonId(person.getPersonId());
 		taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(),person.getNickname()));
@@ -264,6 +264,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		taPointsRecords.setChangeParams(changeParams);
 		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
 		taPointsRecords.setCreateDate(LocalDateTime.now());
+		taPointsRecords.setOrgId(orgId);
 
 		return taPointsRecordsMapper.insert(taPointsRecords) > 0;
 	}
@@ -282,7 +283,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 //		}
 //	}
 	
-	private void sendPoints(TaPerson person,Integer rulesId,String shareType) {
+	private void sendPoints(TaPerson person,Integer rulesId,String shareType, Integer orgId) {
 		//发放积分
 		QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("rule_id",rulesId);
@@ -301,6 +302,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 			taPointsRecords.setChangeParams(jsonObject.toJSONString());
 			taPointsRecords.setCreateDate(LocalDateTime.now());
 			taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+			taPointsRecords.setOrgId(orgId);
 			taPointsRecordsMapper.insert(taPointsRecords);
 			//添加积分
 			UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();

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

@@ -124,7 +124,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public void makeSure(String openid, String typeOf, String id) {
+    public void makeSure(String openid, String typeOf, String id, Integer orgId) {
         // 查找分享记录
         TaShare taShare = taShareMapper.selectById(id);
         if (null == taShare) {
@@ -161,7 +161,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         // 赠送积分
         // 发放分享积分
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
-            applicationContext.publishEvent(new EventBus(taShare, EventBus.EventType.SharePoster));
+            applicationContext.publishEvent(new EventBus(taShare, EventBus.EventType.SharePoster, orgId));
         }
     }