Merge branch 'feature/1.9.21-配送费20200424-dingkai' into qa

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

@@ -71,7 +71,7 @@ import java.util.stream.Collectors;
 public class CheckOrder {
 
     // 配送费逻辑是否使用旧的
-    @Value("${store.delivery.use.old:false}")
+    @Value("${store.delivery.use.old:true}")
     private boolean storeDeliveryUseOld;
 
     @Autowired

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:true}")
     private boolean storeDeliveryUseOld;
 
     @Autowired