Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderAddressServiceImpl.java

@@ -69,25 +69,28 @@ public class OrderAddressServiceImpl extends ServiceImpl<OrderAddressMapper, Ord
 			int i = 1;
 			StringBuilder addressDetail = new StringBuilder();
 			for (OrderAddress address : addressList) {
-				if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
-					addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
-				} else {
-					addressDetail.append(i).append(".").append("(");
-				}
+				if (ObjectUtil.isNotEmpty(address.getCorpId()) || StringUtil.isNotBlank(address.getContacts())
+					|| StringUtil.isNotBlank(address.getTel()) || StringUtil.isNotBlank(address.getAddress())) {
+					if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
+						addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
+					} else {
+						addressDetail.append(i).append(".").append("(");
+					}
 
-				if (StringUtil.isNotBlank(address.getContacts())) {
-					addressDetail.append(address.getContacts());
-				}
-				if (StringUtil.isNotBlank(address.getTel())) {
-					addressDetail.append(" ").append(address.getTel());
-				}
-				if (StringUtil.isNotBlank(address.getAddress())) {
-					addressDetail.append(") ").append(address.getAddress()).append("\n");
-				} else {
-					addressDetail.append(") ").append("\n");
-				}
+					if (StringUtil.isNotBlank(address.getContacts())) {
+						addressDetail.append(address.getContacts());
+					}
+					if (StringUtil.isNotBlank(address.getTel())) {
+						addressDetail.append(" ").append(address.getTel());
+					}
+					if (StringUtil.isNotBlank(address.getAddress())) {
+						addressDetail.append(") ").append(address.getAddress()).append("\n");
+					} else {
+						addressDetail.append(") ").append("\n");
+					}
 
-				i++;
+					i++;
+				}
 			}
 
 			Order order = new Order();

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -571,6 +571,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		StringBuilder addressDetail = new StringBuilder();
 		dealExtraInfo(order, addressDetail);
 
+		if (CollectionUtil.isNotEmpty(itemList)) {
+			order.setArrivalTime(itemList.get(0).getArrivalTime());
+		}
+
 		order.setFreight(freight);
 		if (addressDetail.length() > 0) {
 			order.setAddressDetail(addressDetail.deleteCharAt(addressDetail.lastIndexOf("\n")).toString());
@@ -797,25 +801,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderAddressMapper.updateById(address);
 			}
 
-			if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
-				addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
-			} else {
-				addressDetail.append(i).append(".").append("(");
-			}
+			if (ObjectUtil.isNotEmpty(address.getCorpId()) || StringUtil.isNotBlank(address.getContacts())
+				|| StringUtil.isNotBlank(address.getTel()) || StringUtil.isNotBlank(address.getAddress())) {
+				if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
+					addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
+				} else {
+					addressDetail.append(i).append(".").append("(");
+				}
 
-			if (StringUtil.isNotBlank(address.getContacts())) {
-				addressDetail.append(address.getContacts());
-			}
-			if (StringUtil.isNotBlank(address.getTel())) {
-				addressDetail.append(" ").append(address.getTel());
-			}
-			if (StringUtil.isNotBlank(address.getAddress())) {
-				addressDetail.append(") ").append(address.getAddress()).append("\n");
-			} else {
-				addressDetail.append(") ").append("\n");
-			}
+				if (StringUtil.isNotBlank(address.getContacts())) {
+					addressDetail.append(address.getContacts());
+				}
+				if (StringUtil.isNotBlank(address.getTel())) {
+					addressDetail.append(" ").append(address.getTel());
+				}
+				if (StringUtil.isNotBlank(address.getAddress())) {
+					addressDetail.append(") ").append(address.getAddress()).append("\n");
+				} else {
+					addressDetail.append(") ").append("\n");
+				}
 
-			i++;
+				i++;
+			}
 		}
 
 		List<CommonFile> fileList = order.getFileList();

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/TrackLogServiceImpl.java

@@ -57,7 +57,7 @@ public class TrackLogServiceImpl extends ServiceImpl<TrackLogMapper, TrackLog> i
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public List<Double> location(TrackLog trackLog) {
-		TrackKey key = CacheUtil.get(LandConst.LAND_CACHE, LandConst.TRACK_TOKEN, AuthUtil.getTenantId(), TrackKey.class, false);
+		TrackKey key = CacheUtil.get(LandConst.LAND_CACHE, LandConst.TRACK_TOKEN, trackLog.getTenantId(), TrackKey.class, false);
 		if (ObjectUtil.isEmpty(key)) {
 			throw new RuntimeException("获取请求token失败");
 		}
@@ -98,7 +98,7 @@ public class TrackLogServiceImpl extends ServiceImpl<TrackLogMapper, TrackLog> i
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public List<List<Double>> track(TrackLog trackLog) {
-		TrackKey key = CacheUtil.get(LandConst.LAND_CACHE, LandConst.TRACK_TOKEN, AuthUtil.getTenantId(), TrackKey.class, false);
+		TrackKey key = CacheUtil.get(LandConst.LAND_CACHE, LandConst.TRACK_TOKEN, trackLog.getTenantId(), TrackKey.class, false);
 		if (ObjectUtil.isEmpty(key)) {
 			throw new RuntimeException("获取请求token失败");
 		}