edit

src/main/java/cn/quantgroup/customer/enums/VccRepayStatusEnum.java

+package cn.quantgroup.customer.enums;
+
+public enum VccRepayStatusEnum {
+    /**
+     * 正常状态，主要包括：还款计划未出账、额度状态正常
+     */
+    Normal("正常"),
+
+    /**
+     * 还款状态，主要包括：账单待还款、还款计划待还款
+     * 韩伟：待还款，生成账单后
+     */
+    Repay("还款"),
+    /**
+     * 逾期状态，主要包括：账单逾期、还款计划逾期
+     */
+    Overdue("逾期"),
+
+    /**
+     * 完结状态，主要包括：账单还清、还款计划还清、分期交易还清
+     */
+    Finish("完结"),
+    /**
+     * 完成状态， 主要包括：交易完成
+     */
+    Complete("完成");
+
+    private String desc;
+    private VccRepayStatusEnum(String desc){
+        this.desc = desc;
+    }
+
+
+    public static String getDescByValue(String value){
+        for (VccRepayStatusEnum statusEnum:VccRepayStatusEnum.values()){
+            if (statusEnum.toString().equals(value)){
+                return statusEnum.desc;
+            }
+        }
+        return "";
+    }
+}

src/main/java/cn/quantgroup/customer/repo/OfflineRepaySubmitRecordRepo.java

@@ -16,4 +16,6 @@ public interface OfflineRepaySubmitRecordRepo extends JpaRepository<OfflineRepay
     List<OfflineRepaySubmitRecord> findByUserIdEqualsAndRepayTypeEquals(Integer userId,Integer repayType);
 
     List<OfflineRepaySubmitRecord> findByUserIdEqualsAndRepayTypeEqualsAndApprovalStatusNot(Integer userId,Integer repayType,Integer approvalStatus);
+
+    OfflineRepaySubmitRecord findBySerialNoEqualsAndApprovalStatusEquals(String serialNo,Integer approvalStatus);
 }

src/main/java/cn/quantgroup/customer/rest/vo/vcc/QueryPreOfflineRepayVo.java

@@ -16,6 +16,7 @@ public class QueryPreOfflineRepayVo {
     private BigDecimal currBall;
     private BigDecimal settleAmount;
     private String repayStatus;
+    private String repayStatusName;
     private String billTime;
     private String repayTime;
     private String serialNo;

src/main/java/cn/quantgroup/customer/rest/vo/vcc/QuerySubmitRecordVo.java

+package cn.quantgroup.customer.rest.vo.vcc;
+
+import cn.quantgroup.customer.entity.OfflineRepaySubmitRecord;
+import lombok.Data;
+
+@Data
+public class QuerySubmitRecordVo extends OfflineRepaySubmitRecord {
+    private static final long serialVersionUID = -1359026440976090642L;
+
+    private String repayStatusName;
+}

src/main/java/cn/quantgroup/customer/service/impl/VccServiceImpl.java

@@ -4,6 +4,7 @@ import cn.quantgroup.customer.entity.OfflineRepayOperateRecord;
 import cn.quantgroup.customer.entity.OfflineRepaySubmitRecord;
 import cn.quantgroup.customer.entity.OpUser;
 import cn.quantgroup.customer.entity.QOfflineRepaySubmitRecord;
+import cn.quantgroup.customer.enums.VccRepayStatusEnum;
 import cn.quantgroup.customer.repo.OfflineRepayOperateRecordRepo;
 import cn.quantgroup.customer.repo.OfflineRepaySubmitRecordRepo;
 import cn.quantgroup.customer.rest.param.vcc.ApplyBill;
@@ -11,6 +12,7 @@ import cn.quantgroup.customer.rest.param.vcc.OfflineRepaySubmitParam;
 import cn.quantgroup.customer.rest.param.vcc.UserPreRepayInfoQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.vcc.QueryPreOfflineRepayVo;
+import cn.quantgroup.customer.rest.vo.vcc.QuerySubmitRecordVo;
 import cn.quantgroup.customer.service.IFastDFSService;
 import cn.quantgroup.customer.service.IOpSystemService;
 import cn.quantgroup.customer.service.IVccService;
@@ -211,7 +213,7 @@ public class VccServiceImpl implements IVccService {
     @Override
     @Transactional
     public void approvalResult(String serialNo, String remark, Integer status ,String token) throws Exception {
-        OfflineRepaySubmitRecord bySerialNoEquals = offlineRepaySubmitRecordRepo.findBySerialNoEquals(serialNo);
+        OfflineRepaySubmitRecord bySerialNoEquals = offlineRepaySubmitRecordRepo.findBySerialNoEqualsAndApprovalStatusEquals(serialNo,0);
         if (Objects.isNull(bySerialNoEquals)){
             log.error("approvalQuery | 没有查询到这条申请记录，请确认：serialNo = {}",serialNo);
             throw new Exception("没有查询到这条申请记录，请确认：serialNo = " + serialNo);
@@ -226,6 +228,9 @@ public class VccServiceImpl implements IVccService {
             String url = "";
             String phone = bySerialNoEquals.getPhone();
             UserSysResult<XUser> userByPhoneNo = userSdk.getService().findUserByPhoneNo(phone);
+            if (userByPhoneNo == null || !userByPhoneNo.isSuccess() || userByPhoneNo.getData() == null) {
+                throw new RuntimeException("用户中心接口findUserDetailByPhone返回失败");
+            }
             if ( 1 == bySerialNoEquals.getRepayType()){
                 //月还账单
                 List<ApplyBill> billList = GSON.fromJson(bySerialNoEquals.getBills(), new TypeToken<List<ApplyBill>>() {
@@ -313,10 +318,17 @@ public class VccServiceImpl implements IVccService {
         int offset = (query.getPageIndex() -1) * query.getPageSize();
         Page<OfflineRepaySubmitRecord> plantPage = offlineRepaySubmitRecordRepo.findAll(booleanExpression, new PageRequest(offset, query.getPageSize()));
         List<OfflineRepaySubmitRecord> content = plantPage.getContent();
+        List<QuerySubmitRecordVo> submitRecordVoList = new ArrayList<>();
+        for (OfflineRepaySubmitRecord record : content){
+            QuerySubmitRecordVo submitRecordVo = new QuerySubmitRecordVo();
+            BeanUtils.copyProperties(record,submitRecordVo);
+            submitRecordVo.setRepayStatusName(VccRepayStatusEnum.getDescByValue(submitRecordVo.getRepayStatus()));
+            submitRecordVoList.add(submitRecordVo);
+        }
         Map<String,Object> map = new HashMap<>();
         map.put("count",count);
         map.put("type",query.getRepayType());
-        map.put("list",content);
+        map.put("list",submitRecordVoList);
         return JsonResult.buildSuccessResult("请求成功",map);
     }