Skip to content

K
ka-code-generator
Commit e104edd4 authored by xiaozhe.chen's avatar xiaozhe.chen
Browse files
Options

service返回值修改为ServiceResult

parent 383dc876
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 44 deletions
src/main/resources/templates/code-generator/model/BindBankCardSmsResult.ftl
View file @ e104edd4
......@@ -10,7 +10,6 @@ import lombok.Data;
* @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
*/
@Data
@AllArgsConstructor
public class ${prefix}BindBankCardSmsResult {
private String verifyId;
......
src/main/resources/templates/code-generator/model/QueryLoanResult.ftl
View file @ e104edd4
......@@ -18,11 +18,9 @@ public class ${prefix}QueryLoanResult {
private String loanApplyStatus;
private String applyResult;
private String loanQueryTransNo;
public ${prefix}QueryLoanResult(OrderStatus orderStatus) {
this.loanQueryTransNo = RegisterFrom.JINSHAN.getValue() + DateUtil.get13LongTimeFormLong();
log.info("借款申请的结果返回的查询交易流水号={}", loanQueryTransNo);
switch (orderStatus.getStatus()) {
case WITHDRAW:
case PAY_ING:
......
src/main/resources/templates/code-generator/service/Service.ftl
View file @ e104edd4
......@@ -11,9 +11,14 @@ import ${modelPackage}.${prefix}QuerySupportBankcardsResult;
import ${modelPackage}.${prefix}QueryLoanTrialRequest;
import ${modelPackage}.${prefix}QueryLoanTrialResult;
import ${modelPackage}.${prefix}BindBankCardSmsRequest;
import ${modelPackage}.${prefix}BindBankCardSmsResult;
import ${modelPackage}.${prefix}VerifyBindSmsRequest;
import ${modelPackage}.${prefix}VerifyBindSmsResult;
import ${modelPackage}.${prefix}ApplyLoanRequest;
import ${modelPackage}.${prefix}ApplyLoanResult;
import ${modelPackage}.${prefix}QueryLoanRequest;
import ${modelPackage}.${prefix}QueryLoanResult;
import ${modelPackage}.${prefix}RepayByPlanRequest;
import ${modelPackage}.${prefix}QueryRepayRequest;
import cn.quantgroup.loanflow.application.model.ApplyLoanData;
......@@ -77,7 +82,7 @@ public interface ${prefix}Service {
* @param request
* @return
*/
void bindBankCardSms(${prefix}BindBankCardSmsRequest request);
ServiceResult<${prefix}BindBankCardSmsResult> bindBankCardSms(${prefix}BindBankCardSmsRequest request);
/**
* 验卡
......@@ -85,7 +90,7 @@ public interface ${prefix}Service {
* @param request
* @return
*/
void verifyBindSms(${prefix}VerifyBindSmsRequest request);
ServiceResult<${prefix}VerifyBindSmsResult> verifyBindSms(${prefix}VerifyBindSmsRequest request);
/**
......@@ -94,7 +99,7 @@ public interface ${prefix}Service {
* @param request
* @return
*/
void applyWithdraw(${prefix}ApplyLoanRequest request);
ServiceResult<${prefix}ApplyLoanResult> applyWithdraw(${prefix}ApplyLoanRequest request);
/**
......@@ -103,7 +108,7 @@ public interface ${prefix}Service {
* @param request
* @return
*/
void queryLoanResult(${prefix}QueryLoanRequest request);
ServiceResult<${prefix}QueryLoanResult> queryLoanResult(${prefix}QueryLoanRequest request);
/**
......
src/main/resources/templates/code-generator/service/ServiceImpl.ftl
View file @ e104edd4
......@@ -12,10 +12,17 @@ import ${modelPackage}.${prefix}QueryLoanTrialRequest;
import ${modelPackage}.${prefix}QueryLoanTrialResult;
import ${modelPackage}.${prefix}UserAccessResult;
import ${modelPackage}.${prefix}BindBankCardSmsRequest;
import ${modelPackage}.${prefix}BindBankCardSmsResult;
import ${modelPackage}.${prefix}CreditApplyResult;
import ${modelPackage}.${prefix}VerifyBindSmsRequest;
import ${modelPackage}.${prefix}VerifyBindSmsResult;
import ${modelPackage}.${prefix}ApplyLoanRequest;
import ${modelPackage}.${prefix}ApplyLoanResult;
import ${modelPackage}.${prefix}QueryLoanRequest;
import ${modelPackage}.${prefix}QueryLoanResult;
import ${modelPackage}.${prefix}RepayByPlanRequest;
import ${modelPackage}.${prefix}QueryRepayRequest;
import ${modelPackage}.${prefix}CreditApplyRequest;
......@@ -305,7 +312,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
* @return
*/
@Override
public void bindBankCardSms(${prefix}BindBankCardSmsRequest request){
public ServiceResult<${prefix}BindBankCardSmsResult> bindBankCardSms(${prefix}BindBankCardSmsRequest request){
String logPre = LOG_PRE + "[bindBankCardSms][${prefix}绑卡发短信]";
log.info("{} request={}",logPre,request);
Long channelId = request.getChannelId();
......@@ -319,6 +326,10 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
throw new CommonBizException("绑卡服务异常");
}
BindCardVerifyInfo bindCardVerifyInfo = serviceResult.getData();
String verificationId = bindCardVerifyInfo.getVerificationId();
${prefix}BindBankCardSmsResult result = new ${prefix}BindBankCardSmsResult();
return ServiceResult.success(result);
}
......@@ -329,7 +340,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
* @return
*/
@Override
public void verifyBindSms(${prefix}VerifyBindSmsRequest request){
public ServiceResult<${prefix}VerifyBindSmsResult> verifyBindSms(${prefix}VerifyBindSmsRequest request){
String logPre = LOG_PRE + "[verifyBindSms][${prefix}验卡]";
log.info("{} request={}",logPre,request);
Long channelId = request.getChannelId();
......@@ -343,6 +354,10 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
}
BindCardConfirm bindCardConfirm = serviceResult.getData();
String bankCardId = bindCardConfirm.getBankCardId();
${prefix}VerifyBindSmsResult result = new ${prefix}VerifyBindSmsResult();
return ServiceResult.success(result);
}
......@@ -354,7 +369,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
* @return
*/
@Override
public void applyWithdraw(${prefix}ApplyLoanRequest request){
public ServiceResult<${prefix}ApplyLoanResult> applyWithdraw(${prefix}ApplyLoanRequest request){
String logPre = LOG_PRE + "[applyWithdraw][${prefix}申请提现]";
log.info("{} request={}",logPre,request);
Long channelId = request.getChannelId();
......@@ -379,9 +394,49 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
}
WithdrawResult withdrawResult = serviceResult.getData();
Long loanId = withdrawResult.getLoanId();
${prefix}ApplyLoanResult result = new ${prefix}ApplyLoanResult();
return ServiceResult.success(result);
}
/**
* 借款结果查询
*
* @param request
* @return
*/
@Override
public ServiceResult<${prefix}QueryLoanResult> queryLoanResult(${prefix}QueryLoanRequest request){
String logPre = LOG_PRE + "[queryLoanResult][${prefix}查询借款结果]";
log.info("{} request={}",logPre,request);
Long channelId =request.getChannelId();
String channelLoanNo = request.getChannelLoanNo();
LoanMapping loanMapping = loanMappingService.findByChannelLoanNoAndChannelId(channelLoanNo, channelId);
if (Objects.isNull(loanMapping)) {
log.error("{},查询借款订单为空，channelLoan={}", logPre, channelLoanNo);
throw new CommonBizException("查询借据信息异常");
}
LoanOrderMapping orderMapping = loanOrderMappingService.findById(loanMapping.getOrderMappingId());
if (Objects.isNull(orderMapping)) {
log.error("{}查询授信订单失败, result为空, request={}", logPre, request);
throw new CommonBizException("查询授信订单异常");
}
ServiceResult<OrderStatus> serviceResult = standardApplicationService.queryOrderStatus(orderMapping.getChannelOrderNo(), channelLoanNo, channelId, null);
if (!serviceResult.isSuccess()) {
log.error("{}查询订单状态失败, result={}, request={}", logPre, serviceResult, request);
throw new CommonBizException("查询订单状态服务异常");
}
OrderStatus orderStatus = serviceResult.getData();
${prefix}QueryLoanResult result = new ${prefix}QueryLoanResult();
return ServiceResult.success(result);
}
/**
* 查询还款结果
......@@ -422,38 +477,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
}
/**
* 借款结果查询
*
* @param request
* @return
*/
@Override
public void queryLoanResult(${prefix}QueryLoanRequest request){
String logPre = LOG_PRE + "[queryLoanResult][${prefix}查询借款结果]";
log.info("{} request={}",logPre,request);
Long channelId =request.getChannelId();
String channelLoanNo = request.getChannelLoanNo();
LoanMapping loanMapping = loanMappingService.findByChannelLoanNoAndChannelId(channelLoanNo, channelId);
if (Objects.isNull(loanMapping)) {
log.error("{},查询借款订单为空，channelLoan={}", logPre, channelLoanNo);
throw new CommonBizException("查询借据信息异常");
}
LoanOrderMapping orderMapping = loanOrderMappingService.findById(loanMapping.getOrderMappingId());
if (Objects.isNull(orderMapping)) {
log.error("{}查询授信订单失败, result为空, request={}", logPre, request);
throw new CommonBizException("查询授信订单异常");
}
ServiceResult<OrderStatus> serviceResult = standardApplicationService.queryOrderStatus(orderMapping.getChannelOrderNo(), channelLoanNo, channelId, null);
if (!serviceResult.isSuccess()) {
log.error("{}查询订单状态失败, result={}, request={}", logPre, serviceResult, request);
throw new CommonBizException("查询订单状态服务异常");
}
OrderStatus orderStatus = serviceResult.getData();
}
/**
* 主动还款
......@@ -477,13 +501,13 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
.channelId(channelId)
.channelLoanNo(request.getChannelLoanNo())
.build();
String remoteIP = IpUtil.getRemoteIP(httpServletRequest);
String remoteIp = IpUtil.getRemoteIP(httpServletRequest);
final NormalRepayCommand command = NormalRepayCommand.builder()
.payBusinessFlowNo(request.getBusinessFlowNo())
.termNo(Long.valueOf(request.getTermNo()))
.repayAmount(new BigDecimal(request.getRepayAmount()))
.bankCardNumber(bankCardInfoOutput.getCardNo())
.clientIp(remoteIP)
.clientIp(remoteIp)
.build();
ServiceResult<RepayResultRepresentation> serviceResult = standardApplicationService.normalRepayByCycleQuota(channelOrder, command);
if (!serviceResult.isSuccess()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment