commit f13a0dbf42fb0e5854a02a48b1d39622c69440c1
author Xia Kaixiang <kaixiang.xia@supwisdom.com> 周三 6月 05 16:42:01 2019 +0800
committer Xia Kaixiang <kaixiang.xia@supwisdom.com> 周一 3月 16 09:56:23 2020 +0800
tree 08d28184712a98c6d06dda5659eb93674e3e85b8
parent 95a1dab1213f2ee55bf580b3a195269b3847ba53

流水查询、字典、treeSelect

src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt

diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt
index 48b7105..d7e8895 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt
@@ -111,9 +111,9 @@
                     this.amount = builder.shop().amount
                     this.payInfo = builder.shop().payinfo
                     this.sourceType = builder.sourceType
-                    this.transDate = builder.transDate
-                    this.transTime = builder.transTime
-                    this.tradeCode = builder.transCode
+                    this.transdate = builder.transDate
+                    this.transtime = builder.transTime
+                    this.transcode = builder.transCode
                     this.sourceType = builder.sourceType
                     amount = if (builder.shop().tradeFlag == TradeDict.TRADE_FLAG_IN) {
                         builder.shop().amount

src/main/kotlin/com/supwisdom/dlpay/security.kt

diff --git a/src/main/kotlin/com/supwisdom/dlpay/security.kt b/src/main/kotlin/com/supwisdom/dlpay/security.kt
index e0c5833..30c0edd 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -8,6 +8,7 @@
 import com.supwisdom.dlpay.framework.security.ValidateCodeSecurityConfig
 import com.supwisdom.dlpay.framework.service.OperatorDetailService
 import com.supwisdom.dlpay.framework.util.TradeDict
+import com.supwisdom.dlpay.system.common.DictPool
 import org.jose4j.jwt.consumer.InvalidJwtException
 import org.jose4j.lang.JoseException
 import org.springframework.beans.factory.annotation.Autowired
@@ -151,7 +152,8 @@
             lateinit var authenticationSuccessHandler: AuthenticationSuccessHandler
             @Autowired
             lateinit var passwordBCryptConfig: PasswordBCryptConfig
-
+            @Autowired
+            lateinit var dictPool: DictPool
 
             @Autowired
             lateinit var userDetailsService: OperatorDetailService
@@ -186,6 +188,8 @@
             }
 
             override fun configure(http: HttpSecurity) {
+                dictPool.init() //初始化字典
+
                 // 设置 Web MVC 应用权限
                 http.apply(validateCodeSecurityConfig)
                         .and()