From 4f52bac82cbba82790fbf9834361e660f63d5d77 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Wed, 13 May 2020 15:04:40 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../com/supwisdom/dlpay/mobile/MobileApi.kt    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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
                 }
-- 
2.17.1