Merge branch 'feature/yk_release' into 'release'

feat: 咨询发方式筛选参数名修改，代码优化

See merge request app_android_lib/YDL-Component!192

config.gradle

@@ -6,7 +6,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.50.42",
-            "m-consultant"    : "0.0.60.68",
+            "m-consultant"    : "0.0.60.70",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.55",
             "m-home"          : "0.0.23.95",
@@ -92,7 +92,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.50.42",
-            "m-consultant"    : "0.0.60.68",
+            "m-consultant"    : "0.0.60.70",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.55",
             "m-home"          : "0.0.23.95",

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchPresenter.kt

@@ -61,7 +61,7 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
         if (allFilter.categoryId2List.size>0){
             val categoryMap2 = HashMap<String, Any>()
             val categoryIdMap2 = HashMap<String, Any>()
-            categoryIdMap2["in"] = allFilter.categoryId2List
+            categoryIdMap2["in"] = allFilter.categoryId2List.toSortedSet().toList()
             categoryMap2["product_cates.category_id2"] = categoryIdMap2
             categoryList.add(categoryMap2)
         }
@@ -69,7 +69,7 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
         if (allFilter.categoryId3List.size>0){
             val categoryMap3 = HashMap<String, Any>()
             val categoryIdMap3 = HashMap<String, Any>()
-            categoryIdMap3["in"] = allFilter.categoryId3List
+            categoryIdMap3["in"] = allFilter.categoryId3List.toSortedSet().toList()
             categoryMap3["product_cates.category_id3"] = categoryIdMap3
             categoryList.add(categoryMap3)
         }
@@ -105,7 +105,7 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
             }
             val wayMap = HashMap<String, Any>()
             wayMap["in"] = way
-            filterMap["service_type_list.service_type"] = wayMap
+            filterMap["product_specs.spec_id"] = wayMap
         }
         // 服务均价
         if (allFilter.priceRanges != null) {
@@ -187,9 +187,6 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
         fieldsMap["doctor_name"] = true
         fieldsMap["uid"] = true
         fieldsMap["chat_status"] = true
-//        fieldsMap["consult_status"] = true
-//        fieldsMap["listen_status"] = true
-//        fieldsMap["booking_status"] = true
         fieldsMap["gender"] = true
         fieldsMap["years"] = true
         fieldsMap["head"] = true