bugfix

src/main/java/com/caimei/modules/bulkpurchase/entity/PurchaseProduct.java

@@ -84,6 +84,10 @@ public class PurchaseProduct extends DataEntity<PurchaseProduct> {
      * 超级会员优惠
      */
     private Double svipReduction;
+    /**
+     * 超级会员税费优惠
+     */
+    private Double svipTaxReduction;
 
     public Integer getLadderPriceFlag() {
         return ladderPriceFlag;
@@ -518,4 +522,12 @@ public class PurchaseProduct extends DataEntity<PurchaseProduct> {
     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/bulkpurchase/web/PurchaseProductController.java

@@ -142,6 +142,7 @@ public class PurchaseProductController extends BaseController {
                         // 计算优惠的税费
                         BigDecimal taxReduction = MathUtil.div(MathUtil.mul(p.getSvipReduction(), p.getTaxRate()), 100);
                         p.setSvipReduction(MathUtil.add(p.getSvipReduction(), taxReduction).doubleValue());
+                        p.setSvipTaxReduction(taxReduction.doubleValue());
                     }
                 } else if (null != cmPromotion) {
                     p.setCmPromotion(cmPromotion);

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderPurchaseProductForm.jsp

@@ -306,7 +306,10 @@
             <input name="ctx"  id="ctx0" value="${ctx}" readonly  style="width: 80px">
         </td>
         <td style="display: none">
-            <input type="text" name="svipReduction" id="svipReduction0" >
+            <input type="text" name="svipReduction" id="svipReduction0" value="${purchaseProduct.svipReduction ne null?purchaseProduct.svipReduction:'0'}">
+        </td>
+        <td style="display: none">
+            <input name="svipTaxReduction" id="svipTaxReduction0" value="${purchaseProduct.svipTaxReduction ne null?purchaseProduct.svipTaxReduction:'0'}">
         </td>
         <td style="display: none">
             <input name="svipPriceFlag" id="svipPriceFlag0" value="${purchaseProduct.svipPriceFlag ne null?purchaseProduct.svipPriceFlag:'0'}">

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderPurchaseProductList.jsp

@@ -492,6 +492,9 @@
                 <td style="display: none">
                     <input name="svipReduction" id="svipReduction${state.index}" value="${purchaseProduct.svipReduction}">
                 </td>
+                <td style="display: none">
+                    <input name="svipTaxReduction" id="svipTaxReduction${state.index}"  value="${purchaseProduct.svipTaxReduction}">
+                </td>
                 <td style="display: none">
                     <input name="svipPriceFlag" id="svipPriceFlag${state.index}" value="${purchaseProduct.svipPriceFlag}">
                 </td>

src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -674,12 +674,14 @@ function editShopProduct(obj) {
     var totalAddedValueTax = (data.totalAddedValueTax == undefined) ? 0 : data.totalAddedValueTax;
     var couponsLogo = (data.couponsLogo == undefined) ? 1 : data.couponsLogo;
     var svipReduction = (data.svipReduction == undefined) ? 0 : data.svipReduction;
+    var svipTaxReduction = (data.svipTaxReduction == undefined) ? 0 : data.svipTaxReduction;
     $.jBox.open("iframe:" + ctx + "/bulkpurchase/purchaseProduct/formOrderProduct?productId=" + productID +
         "&secondHandType=" + secondHandType +
         "&discount=" + discount + "&productCategory=" + productCategory + "&price=" + price + "&includedTax=" +
         includedTax + "&userId=" + userId +
         "&invoiceType=" + invoiceType + "&taxRate=" + taxRate + "&addedValueTax=" + addedValueTax +
-        "&totalAddedValueTax=" + totalAddedValueTax + "&couponsLogo=" + couponsLogo + "&svipReduction=" + svipReduction,
+        "&totalAddedValueTax=" + totalAddedValueTax + "&couponsLogo=" + couponsLogo + "&svipReduction=" + svipReduction +
+        "&svipTaxReduction=" + svipTaxReduction,
         "设置商品", $(top.document).width() - 240, $(top.document).height() - 200, {
             top: 36,
             persistent: true,
@@ -1224,6 +1226,7 @@ function setSeondHandProductList(data) {
 
 //设置订单金额信息
 function setOrderFee() { //不考虑经理折扣、运费，此时 商品总金额=订单总额=应付总额
+    debugger
     var productTotalFee = 0, //商品总金额
         productCount = 0, //	商品总数
         presentCount = 0, //协商赠送商品数
@@ -1236,7 +1239,7 @@ function setOrderFee() { //不考虑经理折扣、运费，此时 商品总金
     $('.productTable tbody tr:not(.gift)').each(function(index, element) {
         var obj = JSON.parse($(this).attr("data-value"));
         productTotalFee = ((Number(productTotalFee) * 100 + Number(obj.num * obj.price) * 100 + Number(obj
-            .totalAddedValueTax) * 100) / 100).toFixed(2);
+            .totalAddedValueTax) * 100) / 100 + Number(obj.svipTaxReduction)).toFixed(2);
         productCount = Number(productCount) + Number(obj.num);
         presentCount = Number(presentCount) + Number(obj.presentNum);
         orderTotalFee = ((Number(orderTotalFee) * 100 + Number(obj.totalFee) * 100) / 100).toFixed(2);
@@ -1488,6 +1491,7 @@ function taxRateVal(index) {
     var svipDiscountPriceObj = document.getElementById("svipDiscountPrice" + index);
     var svipReduction = $("#svipReduction" + index).val() == undefined ? 0 : $("#svipReduction" + index).val();
     var svipPriceFlag = $("#svipPriceFlag" + index).val() == undefined ? 0 : $("#svipPriceFlag" + index).val();
+    var svipTaxReduction = $("#svipTaxReduction" + index).val() == undefined ? 0 : $("#svipTaxReduction" + index).val();
 
     if (includedTax != '' && includedTax == 0 && invoiceType == 3) {
         //不含税不能开票商品，税率置为0
@@ -1777,12 +1781,15 @@ function taxRateVal(index) {
                     shouldPayTotalTax = (singleShouldPayTotalTax * numVal).toFixed(2);
                 }
                 if (svipPriceFlag == 1) {
+                    debugger
                     // 折扣价重新计算超级会员优惠
                     var svipDiscountPrice = $("#svipDiscountPrice" + index).text();
                     var originalPrice = $("#price" + index).val();
                     svipReduction = ((originalPrice - svipDiscountPrice) + (originalPrice - svipDiscountPrice) * taxRate / 100).toFixed(2);
+                    svipTaxReduction = ((originalPrice - svipDiscountPrice) * taxRate / 100).toFixed(2);
                 }
                 $checkItem["svipReduction"] = svipReduction + ""; //重新设置超级会员优惠
+                $checkItem["svipTaxReduction"] = svipTaxReduction +""; //重新设置超级会员税费优惠
                 $("#svipReduction0").val(svipReduction);
 
                 $("#addedValueTax" + index).val(addedValueTax);