H5充值修改
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/SourceTypeResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/SourceTypeResponse.java
deleted file mode 100644
index 8a25097..0000000
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/SourceTypeResponse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.supwisdom.dlpay.api.bean;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.List;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class SourceTypeResponse extends ApiResponse {
- private String name;
- private String type;
- private String value;
- private List<SourceTypeResponse> sourceTypeList;
-
-}
diff --git a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
index cfe3381..163cd76 100644
--- a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
+++ b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
@@ -51,7 +51,4 @@
@JwtMethod
CardBizResponse bizQuery(@RequestParam("refno") String refno);
- @GetMapping("/api/user/getpaytypeList")
- @JwtMethod
- SourceTypeResponse getpaytypeList(@RequestParam("depositeSubjno") String depositeSubjno);
}
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java
index 5ed3e04..51ab233 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java
@@ -26,5 +26,5 @@
@Query("from TSourceType t where t.enable=true and t.checkable=true and t.tenantid=?1 order by t.sourceType ")
List<TSourceType> findNeedChecks(String tenantid);
- List<TSourceType> findTSourceTypesByDepositeSubjno(String depositeSubjno);
+
}
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java
index b72f8d2..e6a8734 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java
@@ -23,6 +23,8 @@
TTransactionMain findByRefno(String refno);
+ TTransactionMain findByOutTradeNo(String refno);
+
@Query("select t from TTransactionMain t where t.outTradeNo=?1 and t.outId=?2")
TTransactionMain findByBillno(String billno, String outid);
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java
index 066ad15..c44f94e 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java
@@ -1,6 +1,5 @@
package com.supwisdom.dlpay.api.service;
-import com.supwisdom.dlpay.api.bean.SourceTypeResponse;
import com.supwisdom.dlpay.api.domain.TSourceType;
import com.supwisdom.dlpay.api.domain.TSourceTypeCheckStatus;
import org.springframework.transaction.annotation.Propagation;
@@ -53,7 +52,6 @@
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
TSourceTypeCheckStatus saveOrUpdateSourceTypeCheckStatus(TSourceTypeCheckStatus s);
- @Transactional(rollbackFor = Exception.class, readOnly = true)
- SourceTypeResponse findTSourceTypesByDepositeSubjno(String depositeSubjno);
+
}
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java
index fa34964..a4d4041 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java
@@ -1,6 +1,5 @@
package com.supwisdom.dlpay.api.service.impl;
-import com.supwisdom.dlpay.api.bean.SourceTypeResponse;
import com.supwisdom.dlpay.api.dao.*;
import com.supwisdom.dlpay.api.domain.*;
import com.supwisdom.dlpay.api.service.SourceTypeService;
@@ -12,7 +11,6 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -213,19 +211,5 @@
return sourceTypeCheckDao.save(s);
}
- @Override
- public SourceTypeResponse findTSourceTypesByDepositeSubjno(String depositeSubjno) {
- SourceTypeResponse sourceTypeResponseR = new SourceTypeResponse();
- List<TSourceType> tSourceTypes = sourceTypeDao.findTSourceTypesByDepositeSubjno(depositeSubjno);
- List<SourceTypeResponse> sourceTypeList = new ArrayList<SourceTypeResponse>();
- for(TSourceType tSourceType:tSourceTypes){
- SourceTypeResponse sourceTypeResponse = new SourceTypeResponse();
- sourceTypeResponse.setName(tSourceType.getPaydesc());
- sourceTypeResponse.setType(tSourceType.getSourceType());
- sourceTypeResponse.setValue(tSourceType.getSourceType());
- sourceTypeList.add(sourceTypeResponse);
- }
- sourceTypeResponseR.setSourceTypeList(sourceTypeList);
- return sourceTypeResponseR;
- }
+
}
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/transaction_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/transaction_controller.kt
index d2d190e..38feb1a 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/transaction_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/transaction_controller.kt
@@ -64,7 +64,7 @@
@GetMapping("/inapp/query")
fun queryTransaction(refno: String): ResponseEntity<*> {
- val transaction = transactionServiceProxy.findTransactionByRefno(refno)
+ val transaction = transactionServiceProxy.findByOutTradeNo(refno)
?: return ResponseBodyBuilder.notFound("未找到流水")
if (transaction.tenantid != TenantContextHolder.getContext().tenant.id) {
return ResponseBodyBuilder.conflict("未找到流水")
@@ -117,7 +117,7 @@
.setTransInfo(param.transDate, param.transTime, tradeCode, sourceType.sourceType)
.setOutTransInfo(TenantContextHolder.getContext().tenant.id, param.billno)
.apply {
- param.description = "描述不能为空";
+ param.description = "H5充值";
description = param.description
dtltype = "recharge" //必须的参数
}
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index d98fa18..375c891 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
@@ -37,8 +37,7 @@
@Autowired
private lateinit var transactionService: TransactionServiceProxy
- @Autowired
- private lateinit var sourceTypeService: SourceTypeService
+
@PostMapping("/open")
@@ -375,13 +374,5 @@
return ResponseBodyBuilder.successEntity(result)
}
- @GetMapping("/getpaytypeList")
- fun getpaytypeList(depositeSubjno: String): ResponseEntity<SourceTypeResponse> {
- val sourceTypeResponse = sourceTypeService.findTSourceTypesByDepositeSubjno(depositeSubjno)
- if(sourceTypeResponse.sourceTypeList==null||sourceTypeResponse.sourceTypeList.size<1){
- return ResponseBodyBuilder.failEntity(sourceTypeResponse, TradeErrorCode.BUSINESS_DEAL_ERROR,
- "未配置支付方式")
- }
- return ResponseBodyBuilder.successEntity(sourceTypeResponse)
- }
+
}
\ No newline at end of file
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt
index ad2402d..ca4ef1d 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt
@@ -148,4 +148,8 @@
fun findTransactionByRefno(refno: String): TTransactionMain? {
return transactionMainDao.findByRefno(refno)
}
+
+ fun findByOutTradeNo(refno: String): TTransactionMain? {
+ return transactionMainDao.findByOutTradeNo(refno)
+ }
}