提交订单bugfix

src/main/java/com/caimei/modules/order/utils/OrderUtil.java

@@ -57,7 +57,7 @@ public class OrderUtil {
                 shopOrder.setTotalAddedValueTax(shopOrder.getTotalAddedValueTax() + o.getTotalAddedValueTax()); //税费
                 shopOrder.setBrokerage(shopOrder.getBrokerage() + o.getCmFee()); //佣金 =  应付采美
                 // 计算超级会员优惠
-                if (1 == o.getSvipPriceFlag()) {
+                if (null != o.getSvipPriceFlag() && 1 == o.getSvipPriceFlag()) {
                     BigDecimal productTotalReduction = MathUtil.mul(o.getSvipReduction(), o.getNum(), 2);
                     shopOrder.setSvipShopReduction(MathUtil.add(shopOrder.getSvipShopReduction(), productTotalReduction).doubleValue());
                 }
@@ -168,7 +168,7 @@ public class OrderUtil {
                 }
             }
             // 计算超级会员优惠
-            if (1 == o.getSvipPriceFlag()) {
+            if (null != o.getSvipPriceFlag() && 1 == o.getSvipPriceFlag()) {
                 BigDecimal productTotalReduction = MathUtil.mul(o.getSvipReduction(), o.getNum(), 2);
                 svipShopReduction = MathUtil.add(shopOrder.getSvipShopReduction(), productTotalReduction).doubleValue();
             }