|
@@ -74,7 +74,6 @@ public class JhmTask {
|
|
|
.map(o -> o.getBuyer().getReceivePhone())
|
|
.map(o -> o.getBuyer().getReceivePhone())
|
|
|
.distinct()
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
-
|
|
|
|
|
List<FsCompanyCustomer> existingCustomers = fsCompanyCustomerMapper.selectByPhones(phones);
|
|
List<FsCompanyCustomer> existingCustomers = fsCompanyCustomerMapper.selectByPhones(phones);
|
|
|
Map<String, FsCompanyCustomer> phoneCustomerMap = existingCustomers.stream()
|
|
Map<String, FsCompanyCustomer> phoneCustomerMap = existingCustomers.stream()
|
|
|
.collect(Collectors.toMap(FsCompanyCustomer::getPhone, c -> c, (a, b) -> b));
|
|
.collect(Collectors.toMap(FsCompanyCustomer::getPhone, c -> c, (a, b) -> b));
|
|
@@ -90,7 +89,7 @@ public class JhmTask {
|
|
|
FsCompanyCustomer newCustomer = new FsCompanyCustomer();
|
|
FsCompanyCustomer newCustomer = new FsCompanyCustomer();
|
|
|
newCustomer.setPhone(phone);
|
|
newCustomer.setPhone(phone);
|
|
|
newCustomer.setCustomerName(order.getBuyer().getConsignee());
|
|
newCustomer.setCustomerName(order.getBuyer().getConsignee());
|
|
|
- newCustomer.setAddress(order.getBuyer().getAddress());
|
|
|
|
|
|
|
+ newCustomer.setAddress(order.getBuyer().getAddressDetail());
|
|
|
|
|
|
|
|
// 成交状态:订单状态为4(已完成)设为1,否则0
|
|
// 成交状态:订单状态为4(已完成)设为1,否则0
|
|
|
Integer kdzlMakeStatus = (order.getStatus() != null && order.getStatus() == 4) ? 1 : 0;
|
|
Integer kdzlMakeStatus = (order.getStatus() != null && order.getStatus() == 4) ? 1 : 0;
|
|
@@ -118,7 +117,7 @@ public class JhmTask {
|
|
|
|
|
|
|
|
// ========== 客户已存在,判断是否需要更新 ==========
|
|
// ========== 客户已存在,判断是否需要更新 ==========
|
|
|
Integer kdzlMakeStatus = (order.getStatus() != null && order.getStatus() == 4) ? 1 : 0;
|
|
Integer kdzlMakeStatus = (order.getStatus() != null && order.getStatus() == 4) ? 1 : 0;
|
|
|
- String address = order.getBuyer().getAddress();
|
|
|
|
|
|
|
+ String address = order.getBuyer().getAddressDetail();
|
|
|
String customerName = order.getBuyer().getConsignee();
|
|
String customerName = order.getBuyer().getConsignee();
|
|
|
Date orderTime = order.getCreatedAt() != null ?
|
|
Date orderTime = order.getCreatedAt() != null ?
|
|
|
Date.from(Instant.ofEpochSecond(order.getCreatedAt())) : null;
|
|
Date.from(Instant.ofEpochSecond(order.getCreatedAt())) : null;
|
|
@@ -190,11 +189,7 @@ public class JhmTask {
|
|
|
if (data == null || CollectionUtils.isEmpty(data.getList())) {
|
|
if (data == null || CollectionUtils.isEmpty(data.getList())) {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- List<JHMOrderDetail> validInPage = data.getList().stream()
|
|
|
|
|
- .filter(order -> order.getStatus() != null && (order.getStatus() == 2 || order.getStatus() == 4))
|
|
|
|
|
- .collect(Collectors.toList());
|
|
|
|
|
- allOrders.addAll(validInPage);
|
|
|
|
|
|
|
+ allOrders.addAll(data.getList());
|
|
|
|
|
|
|
|
if (allOrders.size() >= data.getTotal() || data.getList().size() < pageSize) {
|
|
if (allOrders.size() >= data.getTotal() || data.getList().size() < pageSize) {
|
|
|
break;
|
|
break;
|