卡管账户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 db41364..32dc699 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.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 java.io.*
import java.nio.charset.Charset
-@RequestMapping("/api/common")
+@RequestMapping("/api/common/dlcard")
@RestController
class DaliDatasyncApiController {
@Autowired
@@ -36,6 +37,7 @@
@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 @@
}
try {
+ if (TenantContext.getTenantSchema() == null) TenantContext.setTenantSchema("{tenantid}") //fixme: tenantid设置
val txtFile = File(filename)
val batchSize = 1000
var sumCount = 0
@@ -215,6 +218,7 @@
}
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 59833f6..47e16a5 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 @@
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 3705427..3256e61 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 @@
lastdayTransamt = 0.0
lastdayDpsamt = 0.0
opendate = systemdatetime.hostdate
- tac = this.generateTac()
+ tac = Signature.SPY_TAC
accountDao.save(this)
}
a.tac = a.generateTac()