From: Tang Cheng Date: Mon, 16 Dec 2019 03:29:26 +0000 (+0800) Subject: 优化代码，去掉warning X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=b8f08b0a7f9ac985fb901ddeb4edbd53995fb613;p=epayment%2Ffood_payapi.git 优化代码，去掉warning --- diff --git a/oauth/src/main/kotlin/com/supwisdom/oauth/service/impl/OAuthUserServiceImpl.kt b/oauth/src/main/kotlin/com/supwisdom/oauth/service/impl/OAuthUserServiceImpl.kt index 75c1f0e8..afc5d561 100644 --- a/oauth/src/main/kotlin/com/supwisdom/oauth/service/impl/OAuthUserServiceImpl.kt +++ b/oauth/src/main/kotlin/com/supwisdom/oauth/service/impl/OAuthUserServiceImpl.kt @@ -71,11 +71,12 @@ class OAuthUserServiceImpl :OAuthUserService { } override fun findUserInfor(userid: String): UserInfor? { - var sql = "select ac.availbal as availbal, ac.LOWFREE_FLAG as lowfreeflag,ac.LOWFREE_LIMIT as lowfreelimit,ac.DAY_LIMIT as daylimit, ac.ACCNAME as name,pa.points " + + val sql = "select ac.availbal as availbal, ac.LOWFREE_FLAG as lowfreeflag,ac.LOWFREE_LIMIT as lowfreelimit,ac.DAY_LIMIT as daylimit, ac.ACCNAME as name,pa.points " + "from tb_account ac left join tb_points_account pa on pa.userid=ac.userid where ac.trans_status<>'closed' and ac.userid =:uid " - var query = entityManager.createNativeQuery(sql) + val query = entityManager.createNativeQuery(sql) query.setParameter("uid",userid) query.unwrap(NativeQuery::class.java).setResultTransformer(Transformers.aliasToBean(UserInfor::class.java)) + @Suppress("UNCHECKED_CAST") val ret = query.resultList as List if(ret.isNotEmpty()){ return ret[0] @@ -84,8 +85,8 @@ class OAuthUserServiceImpl :OAuthUserService { } override fun updateFlag(userid: String,flag:Boolean,low:Double,day:Double):Int { - var sql = "update tb_account set lowfree_flag=:flag,lowfree_limit=:low, day_limit=:day where trans_status<>'closed' and userid=:uid " - var query = entityManager.createNativeQuery(sql) + val sql = "update tb_account set lowfree_flag=:flag,lowfree_limit=:low, day_limit=:day where trans_status<>'closed' and userid=:uid " + val query = entityManager.createNativeQuery(sql) query.setParameter("uid",userid) query.setParameter("flag",flag) query.setParameter("low",low) diff --git a/oauth/src/main/kotlin/com/supwisdom/oauth/util/Test.kt b/oauth/src/main/kotlin/com/supwisdom/oauth/util/Test.kt index b89841f0..de856ed0 100644 --- a/oauth/src/main/kotlin/com/supwisdom/oauth/util/Test.kt +++ b/oauth/src/main/kotlin/com/supwisdom/oauth/util/Test.kt @@ -9,12 +9,4 @@ class Test{ } } - private fun min(values: Array?): T? where T : Comparable { - if (values == null || values.size == 0) return null - var min = values[0] - for (i in 1 until values.size) { - if (min.compareTo(values[i]) > 0) min = values[i] - } - return min - } } \ No newline at end of file diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt index 3d3cbae4..54f8434d 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt @@ -1,25 +1,28 @@ package com.supwisdom.dlpay.api -import com.google.gson.Gson import com.sun.jersey.api.client.Client import com.sun.jersey.api.client.ClientResponse -import com.supwisdom.dlpay.api.bean.* +import com.supwisdom.dlpay.api.bean.BaseResp +import com.supwisdom.dlpay.api.bean.WechatReqResp import com.supwisdom.dlpay.api.domain.TPersondtl -import com.supwisdom.dlpay.api.domain.TShopdtl -import com.supwisdom.dlpay.framework.util.* +import com.supwisdom.dlpay.framework.util.DateUtil +import com.supwisdom.dlpay.framework.util.MoneyUtil +import com.supwisdom.dlpay.framework.util.RandomUtils +import com.supwisdom.dlpay.framework.util.XmlUtils import com.supwisdom.dlpay.util.Code import mu.KotlinLogging - class CallService { companion object { private val logger = KotlinLogging.logger { } - fun callWechatPay(config: Map, paydtl: TPersondtl, time: String, wechattype: String, - realip: String?, qrcode: String?, openid: String?): BaseResp { + fun callWechatPay(config: Map, paydtl: TPersondtl, + @Suppress("UNUSED_PARAMETER") time: String, wechattype: String, + realip: String?, @Suppress("UNUSED_PARAMETER") qrcode: String?, + openid: String?): BaseResp { val code = BaseResp() val appid = config["appid"] if (appid.isNullOrEmpty()) { diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt index 157c81c7..97f24037 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt @@ -116,9 +116,9 @@ class ShopAPIController { val pageSize = 5000 //每次查询笔数 var offset = 0 while (offset < count) { - var page = dtlDataService.getDownloadShopBillPage(param, offset, pageSize) + val page = dtlDataService.getDownloadShopBillPage(param, offset, pageSize) if (null == page || page.data.isNullOrEmpty()) break - page!!.data.forEach { + page.data.forEach { writeLine(output, it.billno, it.refno, it.amount, it.paytime, it.status, it.sourcetype, it.dtltype) //输出数据 } offset += pageSize diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt index 210c3316..e03ca66c 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt @@ -52,8 +52,8 @@ class CardServiceImpl : CardService { } override fun getPersonByCardno(citizencardno: String?, bankcardno: String?): UserInforResponse { - var resp = UserInforResponse() - var cityCard: TCard? + val resp = UserInforResponse() + val cityCard: TCard? if (!citizencardno.isNullOrEmpty()) { //根据市民卡号查询 cityCard = cardDao.findCardByCardnoAndCardtype(citizencardno, ConstantUtil.CARDTYPE_CITIZENCARD) @@ -68,7 +68,7 @@ class CardServiceImpl : CardService { } } else if (!bankcardno.isNullOrEmpty()) { //根据银行卡号查询 - val bankcard = cardDao.findCardByCardnoAndCardtype(bankcardno?.trim(), ConstantUtil.CARDTYPE_BANKCARD) + val bankcard = cardDao.findCardByCardnoAndCardtype(bankcardno.trim(), ConstantUtil.CARDTYPE_BANKCARD) if (bankcard == null) { resp.retcode = 1 resp.retmsg = "银行卡不存在" @@ -116,6 +116,7 @@ class CardServiceImpl : CardService { query.setParameter("starttime", startdate) query.setParameter("endtime", enddate) query.unwrap(NativeQueryImpl::class.java).setResultTransformer(Transformers.aliasToBean(CitizenCardInfo::class.java)) + @Suppress("UNCHECKED_CAST") val list = query.resultList as List resp.retcode=0 resp.retmsg="OK" diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt index c4889dfd..b91c74ba 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt @@ -502,7 +502,7 @@ class TransactionServiceImpl : TransactionService { } private fun doReversePrepareAndCheck(originTrans: TTransactionMain, builder: TransactionBuilder, - amount: Double) { + @Suppress("UNUSED_PARAMETER") amount: Double) { if (originTrans.person) { val account = accountUtilService.readAccount(originTrans.personDtl.userid) builder.person(account).apply { diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt index db0f82de..ed5783f3 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt @@ -174,6 +174,7 @@ class ApiAuthController { ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(mapOf("msg" to "appid error")) } } ?: ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(mapOf("msg" to "appid error")) + @Suppress("UNCHECKED_CAST") return result as ResponseEntity } }