删除多余代码

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java
index 850430e..d497f2e 100644 (file)
--- a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java
@@ -123,7 +123,7 @@ public interface ConsumeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "退款申请查询成功", response = RefundResponse.class),
         @ApiResponse(code = 404, message = "退款申请订单不存在", response = ErrorResponse.class),
-        @ApiResponse(code = 200, message = "退款申请失败", response = ErrorResponse.class) })
+        @ApiResponse(code = 500, message = "退款申请失败", response = ErrorResponse.class) })
     @RequestMapping(value = "/consume/refund/query/{refno}",
         produces = { "application/json" }, 
         method = RequestMethod.GET)

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java
index 1c8123b..b3fbfc7 100644 (file)
--- a/payapi/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java
@@ -3,7 +3,6 @@ package com.supwisdom.dlpay.framework.service;
 import com.supwisdom.dlpay.framework.data.SystemDateTime;
 import com.supwisdom.dlpay.framework.domain.TBusinesspara;
 import com.supwisdom.dlpay.framework.domain.TSyspara;
-import com.supwisdom.dlpay.framework.domain.TTaskLock;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt
index 699bea3..f7a4752 100644 (file)
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt
@@ -129,14 +129,6 @@ class DtlQueryResultSchedulerTask : TenantWorkerTask {
                 dtlQueryResultService.saveOrUpdateDtlQuery(dtlQuery)
                 return
             }
-            TradeDict.PAYTYPE_CITIZEN_CARD != dtl.sourceType -> {
-                //fixme: 现仅供大理农商卡对接查询
-                dtlQuery.qcnt = dtlQuery.qcnt + 1
-                dtlQuery.status = ConstantUtil.QUERYTYPE_QUERY_FINISH
-                dtlQuery.remark = "非大理市民卡支付流水"
-                dtlQueryResultService.saveOrUpdateDtlQuery(dtlQuery)
-                return
-            }
             else -> {
                 val service = agentPayServiceContext.findAgentPayService<Any>(dtl.sourceType)
                 val resp = service.query(dtl)

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt
index 22fa55a..cb554dc 100644 (file)
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt
@@ -1,6 +1,5 @@
 package com.supwisdom.dlpay.api.service.impl
 
-import com.supwisdom.dlpay.agent.dao.QrcodePayTransDao
 import com.supwisdom.dlpay.api.TransactionBuilder
 import com.supwisdom.dlpay.api.dao.RefundDtlDao
 import com.supwisdom.dlpay.api.dao.TransactionMainDao
@@ -44,9 +43,6 @@ class TransactionServiceImpl : TransactionService {
     @Autowired
     private lateinit var sourceTypeService: SourceTypeService
 
-    @Autowired
-    private lateinit var qrcodePayTransDao: QrcodePayTransDao
-
     @Autowired
     private lateinit var refundDtlDao: RefundDtlDao
 
@@ -122,7 +118,6 @@ class TransactionServiceImpl : TransactionService {
                     this.reverseFlag = TradeDict.REVERSE_FLAG_NONE
                     remark = builder.person().remark
                     tenantid = transaction.tenantid
-                    this.accountName = "main"
                     this.dtltype = builder.dtltype
                     this.status = status
                     this.anonymous = builder.person().isAnonymous()