Merge branch 'master' into v1

* master:
  操作的重复 在切面中判断

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

@@ -309,12 +309,6 @@ public class OrderServiceImpl implements OrderService{
             return new Tuple<>(false, "orderMapping为空或者loanId为空");
         }
 
-        OptHistoryLog optHistoryLogExsit = optHistoryLogService.findByChannelOrderNumberAndOptNameAndSuccess(channelOrderNumber, secondAudit);
-        if (optHistoryLogExsit != null) {
-            log.info("secondAudit,已经操作成功，channelOrderNumber=".concat(channelOrderNumber));
-            return new Tuple<>(true, "已经操作成功. 重复操作");
-        }
-
         // 更新合同状态
         Contract conscont= xyqbCenterService.findContractByUserId(orderMapping.getQgUserId());
         if (conscont != null) {
@@ -403,14 +397,21 @@ public class OrderServiceImpl implements OrderService{
         } else {
             // p2p
 
-            Map data = this.xyqbCenterService.queryLendingRecordCount(Long.valueOf(orderApprove.getFundId()));
+            Map data = null;
+            try {
+                data = this.xyqbCenterService.queryLendingRecordCount(Long.valueOf(orderApprove.getFundId()));
+            } catch (Exception e) {
+                log.error("[order_lending][queryLendingRecordCount]查询待打款数量 失败,channelOrderNumber={}, data={}", lendingFormModel.getChannelOrderNumber(), data);
+            }
             log.info("[order_lending][queryLendingRecordCount]查询待打款数量,channelOrderNumber={}, data={}", lendingFormModel.getChannelOrderNumber(), data);
-            if (data.size() > 0) {
+            if (data !=null && data.size() > 0) {
                 if (Objects.nonNull(data.get("totalAmount")) && Objects.nonNull(data.get("totalCount"))) {
                     result = this.clothoCenterService.lending(orderApprove.getFundId(), new BigDecimal(String.valueOf(data.get("totalAmount"))), Integer.valueOf(String.valueOf(data.get("totalCount"))));
                     log.info("[order_lending]直投打款,channelOrderNumber={}, result={}", lendingFormModel.getChannelOrderNumber(), result);
                 }
             }
+
+            result = true;
         }
 
         if (result) {