修改链接

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

@@ -34,7 +34,7 @@ import java.util.StringJoiner;
 public class KaServiceImpl implements IKaService {
 
 
-    @Value("http://localhost:7037")
+    @Value("${qapi.http}")
     private String kaSysUrl;
 
     @Autowired

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

@@ -219,19 +219,10 @@ public class OrderServiceImpl implements IOrderService {
 
     private List<CallbackRecord> doMergeLists(List<CallbackRecord> data, List<CallbackRecord> data1) {
         data1.forEach(callbackRecord -> {
-            if(!data.contains(callbackRecord)){
+            if (!data.contains(callbackRecord)) {
                 data.add(callbackRecord);
             }
         });
-//        Map<String, List<CallbackRecord>> groupedMap = data.stream().collect(Collectors.groupingBy(CallbackRecord::getNoticeType));
-//        List<CallbackRecord> callbackRecords = new ArrayList<>(groupedMap.size());
-//        groupedMap.values().forEach(records -> {
-//            if (records.size() == 1) {
-//                callbackRecords.addAll(records);
-//            } else {
-//                callbackRecords.addAll(selectAllRecord(records));
-//            }
-//        });
         List<CallbackRecord> callbackRecords1 = data.stream().sorted(Comparator.comparing(CallbackRecord::getDateTime)).collect(Collectors.toList());
         callbackRecords1.forEach(callbackRecord ->
                 {
@@ -242,42 +233,4 @@ public class OrderServiceImpl implements IOrderService {
 
         return callbackRecords1;
     }
-
-    private List<CallbackRecord> selectAllRecord(List<CallbackRecord> records) {
-        List<CallbackRecord> existTermNoRecords = records.stream().filter(callbackRecord -> Objects.nonNull(callbackRecord.getTermNo())).collect(Collectors.toList());
-        // 不为空代表是还款或者还款结果通知，此时还需要根据期数分组
-        if (CollectionUtils.isNotEmpty(existTermNoRecords)) {
-            Map<Long, List<CallbackRecord>> groupedMap = existTermNoRecords.stream().collect(Collectors.groupingBy(CallbackRecord::getTermNo));
-            List<CallbackRecord> callbackRecords = new ArrayList<>(groupedMap.size());
-            groupedMap.values().forEach(termNoRecord -> {
-                if (termNoRecord.size() == 1) {
-                    callbackRecords.addAll(termNoRecord);
-                }
-
-                callbackRecords.addAll(findOneRecord(termNoRecord));
-            });
-            return callbackRecords;
-        } else {
-            return findOneRecord(records);
-        }
-
-    }
-
-    private List<CallbackRecord> findOneRecord(List<CallbackRecord> termNoRecord) {
-        // 除还款和还款结果通知以外的其他
-        CallbackRecord sendSuccRecord = null;
-        final String succNoticeStatus = "成功";
-        for (CallbackRecord callbackRecord : termNoRecord) {
-            if (succNoticeStatus.equals(callbackRecord.getNoticeStatus())) {
-                sendSuccRecord = callbackRecord;
-                break;
-            }
-        }
-
-        if (Objects.isNull(sendSuccRecord)) {
-            sendSuccRecord = termNoRecord.stream().sorted(Comparator.comparing(CallbackRecord::getDateTime).reversed()).findFirst().get();
-        }
-
-        return Collections.singletonList(sendSuccRecord);
-    }
 }

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

@@ -30,7 +30,7 @@ import java.util.Objects;
 @Service("xyqbService")
 public class XyqbServiceImpl implements IXyqbService {
 
-    @Value("http://api-ka1.liangkebang.net")  //${api.http}
+    @Value("${api.http}")
     private String xyqbSysUrl;