From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Wed, 22 May 2019 02:32:21 +0000 (+0800)
Subject: 修改等运行调试
X-Git-Tag: 1.0.0^2~206
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=27fe87c48c4fe1669a41d67cbb4516e15020e59e;p=epayment%2Ffood_payapi.git

修改等运行调试
---

diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java
index 0f7265e2..86952423 100644
--- a/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java
+++ b/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java
@@ -14,7 +14,7 @@ import org.springframework.data.repository.query.Param;
 import javax.persistence.LockModeType;
 import javax.persistence.QueryHint;
 
-public interface AccountDao extends JpaRepository<TAccount, String>, TAccountRepository {
+public interface AccountDao extends JpaRepository<TAccount, String> {
 
   @Lock(LockModeType.PESSIMISTIC_WRITE)
   @Query("select a from TAccount a where a.accno = ?1")
diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java b/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java
index f733e983..76d767d6 100644
--- a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java
+++ b/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java
@@ -42,13 +42,16 @@ public class TTransactionMain {
   @Column(name = "reverse_flag", nullable = false, length = 10)
   private String reverseFlag = "none";
 
-  @OneToOne(targetEntity = TPersondtl.class, mappedBy = "refno", fetch = LAZY)
+  @OneToOne(targetEntity = TPersondtl.class, fetch = LAZY)
+  @JoinColumn(name = "refno", referencedColumnName = "refno")
   private TPersondtl personDtl;
 
-  @OneToOne(targetEntity = TShopdtl.class, mappedBy = "refno", fetch = LAZY)
+  @OneToOne(targetEntity = TShopdtl.class, fetch = LAZY)
+  @JoinColumn(name = "refno", referencedColumnName = "refno")
   private TShopdtl shopDtl;
 
-  @OneToOne(targetEntity = TSubjectdtl.class, mappedBy = "refno", fetch = LAZY)
+  @OneToOne(targetEntity = TSubjectdtl.class, fetch = LAZY)
+  @JoinColumn(name = "refno", referencedColumnName = "refno")
   private TSubjectdtl subjectDtl;
 
   @OneToMany(targetEntity = TDebitCreditDtl.class, mappedBy = "refno", fetch = LAZY)
diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java b/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java
index 98effbe0..fa2ab12b 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java
@@ -47,5 +47,5 @@ public interface ShopaccDao extends JpaRepository<TShopacc, String> {
   void updateShopnameByShopaccno(String shopname, String shopaccno);
 
 
-  TShopacc findByShopacc(String acc);
+  TShopacc findByShopaccno(String acc);
 }
diff --git a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
index 941e6b1f..9d334d7f 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
@@ -62,13 +62,6 @@ class HttpSessionConfig {
         template.setConnectionFactory(connectionFactory)
         return template
     }
-
-    @Bean
-    fun longValueRedisTemplate(connectionFactory: RedisConnectionFactory): RedisTemplate<String, Long> {
-        val template = RedisTemplate<String, Long>()
-        template.keySerializer = StringRedisSerializer()
-        return template
-    }
 }
 
 
diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt b/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt
new file mode 100644
index 00000000..47eb0435
--- /dev/null
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt
@@ -0,0 +1,23 @@
+package com.supwisdom.dlpay.api
+
+import org.aspectj.lang.JoinPoint
+import org.aspectj.lang.annotation.Aspect
+import org.aspectj.lang.annotation.Before
+import org.aspectj.lang.annotation.Pointcut
+import org.springframework.stereotype.Component
+
+@Component
+@Aspect
+class RestControllerAspect {
+
+    @Pointcut("execution( * com.supwisdom.dlpay.api..*(..))")
+    private fun beforeRequest() {
+    }
+
+    @Before("beforeRequest()")
+    fun check(point: JoinPoint) {
+        point.args.forEach {
+            println("request : $it")
+        }
+    }
+}
diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt
index ad6f0539..6ca00038 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt
@@ -65,7 +65,7 @@ class AccountUtilServcieImpl : AccountUtilServcie {
     }
 
     override fun readShopbyAccno(shopacc: String): TShopacc {
-        return shopaccDao.findByShopacc(shopacc)
+        return shopaccDao.findByShopaccno(shopacc)
                 ?: throw TransactionProcessException(TradeErrorCode.SHOP_NOT_EXISTS, "商户<$shopacc>不存在")
     }