service返回值修改为ServiceResult

src/main/resources/templates/code-generator/model/QueryCreditApplyResult.ftl

@@ -6,7 +6,6 @@ import lombok.Data;
 import cn.quantgroup.cashloanflow.model.standard.response.credit.CreditStatusEnum;
 import cn.quantgroup.cashloanflow.model.standard.response.credit.QueryCreditStatusResponseModel;
 import cn.quantgroup.cashloanflow.util.DateUtil;
-import cn.quantgroup.clf.api.jinshan.util.JinShanUtil;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -53,27 +52,6 @@ public class ${prefix}QueryCreditApplyResult {
 
     public static ${prefix}QueryCreditApplyResult getSuccessResult(QueryCreditStatusResponseModel info) {
         ${prefix}QueryCreditApplyResult result = new ${prefix}QueryCreditApplyResult();
-        result.setCreditResult(${prefix}CreditResultEnum.CREDIT_NORMAL);
-        // 当授信单已经提现后，授信剩余可用额度为0
-        if (CreditStatusEnum.WITHDRAW.getValue().equals(info.getCreditStatus())) {
-            result.setCreditAmount(BigDecimal.ZERO );
-        } else {
-            result.setCreditAmount(StringUtils.isBlank(info.getApprovalAmount()) ? BigDecimal.ZERO : new BigDecimal(info.getApprovalAmount()));
-        }
-        result.setCreditAvailable(StringUtils.isBlank(info.getApprovalAmount()) ? BigDecimal.ZERO : new BigDecimal(info.getApprovalAmount()));
-        result.setTermLabelsRule(JinShanUtil.TERM_LABELS_RULE);
-        List<${prefix}RepaymentMethodTermLabel> list = new ArrayList<>();
-        ${prefix}RepaymentMethodTermLabel methodTermLabel = new ${prefix}RepaymentMethodTermLabel();
-        methodTermLabel.setTermLabelsRuleValue("EQUAL_RENT");
-        String monthlyInterestRate = info.getMonthlyInterestRate();
-        methodTermLabel.setDailyRate(StringUtils.isBlank(monthlyInterestRate) ? BigDecimal.ZERO : new BigDecimal(monthlyInterestRate).divide(new BigDecimal("30"), 4, BigDecimal.ROUND_HALF_UP));
-        methodTermLabel.setMonthlyRate(StringUtils.isBlank(monthlyInterestRate) ? BigDecimal.ZERO : new BigDecimal(monthlyInterestRate).setScale(4, BigDecimal.ROUND_HALF_UP));
-        methodTermLabel.setYearlyRate(StringUtils.isBlank(monthlyInterestRate) ? BigDecimal.ZERO : new BigDecimal(monthlyInterestRate).multiply(new BigDecimal("12")).setScale(4, BigDecimal.ROUND_HALF_UP));
-        methodTermLabel.setLoanTerm(info.getApprovalTerm());
-
-        list.add(methodTermLabel);
-        result.setRepaymentMethodTermLabels(list);
-        result.setCreditExpireDate(DateUtil.format(info.getValidDate(), DateUtil.YYYY_MM_DD));
         return result;
     }
 

src/main/resources/templates/code-generator/service/Service.ftl

 package ${servicePackage};
 
 import ${modelPackage}.${prefix}CreditApplyRequest;
+import ${modelPackage}.${prefix}QueryCreditApplyResult;
+import ${modelPackage}.${prefix}CreditApplyResult;
 import ${modelPackage}.${prefix}QueryCreditApplyRequest;
 import ${modelPackage}.${prefix}UserAccessRequest;
 import ${modelPackage}.${prefix}UserAccessResult;
@@ -37,7 +39,7 @@ public interface ${prefix}Service {
     * @param request
     * @return
     */
-    void creditApply(${prefix}CreditApplyRequest request);
+    ServiceResult<${prefix}CreditApplyResult> creditApply(${prefix}CreditApplyRequest request);
 
 
 
@@ -47,7 +49,7 @@ public interface ${prefix}Service {
     * @param request
     * @return
     */
-    void queryCreditApply(${prefix}QueryCreditApplyRequest request);
+    ServiceResult<${prefix}QueryCreditApplyResult> queryCreditApply(${prefix}QueryCreditApplyRequest request);
 
 
     /**

src/main/resources/templates/code-generator/service/ServiceImpl.ftl

@@ -153,7 +153,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
     * @return
     */
     @Override
-    public void creditApply(${prefix}CreditApplyRequest request){
+    public ServiceResult<${prefix}CreditApplyResult> creditApply(${prefix}CreditApplyRequest request){
         String logPre = LOG_PRE +"[creditApply][授信申请]";
         log.info("{} request={}",logPre,request);
         ApplyLoanData applyLoanData = ${prefix}CreditApplyRequest.getApplyLoanData(request);
@@ -163,6 +163,12 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
             throw new CommonBizException("调用进件服务异常");
         }
         ApplyLoanRequestData applyResult = serviceResult.getData();
+        //授信订单号
+        String applyNo = applyResult.getApplyNo();
+
+        ${prefix}CreditApplyResult result = new ${prefix}CreditApplyResult();
+        result.setApplyNo(applyNo);
+        return ServiceResult.success(result);
 
     }
 
@@ -176,7 +182,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
     * @return
     */
     @Override
-    public void queryCreditApply(${prefix}QueryCreditApplyRequest request){
+    public ServiceResult<${prefix}QueryCreditApplyResult> queryCreditApply(${prefix}QueryCreditApplyRequest request){
         String logPre = LOG_PRE + "[queryCreditApply][${prefix}查询授信结果]";
         log.info("{} request={}",logPre,request);
         Long channelId = request.getChannelId();
@@ -228,6 +234,10 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
         }
 
 
+        ${prefix}QueryCreditApplyResult result = new ${prefix}QueryCreditApplyResult();
+        return ServiceResult.success(result);
+
+
     }