Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev

app/src/main/java/com/mints/street/api/MainApi.kt

@@ -68,7 +68,7 @@ interface MainApi {
     /**
      * 支付成功
      */
-    @POST("api/trade/queryVipOrder")
+    @POST("api/queryVipOrder")
     fun queryVipOrder(@Body vo:@JvmSuppressWildcards Map<String,Any>):Observable<Response<BaseResponse<Any>>>
 
     /**

app/src/main/java/com/mints/street/main/my/OpenvipActivity.kt

@@ -352,7 +352,8 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
                     if (isPay) {
                         //支付成功
                         UserManager.INSTANCE.setVipFlag(true)
-                        com.blankj.utilcode.util.ToastUtils.showShort("支付成功")
+                        viewModel.queryVipOrder(wxParanBean.tid)
+                        com.blankj.utilcode.util.ToastUtils.showLong("支付成功")
                         finish()
                     }
                 }) { throwable ->
@@ -366,7 +367,8 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
                     if (isPay) {
                         //支付成功
                         UserManager.INSTANCE.setVipFlag(true)
-                        com.blankj.utilcode.util.ToastUtils.showShort("支付成功")
+                        viewModel.queryVipOrder(wxParanBean.tid)
+                        com.blankj.utilcode.util.ToastUtils.showLong("支付成功")
                         finish()
                     }
                 }) { throwable ->

app/src/main/java/com/mints/street/main/my/OpenvipViewModel.kt

@@ -94,7 +94,7 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
     /**
      * 支付成功
      */
-    fun queryVipOrder(tid: String) {
+    fun queryVipOrder(tid: Long) {
         val vo = HashMap<String, Any>()
         vo["tid"] = tid
         ApiModel.queryVipOrder(lifecycleProvider, vo).safeSubscribe(