门店配送

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -70,7 +70,7 @@ import java.util.stream.Collectors;
 public class CheckOrder {
 
     // 配送费逻辑是否使用旧的
-    @Value("${store.delivery.use:old:false}")
+    @Value("${store.delivery.use.old:false}")
     private boolean storeDeliveryUseOld;
 
     @Autowired
@@ -435,7 +435,7 @@ public class CheckOrder {
         queryDeliveryRequest.setPartnerId(storeResponseDto.getPartnerId());
         queryDeliveryRequest.setStoreCode(storeResponseDto.getStoreCode());
         BaseResponse<QueryDeliverDetailResponse> queryDeliverDetailResponse = storeCenterService.queryDeliverDetail(queryDeliveryRequest, trackingNo);
-        if (queryDeliverDetailResponse == null || queryDeliverDetailResponse.getStatusCode() != 100 || queryDeliverDetailResponse.getData() == null) {
+        if (queryDeliverDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(queryDeliverDetailResponse.getCode()) || queryDeliverDetailResponse.getData() == null) {
             throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
         }
         QueryDeliverDetailResponse deliveryDetail = queryDeliverDetailResponse.getData();

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

@@ -87,7 +87,7 @@ import static java.util.stream.Collectors.toList;
 public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     // 配送费逻辑是否使用旧的
-    @Value("${store.delivery.use:old:false}")
+    @Value("${store.delivery.use.old:false}")
     private boolean storeDeliveryUseOld;
 
     @Autowired
@@ -1464,7 +1464,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         queryDeliveryRequest.setUserLatitude(queryReceiveAddressResponse.getData().getLatitude());
         queryDeliveryRequest.setUserLongitude(queryReceiveAddressResponse.getData().getLongitude());
         com.freemud.application.sdk.api.base.BaseResponse<QueryDeliverDetailResponse> queryDeliverDetailResponse = storeCenterService.queryDeliverDetail(queryDeliveryRequest, trackingNo);
-        if (queryDeliverDetailResponse == null || queryDeliverDetailResponse.getStatusCode() != 100 || queryDeliverDetailResponse.getData() == null) {
+        if (queryDeliverDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(queryDeliverDetailResponse.getCode()) || queryDeliverDetailResponse.getData() == null) {
             throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
         }
         if(queryDeliverDetailResponse.getData().getDeliveryAmount() == null) {