service返回值修改为ServiceResult

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

@@ -29,9 +29,6 @@ public class ${prefix}QueryRepayResult {
     */
     private String actualTime;
 
-    private String failMsg;
-    private String failCode;
-    private List<${prefix}ContractInfoNotice> contractList;
     private ${prefix}RepayTypeEnum repayType;
 
 
@@ -40,40 +37,20 @@ public class ${prefix}QueryRepayResult {
         String loanId = repayResult.getLoanId();
         String repaymentReceivedAt = repayResult.getRepaymentReceivedAt();
 
-        ${prefix}QueryRepayResult callback = new ${prefix}QueryRepayResult();
-        callback.setRepayStatus(${prefix}RepayStatusEnum.getStatusByRepayStatus(repayResult.getRepayStatus()));
-        callback.setRepayType(${prefix}RepayTypeEnum.ACTIVE);
+        ${prefix}QueryRepayResult result = new ${prefix}QueryRepayResult();
+        result.setRepayStatus(${prefix}RepayStatusEnum.getStatusByRepayStatus(repayResult.getRepayStatus()));
+        result.setRepayType(${prefix}RepayTypeEnum.ACTIVE);
         if (StringUtils.isNotBlank(repayResult.getActualRepayment())) {
-            callback.setRepayAmount(new BigDecimal(repayResult.getActualRepayment()));
+            result.setRepayAmount(new BigDecimal(repayResult.getActualRepayment()));
         }
-        if (${prefix}RepayStatusEnum.FAIL == callback.getRepayStatus()) {
-            callback.setFailMsg(repayResult.getFailMsg());
-            callback.setFailCode("0001");
+        if (${prefix}RepayStatusEnum.FAIL == result.getRepayStatus()) {
+           //还款失败情况
         } else {
-            callback.setActualTime(repaymentReceivedAt);
+           //还款成功情况
+           result.setActualTime(repaymentReceivedAt);
         }
-        List<${prefix}ContractInfoNotice> contractInfoNotices = new ArrayList<>();
-        ${prefix}ContractInfoNotice notice = new ${prefix}ContractInfoNotice();
-        notice.setChannelLoanNo(channelLoanNo);
-        notice.setLoanNo(loanId);
-        List<${prefix}InoutPlanNotice> inoutPlanNotices = new ArrayList<>();
-        repaymentPlans.forEach(i -> {
-            ${prefix}InoutPlanNotice planNotice = new ${prefix}InoutPlanNotice();
-            planNotice.setLeaseTime(i.getPeriodNo());
-            planNotice.setReceivedCorpus(i.getActPrincipal());
-            planNotice.setReceivedInterest(i.getActInterest());
-            planNotice.setReceivedFine(i.getActOverdueInterest());
-            planNotice.setReceivedInterestRate(BigDecimal.ZERO);
-            planNotice.setReceivedTotalAmount(i.getRepayAmount());
-            planNotice.setExtraFee(i.getActServiceFee());
-            if (i.getActServiceFee().compareTo(BigDecimal.ZERO) != 0) {
-                planNotice.setExtraInfo("担保费");
-            }
-            inoutPlanNotices.add(planNotice);
-        });
-        notice.setInoutPlanList(inoutPlanNotices);
-        contractInfoNotices.add(notice);
-        callback.setContractList(contractInfoNotices);
-        return callback;
+
+
+        return result;
     }
 }
\ No newline at end of file

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

@@ -20,7 +20,9 @@ import ${modelPackage}.${prefix}ApplyLoanResult;
 import ${modelPackage}.${prefix}QueryLoanRequest;
 import ${modelPackage}.${prefix}QueryLoanResult;
 import ${modelPackage}.${prefix}RepayByPlanRequest;
+import ${modelPackage}.${prefix}RepayByPlanResult;
 import ${modelPackage}.${prefix}QueryRepayRequest;
+import ${modelPackage}.${prefix}QueryRepayResult;
 import cn.quantgroup.loanflow.application.model.ApplyLoanData;
 import cn.quantgroup.loanflow.infrastructure.result.ServiceResult;
 
@@ -117,7 +119,7 @@ public interface ${prefix}Service {
     * @param request
     * @return
     */
-    void repayByPlan(${prefix}RepayByPlanRequest request);
+    ServiceResult<${prefix}RepayByPlanResult>  repayByPlan(${prefix}RepayByPlanRequest request);
 
     /**
     * 查询还款结果
@@ -125,7 +127,7 @@ public interface ${prefix}Service {
     * @param request
     * @return
     */
-    void queryRepayResult(${prefix}QueryRepayRequest request);
+    ServiceResult<${prefix}QueryRepayResult> queryRepayResult(${prefix}QueryRepayRequest request);
 
 }
 

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

@@ -24,8 +24,9 @@ import ${modelPackage}.${prefix}QueryLoanRequest;
 import ${modelPackage}.${prefix}QueryLoanResult;
 
 import ${modelPackage}.${prefix}RepayByPlanRequest;
+import ${modelPackage}.${prefix}RepayByPlanResult;
 import ${modelPackage}.${prefix}QueryRepayRequest;
-import ${modelPackage}.${prefix}CreditApplyRequest;
+import ${modelPackage}.${prefix}QueryRepayResult;
 import ${utilPackage}.${prefix}CodeEnum;
 import ${enumsPackage}.${prefix}LoanPurposesEnum;
 import cn.quantgroup.loanflow.infrastructure.result.ServiceResult;
@@ -445,7 +446,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
     * @return
     */
     @Override
-    public void queryRepayResult(${prefix}QueryRepayRequest request){
+    public ServiceResult<${prefix}QueryRepayResult> queryRepayResult(${prefix}QueryRepayRequest request){
         String logPre = LOG_PRE + "[queryRepayResult][${prefix}查询还款结果]";
         log.info("{} request={}",logPre,request);
         Long channelId = request.getChannelId();
@@ -474,6 +475,9 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
         }
         List<RepaymentPlanItem> repaymentPlans = repaymentServiceResult.getData().getRepaymentPlans();
 
+        ${prefix}QueryRepayResult result = new ${prefix}QueryRepayResult();
+        return ServiceResult.success(result);
+
     }
 
 
@@ -486,7 +490,7 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
     * @return
     */
     @Override
-    public void repayByPlan(${prefix}RepayByPlanRequest request){
+    public ServiceResult<${prefix}RepayByPlanResult> repayByPlan(${prefix}RepayByPlanRequest request){
         String logPre = LOG_PRE + "[repayByPlan][{prefix}发起主动还款]";
         log.info("{} request={}",logPre,request);
         Long channelId = request.getChannelId();
@@ -516,6 +520,9 @@ public class ${prefix}ServiceImpl implements ${prefix}Service{
         }
 
         RepayResultRepresentation repayResultRepresentation = serviceResult.getData();
+
+        ${prefix}RepayByPlanResult result = new ${prefix}RepayByPlanResult();
+        return ServiceResult.success(result);
     }