Merge branch 'bs_2.0.6.28' of http://git.legu.cc/liwei_3d/go_dreamfactory into bs_2.0.6.28

modules/sociaty/api_cross_refuse.go

@@ -43,7 +43,20 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq)
 		}
 		return
 	}
-
+	// 判断改用户是否在申请记录中
+	var flag bool
+	for _, r := range sociaty.GetApplyRecord() {
+		if r.Uid == req.Uid {
+			flag = true
+			break
+		}
+	}
+	if !flag {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_SociatyApplyCancel,
+			Title: pb.ErrorCode_SociatyApplyCancel.ToString(),
+		}
+	}
 	// 已是公会成员
 	if this.module.modelSociaty.isMember(uid, sociaty) {
 		errdata = &pb.ErrorData{

modules/sociaty/model_sociatytask.go

@@ -115,13 +115,13 @@ func (this *ModelSociatyTask) activityReceive(id int32, sociatyId, uid string) e
 			break
 		}
 	}
-	if isUpdate {
+	if !isUpdate {
-		update := map[string]interface{}{
+		sociatyTask.ActivityList = append(sociatyTask.ActivityList, &pb.SociatyActivity{Id: id, Status: 1})
-			"activityList": sociatyTask.ActivityList,
-		}
-		return this.ChangeList(sociatyId, uid, update)
 	}
-	return nil
+	update := map[string]interface{}{
+		"activityList": sociatyTask.ActivityList,
+	}
+	return this.ChangeList(sociatyId, uid, update)
 }
 
 // 更新任务列表