合并

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

 	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
 	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
 	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "cityId",required = false)Integer cityId,
 	                                           HttpServletRequest request){
 		String openid = getOpenId(request);
 		Integer orgId = getOrgId(request);
 			return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		TaPerson person = taPersons.get(0);
-		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person);
+		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person,cityId);
 		
 		return responseBean;
 	}

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

 
 @Mapper
 public interface ActivityMapper {
-	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status);
+	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
 }

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

 	 * @param person
 	 * @return
 	 */
-	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
+	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
 }

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 	 * @return
 	 */
 	@Override
-	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person, Integer cityId) {
 		//查询是否报名了普通活动
 		QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_id",orgId);
 		
 		//分页获取全部数据
 		Page pg = new Page(pageNumber,pageSize);
-		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL);
+		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL,cityId);
 		list.forEach(e -> {
 			if (e.getType().equals("dynamic")){
 				taActivityDynamicEnlists.forEach(dynamic -> {

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

 
     @Autowired
     private TaMiniappQrcodeMapper taMiniappQrcodeMapper;
+    
+    @Autowired
+    private ITaPointsRecordsService taPointsRecordsService;
 
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         Map<String,Object>data = new HashMap<>();
         TaActivityDynamicEnlist enlist = new TaActivityDynamicEnlist();
         if(enlists.size()>0){
-            enlist=enlists.get(0);
+            enlist = enlists.get(0);
         }
         data.put("enlist",enlist);
         data.put("dynamic",buildingDynamic);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
+                       enlist.setAddPoints(rulePoints);
                        responseBean.addSuccess(enlist);
                    }else {
                        responseBean.addError("您已签到过");

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

      */
     @TableField(exist = false)
     private String orgName;
+    
+    /**
+     * 添加的积分
+     */
+    @TableField(exist = false)
+    private Integer addPoints;
 
 }

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

  * @since 2019-07-25
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
-
+	
+	/**
+	 * 根据code获取积分
+	 * @param code
+	 * @param orgId
+	 * @return
+	 */
+	Integer getRulePoints(String code,Integer orgId);
+	
 	// 分享赚积分
 	void sharePoints(TaShare taShare, Integer orgId);
 

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

 
         // 当报名人数已满时，活动为已结束
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum()) {
-            taBuildingDynamic.setIsEnlist(2);
+            //taBuildingDynamic.setIsEnlist(2);
             buildingDynamicMapper.updateById(taBuildingDynamic);
             responseBean.addError("当前报名人数已满");
             return responseBean;

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

 	 * @param code
 	 * @return
 	 */
-	private Integer getRulePoints(String code,Integer orgId) {
+	@Override
+	public Integer getRulePoints(String code,Integer orgId) {
 		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
 		tdPointsRulesQueryWrapper.eq("code",code);
 		tdPointsRulesQueryWrapper.eq("org_id",orgId);

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

 
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name", taRecommendCustomer.getName());
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);

src/main/resources/mapper/Activity.xml

 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
 
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
-        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status}
+        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status} and city_id = #{cityId}
         UNION  all
-        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
+        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status} and city_id = #{cityId}
         UNION  all
-        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status}
+        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status} and city_id = #{cityId}
         ORDER BY weight desc,activity_status,start_date
     </select>
 </mapper>