积分

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

@@ -125,6 +125,9 @@ public class TaPointsRecordsController extends BaseController {
                     case CommConstant.POINTS_CHANGE_GROUP:
                         result.getRecords().get(i).setRecordName("拼团");
                         break;
+                    case CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN:
+                        result.getRecords().get(i).setRecordName("活动签到");
+                        break;
                 }
             }
             responseBean.addSuccess(result);

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

@@ -69,4 +69,9 @@ public class TdPointsRules implements Serializable {
      * 积分说明
      */
     private String remark;
+    
+    /**
+     * code
+     */
+    private String code;
 }

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

@@ -42,11 +42,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	/**
 	 * 获取规则积分, 0 代表未启用
-	 * @param ruleId
+	 * @param code
 	 * @return
 	 */
-	private Integer getRulePoints(Integer ruleId) {
-		TdPointsRules rule = tdPointsRulesMapper.selectById(ruleId);
+	private Integer getRulePoints(String code,Integer orgId) {
+		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+		tdPointsRulesQueryWrapper.eq("code",code);
+		tdPointsRulesQueryWrapper.eq("org_id",orgId);
+		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
 		if (null == rule) {
 			return 0;
 		}
@@ -68,15 +71,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void sharePoints(TaShare taShare, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-
 		// 已经领取过的不会再次领取
 		String[] params = {
 				"shareId="+String.valueOf(taShare.getShareId()),
@@ -97,14 +100,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void sharePosterAll(String recommenderId, Integer orgId) {
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-
 		String[] params = {
 				"openUser="+recommenderId
 		};
@@ -119,15 +121,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("date="+DateUtils.today());
@@ -158,12 +160,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
+		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_CHECKIN);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
-		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
+		
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taActivityDynamicEnlist.getPersonId());
@@ -186,15 +189,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void signUpPoints(TaPerson taPerson, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taPerson.getPersonId());
@@ -213,15 +215,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			// 推荐人
@@ -341,15 +343,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_DOCUMENT_VERIFY);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
-
 		// 已经领取过的不会再次领取
 		String[] params = {
 				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
@@ -370,14 +371,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_VERIFICATION);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
+		
 
 		// 已经领取过的不会再次领取
 		String[] params = {