fix:刷库程序优化

test/shareToaward_test.go

@@ -27,43 +27,30 @@ func Test_Award(t *testing.T) {
 		users = append(users, common.InterfaceToStr(v["_id"]))
 	}
 	q := map[string]interface{}{}
-	qu := map[string]interface{}{}
 	ndatas := []map[string]interface{}{}
 	for _, u := range users {
-		//q["$or"] = []map[string]interface{}{
-		//	{"share_uid": u},
-		//	{"shared_uid": u},
-		//}
-		q["share_uid"] = u
-		data, _ := Mgo.Find("user_share", q, "", `{"_id":1,"createtime":1}`, false, 0, 4)
+		q["$or"] = []map[string]interface{}{
+			{"share_uid": u},
+			{"shared_uid": u},
+		}
+		data, _ := Mgo.Find("user_share", q, `{"createtime":1}`, `{"_id":1,"createtime":1,"shared_uid":1}`, false, 0, 4)
 		if len(*data) > 0 {
-			for i, vv := range *data {
-				if i <= 4 {
-					ndata := map[string]interface{}{}
-					ndata["userid"] = u
-					ndata["award"] = "subvip"
-					ndata["num"] = 7
+			for _, vv := range *data {
+				ndata := map[string]interface{}{}
+				if common.InterfaceToStr(vv["shared_uid"]) == u {
+					ndata["getway"] = "invited"
+				} else {
 					ndata["getway"] = "invite"
-					ndata["date"] = vv["createtime"]
-					ndata["activity_code"] = "inviteRegister"
-					ndata["detail"] = ""
-					ndatas = append(ndatas, ndata)
 				}
+				ndata["userid"] = u
+				ndata["award"] = "subvip"
+				ndata["num"] = 7
+				ndata["date"] = vv["createtime"]
+				ndata["activity_code"] = "inviteRegister"
+				ndata["detail"] = ""
+				ndatas = append(ndatas, ndata)
 			}
 		}
-		qu["shared_uid"] = u
-		ds, _ := Mgo.FindOne("user_share", qu)
-		if ds != nil && (*ds)["_id"] != nil {
-			val := map[string]interface{}{}
-			val["userid"] = u
-			val["award"] = "subvip"
-			val["num"] = 7
-			val["getway"] = "invited"
-			val["date"] = (*ds)["createtime"]
-			val["activity_code"] = "inviteRegister"
-			val["detail"] = ""
-			ndatas = append(ndatas, val)
-		}
 	}
 	Mgo.SaveBulk("activity_award", ndatas...)
 }