From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Wed, 31 Jul 2019 09:22:24 +0000 (+0800)
Subject: 卡管账户tac问题修复和路径修改
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=0bf3245b1e69aadfc628e7bd00e12a26bed82ebd;p=epayment%2Ffood_payapi.git

卡管账户tac问题修复和路径修改
---

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt
index db41364e..32dc6996 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt
@@ -8,6 +8,7 @@ import com.supwisdom.dlpay.api.exception.RequestParamCheckException
 import com.supwisdom.dlpay.api.service.DaliDatasyncService
 import com.supwisdom.dlpay.framework.ResponseBodyBuilder
 import com.supwisdom.dlpay.framework.service.SystemUtilService
+import com.supwisdom.dlpay.framework.tenant.TenantContext
 import com.supwisdom.dlpay.framework.util.DateUtil
 import com.supwisdom.dlpay.framework.util.StringUtil
 import com.supwisdom.dlpay.framework.util.SysparaUtil
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.*
 import java.io.*
 import java.nio.charset.Charset
 
-@RequestMapping("/api/common")
+@RequestMapping("/api/common/dlcard")
 @RestController
 class DaliDatasyncApiController {
     @Autowired
@@ -36,6 +37,7 @@ class DaliDatasyncApiController {
     @PostMapping("/datasync")
     fun daliDatasync(@RequestBody param: DaliDatasyncParam): ResponseEntity<Any> {
         try {
+            if (TenantContext.getTenantSchema() == null) TenantContext.setTenantSchema("{tenantid}") //fixme: tenantid设置
             param.checkParam()
             val appid = systemUtilService.getSysparaValue(SysparaUtil.DLCARDMANAGER_APPID)
             val appkey = systemUtilService.getSysparaValue(SysparaUtil.DLCARDMANAGER_SECRET)
@@ -128,6 +130,7 @@ class DaliDatasyncApiController {
         }
 
         try {
+            if (TenantContext.getTenantSchema() == null) TenantContext.setTenantSchema("{tenantid}") //fixme: tenantid设置
             val txtFile = File(filename)
             val batchSize = 1000
             var sumCount = 0
@@ -215,6 +218,7 @@ class DaliDatasyncApiController {
         }
 
         try {
+            if (TenantContext.getTenantSchema() == null) TenantContext.setTenantSchema("{tenantid}") //fixme: tenantid设置
             var totalcnt = 0
             var failcnt = 0
             var detailMsg = ""
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt
index 59833f66..47e16a5d 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt
@@ -113,9 +113,11 @@ class DaliDatasyncServiceImpl : DaliDatasyncService {
                 lastdayTransamt = 0.00
                 lastdayDpsamt = 0.00
                 opendate = systime.hostdate
+                tac = Signature.SPY_TAC
             }
             account.tenantid = TenantContext.getTenantSchema()
-            account.generateTac()
+            account = accountDao.save(account)
+            account.tac = account.generateTac()
             accountDao.save(account)
         }
 
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt
index 37054273..3256e615 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt
@@ -72,7 +72,7 @@ class UserServiceImpl : UserService {
                 lastdayTransamt = 0.0
                 lastdayDpsamt = 0.0
                 opendate = systemdatetime.hostdate
-                tac = this.generateTac()
+                tac = Signature.SPY_TAC
                 accountDao.save(this)
             }
             a.tac = a.generateTac()