Merge branch 'dev_v1.5.20.1_wh' of jianyu/datatools into hotfix/v1.5.20.1

clueSync/tag.go

@@ -110,9 +110,9 @@ func FormatTag(data map[string]interface{}, count int) {
 		search_areass = strings.Join(search_areas_arr, ",")
 		search_wordss = strings.Join(search_words_arr, ",")
 	}
-
 	//订单购买的服务
-	orderData := TiDb.Find("dwd_f_userbase_order_info", map[string]interface{}{"userid": userId, "order_status": 1, "delete_status": 0}, "", "", -1, -1)
+	//orderData := TiDb.Find("dwd_f_userbase_order_info", map[string]interface{}{"userid": userId, "order_status": 1, "delete_status": 0}, "", "", -1, -1)
+	orderData := TiDb.SelectBySql("select  *  from  dwd_f_userbase_order_info where   userid=? and  order_status=1 and  delete_status=0 and  payable_money > 0", userId)
 	if orderData != nil && len(*orderData) > 0 {
 		product_type_arr, product_type_arrs := []string{}, []string{}
 		for _, v := range *orderData {
@@ -256,7 +256,8 @@ func tagAddSync() {
 			if k == 0 {
 				cfg.LastOrderTime = autoUpdate
 			}
-			orderDatas := TiDb.Find("dwd_f_userbase_order_info", map[string]interface{}{"uid": uId, "order_status": 1, "delete_status": 0}, "", "", -1, -1)
+			//orderDatas := TiDb.Find("dwd_f_userbase_order_info", map[string]interface{}{"uid": uId, "order_status": 1, "delete_status": 0}, "", "", -1, -1)
+			orderDatas := TiDb.SelectBySql("select  *  from  dwd_f_userbase_order_info where   uid=? and  order_status=1 and  delete_status=0 and  payable_money > 0", uId)
 			if orderDatas != nil && len(*orderDatas) > 0 {
 				product_type_arr, product_type_arrs := []string{}, []string{}
 				for _, v := range *orderDatas {