From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Thu, 25 Jul 2019 05:57:44 +0000 (+0800)
Subject: 修改更新商户余额任务的多租户处理机制
X-Git-Tag: 1.0.1^2~67
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d4ce4f91a4695283d4eb8760ce2fe7c24e04cd2f;p=epayment%2Ffood_payapi.git

修改更新商户余额任务的多租户处理机制
---

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt
index 5b9745ac..759e0478 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt
@@ -4,11 +4,13 @@ import com.supwisdom.dlpay.agent.AgentCode
 import com.supwisdom.dlpay.agent.DtlStatus
 import com.supwisdom.dlpay.agent.citizencard.YnrccUtil
 import com.supwisdom.dlpay.api.domain.TDtlQuery
+import com.supwisdom.dlpay.api.domain.TShopdtl
 import com.supwisdom.dlpay.api.domain.TTransactionMain
 import com.supwisdom.dlpay.api.repositories.ShopaccService
 import com.supwisdom.dlpay.api.service.DtlQueryResultService
 import com.supwisdom.dlpay.api.service.TransactionServiceProxy
 import com.supwisdom.dlpay.framework.service.SystemUtilService
+import com.supwisdom.dlpay.framework.tenant.TenantContext
 import com.supwisdom.dlpay.framework.util.ApplicationUtil
 import com.supwisdom.dlpay.framework.util.TradeDict
 import com.supwisdom.dlpay.util.ConstantUtil
@@ -59,8 +61,9 @@ class ShopAccBalanceAsyncTask {
     private lateinit var shopaccService: ShopaccService
 
     @Async("shopAccBalanceUpdater")
-    fun updateShopBalance(shopdtlRefno: String) {
-        shopaccService.recalcShopBalance(shopdtlRefno, true)
+    fun updateShopBalance(shopdtl: TShopdtl) {
+        TenantContext.setTenantSchema(shopdtl.tenantid)
+        shopaccService.recalcShopBalance(shopdtl.refno, true)
     }
 }
 
@@ -100,7 +103,7 @@ class AgentQueryResultTask {
             }
 
             val service = ApplicationUtil.findAgentPayService(applicationContext,
-                    transaction.sourceType+ "Agent")
+                    transaction.sourceType + "Agent")
 
             logger.info("refno=[${transaction.refno}]开始第" + (qcnt + 1) + "次查询支付结果：")
             val resp = service.query(transaction)
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt
index 76abfd8b..eb08287b 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt
@@ -87,7 +87,7 @@ class TransactionServiceProxy {
     fun success(refno: String, sourcetypeRefno: String, accdateUpdate: Boolean? = true): TTransactionMain {
         return transactionService.success(refno, sourcetypeRefno, accdateUpdate).also {
             if (it.shop) {
-                shopAccBalanceAsyncTask.updateShopBalance(it.refno)
+                shopAccBalanceAsyncTask.updateShopBalance(it.shopDtl)
             }
         }
     }