提交订单bugfix

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -314,7 +314,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         CmPromotion cmPromotion = cmPromotionDao.findProductPromotion(o.getShopID().toString(), o.getProductID().longValue());
                         if (null != cmPromotion) {
                             CmPromotion orderPromotions = newOrderDao.getDbPromotionsByOrderId(newOrder.getOrderID(), Integer.valueOf(cmPromotion.getId()));
-                            if (null != orderPromotions && 0 == o.getSvipPriceFlag()) {
+                            if (null != orderPromotions && (null == o.getSvipPriceFlag() || 0 == o.getSvipPriceFlag())) {
                                 o.setOrderPromotionsId(Integer.valueOf(orderPromotions.getId()));
                             }
                         }