Merge branch 'dev4.5.5' of http://127.0.0.1:8080/qmx/jy into dev4.5.5

src/jfw/front/swordfish.go

@@ -1544,20 +1544,14 @@ func generateRandomNumber(start int, end int, count int) []int {
 	}
 	//存放结果的slice
 	nums := make([]int, 0)
+	m := map[int]bool{}
 	//随机数生成器，加入时间戳保证每次生成的随机数不一样
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 	for len(nums) < count {
 		//生成随机数
 		num := r.Intn((end - start)) + start
-		//查重
-		exist := false
-		for _, v := range nums {
-			if v == num {
-				exist = true
-				break
-			}
-		}
-		if !exist {
+		if !m[num] {
+			m[num] = true
 			nums = append(nums, num)
 		}
 	}

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -410,7 +410,15 @@ func (a *AfterPay) SetUserInfo() error {
 			if ok && data != nil && len(*data) > 0 {
 				log.Println(userId)
 				o_vipjy, _ := (*data)["o_vipjy"].(map[string]interface{})
-				a_items := o_vipjy["a_items"].([]interface{})
+				a_items, errs := o_vipjy["a_items"].([]interface{})
+				log.Println("ok:", errs)
+				if !errs {
+					util.MQFW.UpdateById("user", userId, map[string]interface{}{
+						"$set": map[string]interface{}{
+							"o_vipjy.a_items": []map[string]interface{}{},
+						},
+					})
+				}
 				sitemsArr := []string{} //分类名称数组
 				for _, av := range a_items {
 					_av := qutil.ObjToMap(av)
@@ -547,6 +555,7 @@ func (a *AfterPay) SetUserInfo() error {
 									classify_index = strconv.Itoa(len(a_items)) //索引
 									saveData["o_vipjy.a_items."+classify_index+".a_key"] = []map[string]interface{}{}
 								}
+								log.Println("====", classify_index)
 								saveData["o_vipjy.a_items."+classify_index+".s_item"] = classify_name
 							}
 						}