Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

# Conflicts:
#	src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

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

@@ -57,15 +57,19 @@ public class EventLisenter {
 				break;
 			case ActivityCheckin:
 				getActivityCheckin((TaActivityDynamicEnlist) event.getSource(), event.getOrgId());
+				break;
 			// 业主认证审核通过
 			case UserVerify:
 				getUserVerify((TaUserVerify) event.getSource(), event.getOrgId());
+				break;
 			// 工单评价加积分
 			case TicketEvaluation:
 				getTicketEvaluation((TpTicket) event.getSource(), event.getOrgId());
+				break;
 			// 缴费成功加积分
 			case payment:
 				getPayment((BillInvoice) event.getSource(), event.getOrgId());
+				break;
 			default:
 				break;
 		}

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -133,7 +133,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
         if (Constant.APPROVED.equals(status)){
             // 审核通过加20积分
-            applicationContext.publishEvent(new EventBus(userVerify, EventBus.EventType.DocumentVerify,1));
+            applicationContext.publishEvent(new EventBus(userVerify, EventBus.EventType.UserVerify,1));
         }
 
         String[] messageArr= new messagePush().messagePushAll( );