From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Mon, 24 Jun 2019 09:51:15 +0000 (+0800)
Subject: 改进流水中记录对方账户信息
X-Git-Tag: 1.0.0^2~150
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=8f0b88adf5f9aa5d5b2dd9e93b779e469df650a6;p=epayment%2Ffood_payapi.git

改进流水中记录对方账户信息
---

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 ad6b7409..faaf171f 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
@@ -106,7 +106,7 @@ class TransactionServiceImpl : TransactionService {
                     tradeflag = builder.person().tradeFlag
                     transdesc = builder.person().description
                     oppositeAccNo = builder.person().oppositeAccNo()
-                    oppositeAccName = builder.person().oppositeSubjNo()
+                    oppositeAccName = builder.person().oppositeAccName()
                     this.reverseFlag = TradeDict.REVERSE_FLAG_NONE
                     remark = builder.person().remark
                     this.status = status
@@ -133,7 +133,7 @@ class TransactionServiceImpl : TransactionService {
                     this.shopname = builder.shop().shopacc.shopname
                     this.transdesc = builder.shop().description
                     this.oppositeAccNo = builder.shop().oppositeAccNo()
-                    this.oppositeAccName = builder.shop().oppositeSubjNo()
+                    this.oppositeAccName = builder.shop().oppositeAccName()
                     this.remark = builder.shop().remark
                     this.reverseFlag = TradeDict.REVERSE_FLAG_NONE
                     this.updateBala = false
@@ -156,7 +156,7 @@ class TransactionServiceImpl : TransactionService {
                     this.transDate = builder.transDate
                     this.transTime = builder.transTime
                     this.oppositeAccNo = builder.subject().oppositeAccNo()
-                    this.oppositeAccName = builder.subject().oppositeSubjNo()
+                    this.oppositeAccName = builder.subject().oppositeAccName()
                     this.status = status
                 }.also {
                     transaction.subjectDtl = it
@@ -433,13 +433,13 @@ class TransactionServiceImpl : TransactionService {
         if (originTrans.person) {
             builder.person().apply {
                 setAmount(-originTrans.personDtl.amount, getOppositeTradeFlag(originTrans.personDtl.tradeflag))
-                setOpposite(AccountProxy(builder.shop().shopacc))
+                setOpposite(originTrans.personDtl.oppositeAccNo, originTrans.personDtl.oppositeAccName)
             }
         }
         if (originTrans.shop) {
             builder.shop().apply {
                 setAmount(-originTrans.shopDtl.amount, getOppositeTradeFlag(originTrans.shopDtl.tradeflag))
-                setOpposite(AccountProxy(builder.person().person))
+                setOpposite(originTrans.shopDtl.oppositeAccNo, originTrans.shopDtl.oppositeAccName)
             }
         }
         val summarySuffix = getReverseSuffix(builder.reverseType)
diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt b/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt
index d47d40e9..a237617b 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt
@@ -26,7 +26,7 @@ open class SubTransactionBuilder<T : SubTransactionBuilder<T>>(val parent: Trans
         }
 
     private lateinit var oppAccno: String
-    private lateinit var oppSubjno: String
+    private lateinit var oppAccName: String
 
     fun hasOpposite(): Boolean {
         return this::oppAccno.isInitialized
@@ -36,18 +36,18 @@ open class SubTransactionBuilder<T : SubTransactionBuilder<T>>(val parent: Trans
         return this.oppAccno
     }
 
-    fun oppositeSubjNo(): String {
-        return this.oppSubjno
+    fun oppositeAccName(): String {
+        return this.oppAccName
     }
 
-    fun setOpposite(accno: String, subjno: String) {
+    fun setOpposite(accno: String, accName: String) {
         this.oppAccno = accno
-        this.oppSubjno = subjno
+        this.oppAccName = accName
     }
 
     fun setOpposite(accout: AccountProxy<*>) {
         this.oppAccno = accout.getAccountNo()
-        this.oppSubjno = accout.getSubjectNo()
+        this.oppAccName = accout.getAccountName()
     }
 
     fun and(): TransactionBuilder {