From: qiaowei <jov123@163.com>
Date: Wed, 13 May 2020 07:04:40 +0000 (+0800)
Subject: 修改版本号
X-Git-Tag: 1.0.14^2
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=4f52bac82cbba82790fbf9834361e660f63d5d77;p=epayment%2Ffood_payapi.git

修改版本号
---

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
index 08cfbc84..299fd7fb 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -621,7 +621,7 @@ class ApiV1 {
      * 查询账单
      * */
     @RequestMapping("/bills")
-    fun bills(pageno: Int,platform: String?): JsonResult {
+    fun bills(pageno: Int,platform: String?,type:String?): JsonResult {
         val p = SecurityContextHolder.getContext().authentication
         val user = mobileApiService.findUserById(p.name)
                 ?: return JsonResult.error("用户不存在，请注册")
@@ -672,9 +672,14 @@ class ApiV1 {
         var versionurl:String?=""
         if(!platform.isNullOrEmpty()){
             var map= mutableMapOf<String,Any>()
+            var key=""
             if(platform.toLowerCase().contains("android")){
-                dictionaryProxy.refreshDictionary("androidapp")
-                map = dictionaryProxy.getDictionaryAsMap("androidapp")
+                key="androidapp"
+                if(!type.isNullOrEmpty()){
+                    key+= "_$type"
+                }
+                dictionaryProxy.refreshDictionary(key)
+                map = dictionaryProxy.getDictionaryAsMap(key)
                 if(map["androidversion"]!=null){
                     version = map["androidversion"] as String
                 }
@@ -689,7 +694,12 @@ class ApiV1 {
                 }
 
             }else if(platform.toLowerCase().contains("iphone")){
-                map = dictionaryProxy.getDictionaryAsMap("iosapp")
+                key="iosapp"
+                if(!type.isNullOrEmpty()){
+                    key+= "_$type"
+                }
+                dictionaryProxy.refreshDictionary(key)
+                map = dictionaryProxy.getDictionaryAsMap(key)
                 if(map["iosversion"]!=null){
                     version = map["iosversion"] as String
                 }