Merge branch 'bugfix-门店未配置业务导致订单NPE' into 'master'

Bugfix 门店未配置业务导致订单npe

See merge request !144

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/FixDeliveryServiceImpl.java

@@ -27,6 +27,7 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -50,9 +51,13 @@ public class FixDeliveryServiceImpl extends AbstractDeliveryServiceImpl implemen
                 .build();
         ConsoleResponseDTO<BizDTO> responseDto = consoleApiClient.getStoreMix(query);
         DeliveryInfoDTO deliveryInfo = responseDto.getBizVO().getDeliveryInfo();
+        long amount = 0L;
+        List<ExtraDeliveryDto> deliveryAmountList = new ArrayList<>();
+        if (Objects.nonNull(deliveryInfo)) {
+            amount = Objects.isNull(deliveryInfo.getFinalDeliveryAmount()) ? 0L : deliveryInfo.getFinalDeliveryAmount();
+            deliveryAmountList = super.nightDeliveryAmountHandle(amount, deliveryInfo.getExpandFields());
+        }
         // fisherman 处理 额外配送费
-        long amount = Objects.isNull(deliveryInfo) || Objects.isNull(deliveryInfo.getFinalDeliveryAmount()) ? 0L : deliveryInfo.getFinalDeliveryAmount();
-        List<ExtraDeliveryDto> deliveryAmountList = super.nightDeliveryAmountHandle(amount, deliveryInfo.getExpandFields());
         if (Objects.nonNull(shoppingCartGoodsResponseVo)) {
             shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
             shoppingCartGoodsResponseVo.setDeliveryAmountList(deliveryAmountList);