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 d81db90..a59a3f1 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
@@ -365,8 +365,8 @@
                     PERSON_BALANCE_FLAG, "both")
             if (amount.absoluteValue.compareTo(0.0) != 0) {
                 transaction.personDtl?.let {
-                    accountService.recalcAccountBalance(it, amount, overdraft)
                     transaction.personDtl.accdate = transaction.accdate
+                    accountService.recalcAccountBalance(it, amount, overdraft)
                 } ?: throw TransactionProcessException(TradeErrorCode.TRANSACTION_NOT_EXISTS,
                         "个人流水<${transaction.refno}>不存在")
             }
@@ -374,13 +374,6 @@
             transaction.personDtl.remark = remark
         }
         if (transaction.shop) {
-            // update shop balance
-//            val amount = transaction.sumAmountByAccno(
-//                    transaction.shopDtl.shopaccno, Subject.SUBJNO_MACHANT_INCOME,
-//                    SHOP_BALANCE_FLAG, "both")
-//            if (amount.absoluteValue.compareTo(0.0) != 0) {
-//
-//            }
             transaction.shopDtl.updateBala = false
             transaction.shopDtl.status = TradeDict.DTL_STATUS_SUCCESS
             transaction.shopDtl.accdate = transaction.accdate
@@ -406,7 +399,7 @@
 
         transactionOnSuccess(transaction, remark, true)
         transaction.checkDate = systemUtilService.accdate
-        transaction.endTime = Timestamp(systemUtilService.sysdatetime.sysdate.time)
+        transaction.endTime = systemUtilService.sysdatetime.sysdate
 
         transactionMainDao.save(transaction)
         return transaction
