Merge branch 'KA-20210722-自提根据模板配置计算餐具包装费ID1033456-zxh' into qa

shopping-cart-application-service/src/main/java/cn/freemud/handle/CommonFunctionHandle.java

@@ -32,6 +32,9 @@ public class CommonFunctionHandle {
      * @return 外卖 true 打包带走 false  null 为其他业务问题 不进入需求
      */
     public Long getPackAmountByStoreConfig(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, Long newPackAmount) {
+        if (Objects.isNull(shoppingCartInfoRequestVo)) {
+            return newPackAmount;
+        }
         Boolean isTakeOut = null;
         if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
             isTakeOut = true;