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

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

@@ -33,8 +33,13 @@ type AfterPay struct {
 	directSubKWS   xweb.Mapper `xweb:"/afterPay/directSubKWS"`   //搜索列表直接订阅关键词
 	fastImport     xweb.Mapper `xweb:"/afterPay/fastImport"`     //快速导入关键词
 	modification   xweb.Mapper `xweb:"/afterPay/modification"`   //关键词修改记录
+	aaa            xweb.Mapper `xweb:"/aaa"`
 }
 
+func (a *AfterPay) Aaa() {
+	aa, bb := a.GetInteger("qwe")
+	log.Println(aa, bb != nil)
+}
 func (a *AfterPay) Modification() error {
 	defer qutil.Catch()
 	userId, _ := a.GetSession("userId").(string)
@@ -394,12 +399,17 @@ func (a *AfterPay) SetUserInfo() error {
 			//查询用vip关键词信息
 			data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy.a_items":1}`)
 			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{})
+				sitemsArr := []string{} //分类名称数组
+				for _, av := range a_items {
+					_av := qutil.ObjToMap(av)
+					sitemsArr = append(sitemsArr, qutil.ObjToString((*_av)["s_item"]))
+				}
 				i, _ := strconv.Atoi(classify_index)
 				j, _ := strconv.Atoi(kws_index)
 				var classifyArr map[string]interface{}
-				sitemsArr := []string{} //分类名称数组
 				for ak, av := range a_items {
 					//如果分类名称相同  则操作此分类
 					_av := qutil.ObjToMap(av)
@@ -407,7 +417,6 @@ func (a *AfterPay) SetUserInfo() error {
 						i = ak
 						break
 					}
-					sitemsArr = append(sitemsArr, qutil.ObjToString((*_av)["s_item"]))
 				}
 				if i != len(a_items) && len(a_items) != 0 {
 					//从前端获取的分类索引是否超出了库中分类的总量 如果是  则认为修改此VIP分类最后一位
@@ -519,12 +528,15 @@ func (a *AfterPay) SetUserInfo() error {
 					//没有关键词 批量删除/新增分类
 					if classify_name != "" {
 						if actionType == "SC" { //保存分类 无关键词
+							log.Println(sitemsArr, classify_name)
 							if isRepeat(append(sitemsArr, classify_name)) {
 								msg = "分类名称重复"
 							} else {
-								classify_index := strconv.Itoa(len(a_items)) //索引
+								if classify_index == "" {
+									classify_index = strconv.Itoa(len(a_items)) //索引
+									saveData["o_vipjy.a_items."+classify_index+".a_key"] = []map[string]interface{}{}
+								}
 								saveData["o_vipjy.a_items."+classify_index+".s_item"] = classify_name
-								saveData["o_vipjy.a_items."+classify_index+".a_key"] = []map[string]interface{}{}
 							}
 						}
 					} else {
@@ -723,7 +735,7 @@ func KeyWordsRepeat(obj map[string]interface{}, aitems []interface{}) bool {
 	notkey, _ := obj["notkey"].([]string)
 	matchway, _ := obj["matchway"].(int)
 	appendkey, _ := obj["appendkey"].([]string)
-
+	log.Println("obj", obj)
 	// 录入的关键词
 	for _, v := range aitems {
 		if items, ok := v.(map[string]interface{}); ok && len(items) > 0 {
@@ -800,7 +812,7 @@ func SelectSortSring(arr []string) []string {
 
 //判断stringArr相等方法
 func StringArrEqual(a, b []string) bool {
-	if (a == nil) != (b == nil) {
+	if (len(a) == 0) != (len(b) == 0) {
 		return false
 	}
 	if len(a) != len(b) {