edit

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

@@ -7,11 +7,13 @@ import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 import java.util.List;
 
 public interface OfflineRepaySubmitRecordRepo extends JpaRepository<OfflineRepaySubmitRecord,Long>, QueryDslPredicateExecutor<OfflineRepaySubmitRecord> {
-    OfflineRepaySubmitRecord findFirstByBillsContains(String bill);
-
     OfflineRepaySubmitRecord findBySerialNoEquals(String serialNo);
 
     OfflineRepaySubmitRecord findFirstByUniqueIdEquals(String uniqueId);
 
+    OfflineRepaySubmitRecord findFirstByUniqueIdEqualsAndApprovalStatusNot(String uniqueId,Integer approvalStatus);
+
     List<OfflineRepaySubmitRecord> findByUserIdEqualsAndRepayTypeEquals(Integer userId,Integer repayType);
+
+    List<OfflineRepaySubmitRecord> findByUserIdEqualsAndRepayTypeEqualsAndApprovalStatusNot(Integer userId,Integer repayType,Integer approvalStatus);
 }

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

@@ -141,7 +141,7 @@ public class VccServiceImpl implements IVccService {
             //月还账单
             List<ApplyBill> list = param.getList();
 
-            List<OfflineRepaySubmitRecord> byUserIdEqualsAndRepayTypeEquals = offlineRepaySubmitRecordRepo.findByUserIdEqualsAndRepayTypeEquals(param.getUserId(), 1);
+            List<OfflineRepaySubmitRecord> byUserIdEqualsAndRepayTypeEquals = offlineRepaySubmitRecordRepo.findByUserIdEqualsAndRepayTypeEqualsAndApprovalStatusNot(param.getUserId(), 1,2);
             if (!CollectionUtils.isEmpty(byUserIdEqualsAndRepayTypeEquals)){
                 for (OfflineRepaySubmitRecord record:byUserIdEqualsAndRepayTypeEquals){
                     List<ApplyBill> billList = GSON.fromJson(record.getBills(), new TypeToken<List<ApplyBill>>() {
@@ -161,7 +161,7 @@ public class VccServiceImpl implements IVccService {
             record.setApprovalStatus(0);
             offlineRepaySubmitRecordRepo.save(record);
         }else {
-            OfflineRepaySubmitRecord firstByUniqueIdEquals = offlineRepaySubmitRecordRepo.findFirstByUniqueIdEquals(param.getUniqueId());
+            OfflineRepaySubmitRecord firstByUniqueIdEquals = offlineRepaySubmitRecordRepo.findFirstByUniqueIdEqualsAndApprovalStatusNot(param.getUniqueId(),2);
             if (Objects.nonNull(firstByUniqueIdEquals)){
                 log.error("saveSubmitRecord | 提交时发现已经提交过了，请确认,uniqueId={}",param.getUniqueId());
                 throw new Exception("提交时发现已经提交过了，请确认,uniqueId="+param.getUniqueId());