24282 преди 9 месеца
родител
ревизия
391bce2053
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdApiServiceImpl.java

+ 2 - 1
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdApiServiceImpl.java

@@ -462,7 +462,8 @@ public class JdApiServiceImpl implements JdApiService {
         request.setIsPage(false);
         VcGetdetailbyorderidResponse response = jdClient.execute(request);
         JOSDetailResultDto josDetailResultDto = response.getJosDetailResultDto();
-        List<PurchaseAllocationDetailDto> purchaseAllocationDetailList = josDetailResultDto.getPurchaseAllocationDetailList();
+        List<PurchaseAllocationDetailDto> purchaseAllocationDetailList = ObjectUtil.isNull(josDetailResultDto) ? new ArrayList<>()
+                : josDetailResultDto.getPurchaseAllocationDetailList();
         List<JdOrderDetails> jdOrderDetails = BeanUtil.copyToList(purchaseAllocationDetailList, JdOrderDetails.class);
         DynamicDataSourceContextHolder.push(SourceConstant.ITEM);
         AtomicBoolean hasExFlag = new AtomicBoolean(false);