|
@@ -1062,8 +1062,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
newOrder.setRechargeGoods(1);
|
|
|
}
|
|
|
// 设置超级会员税费优惠
|
|
|
- if (orderProduct.getSvipPriceFlag() == 1 && "0".equals(orderProduct.getIncludedTax()) && ("1".equals(orderProduct.getInvoiceType()) || "2".equals(orderProduct.getInvoiceType()))) {
|
|
|
- orderProduct.setSvipTaxReduction(orderProduct.getSvipReduction()-( orderProduct.getPrice()-orderProduct.getDiscountPrice()));
|
|
|
+ if (null != orderProduct.getSvipPriceFlag() && orderProduct.getSvipPriceFlag() == 1 && "0".equals(orderProduct.getIncludedTax()) && ("1".equals(orderProduct.getInvoiceType()) || "2".equals(orderProduct.getInvoiceType()))) {
|
|
|
+ orderProduct.setSvipTaxReduction(orderProduct.getSvipReduction() - (orderProduct.getPrice() - orderProduct.getDiscountPrice()));
|
|
|
} else {
|
|
|
orderProduct.setSvipTaxReduction(0d);
|
|
|
}
|