修改订单商品总金额bugfix

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -117,6 +117,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private Integer couponsLogo;        //显示优惠券查看: 1不显示 2显示
     private String commodityType;//商品属性：1产品，2仪器
     private Double svipReduction;//超级会员优惠
+    private Double svipTaxReduction;//超级会员税费优惠
 
     public Integer getLadderPriceFlag() {
         return ladderPriceFlag;
@@ -998,4 +999,12 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     public void setSvipReduction(Double svipReduction) {
         this.svipReduction = svipReduction;
     }
+
+    public Double getSvipTaxReduction() {
+        return svipTaxReduction;
+    }
+
+    public void setSvipTaxReduction(Double svipTaxReduction) {
+        this.svipTaxReduction = svipTaxReduction;
+    }
 }

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

@@ -1061,6 +1061,12 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         if (6060 == orderProduct.getProductID()) {
                             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()));
+                        } else {
+                            orderProduct.setSvipTaxReduction(0d);
+                        }
                     });
                     list.addAll(pList);
                     shopOrder.setNewOrderProducts(pList);