二次审批 重复操作

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/repository/OptHistoryLogRepository.java

@@ -5,6 +5,7 @@ import cn.quantgroup.cashloanflowboss.api.order.entity.OrderApprove;
 import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowBossDataSource;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
@@ -20,6 +21,10 @@ import java.util.List;
 @Repository
 public interface OptHistoryLogRepository extends PagingAndSortingRepository<OptHistoryLog, Long>, JpaSpecificationExecutor<OptHistoryLog> {
 
+
+    @Query(value = "select * opt_history_log where channel_order_number=?1 and opt_name = ?2 limit 1", nativeQuery = true)
+    OptHistoryLog findByChannelOrderNumberAndOptName(String channelOrderNumber, String opName);
+
     List<OptHistoryLog> findByChannelOrderNumber(String channelOrderNumber);
 
     List<OptHistoryLog> findByCreditNumber(String creditOrderNumber);

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/service/OptHistoryLogService.java

@@ -17,4 +17,6 @@ public interface OptHistoryLogService {
     List<OptHistoryLog> getLocalOptHisttoryLog(OrderBaseModel orderBaseModel);
 
     void save(OptHistoryLog optHistoryLog);
+
+    OptHistoryLog findByChannelOrderNumberAndOptName(String channelOrderNumber, String opName);
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/service/OptHistoryLogServiceImpl.java

@@ -113,4 +113,9 @@ public class OptHistoryLogServiceImpl implements OptHistoryLogService {
     }
 
 
+    @Override
+    public OptHistoryLog findByChannelOrderNumberAndOptName(String channelOrderNumber, String opName) {
+        return optHistoryLogRepository.findByChannelOrderNumberAndOptName(channelOrderNumber, opName);
+    }
+
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java

@@ -310,6 +310,10 @@ public class OrderServiceImpl implements OrderService{
     @Override
     public boolean secondAudit(String channelOrderNumber) {
 
+        String opName = "二次审批操作";
+
+
+
         boolean result = true;
 
         // 操作记录
@@ -320,7 +324,7 @@ public class OrderServiceImpl implements OrderService{
         ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
         if (orderMapping == null || orderMapping.getLoanId() == null) {
             log.info("secondAudit,orderMapping为空或者loanId为空，channelOrderNumber=".concat(channelOrderNumber));
-            optHistoryLog.setOptName("二次审批操作");
+            optHistoryLog.setOptName(opName);
             optHistoryLog.setOptLogDetail("orderMapping为空或者loanId为空,操作失败");
             optHistoryLog.setOptResult(false);
             optHistoryLog.setCreateTime(new Date());
@@ -331,19 +335,25 @@ public class OrderServiceImpl implements OrderService{
         optHistoryLog.setCreditNumber(orderMapping.getApplyNo());
         optHistoryLog.setLoanId(orderMapping.getLoanId());
         optHistoryLog.setChannelId(orderMapping.getRegisteredFrom());
-        optHistoryLog.setOptName("二次审批操作");
+        optHistoryLog.setOptName(opName);
         optHistoryLog.setCreateTime(new Date());
 
+        OptHistoryLog optHistoryLogExsit = optHistoryLogService.findByChannelOrderNumberAndOptName(channelOrderNumber, opName);
+        if (optHistoryLogExsit != null && optHistoryLogExsit.getOptResult()) {
+            log.info("secondAudit,已经操作成功，channelOrderNumber=".concat(channelOrderNumber));
+            optHistoryLog.setOptLogDetail("已经操作成功. 重复操作");
+            optHistoryLog.setOptResult(true);
+            optHistoryLogService.save(optHistoryLog);
+            return true;
+        }
 
         // 更新合同状态
         Contract conscont= xyqbCenterService.findContractByUserId(orderMapping.getQgUserId());
         if (conscont != null) {
             if (conscont.getGenerateStatus() != 2) {
                 log.info("secondAudit,合同状态不对，channelOrderNumber=".concat(channelOrderNumber));
-                optHistoryLog.setOptName("二次审批操作");
                 optHistoryLog.setOptLogDetail("合同状态不对,手动修改,可能会导致合同签章获取失败,请更换新的身份证尝试");
                 optHistoryLog.setOptResult(false);
-                optHistoryLog.setCreateTime(new Date());
                 optHistoryLogService.save(optHistoryLog);
                 // 修改合同状态
                 ArrayList<String> updateContract = Lists.newArrayList();
@@ -353,10 +363,8 @@ public class OrderServiceImpl implements OrderService{
         } else {
             // 合同为空 log表记录问题，UI用户查询
             log.info("secondAudit,合同为空，channelOrderNumber=".concat(channelOrderNumber));
-            optHistoryLog.setOptName("二次审批操作");
             optHistoryLog.setOptLogDetail("合同为空,请更换新的身份证尝试");
             optHistoryLog.setOptResult(false);
-            optHistoryLog.setCreateTime(new Date());
             optHistoryLogService.save(optHistoryLog);
             // 不需要return
         }