Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/exportPDF/ExportPDFController.java

@@ -54,11 +54,12 @@ public class ExportPDFController {
             return null;
         }
 
-        if (Objects.nonNull(pdfGoodsDto.getStartFax())){
-            BigDecimal multiply = new BigDecimal(pdfGoodsDto.getPrice()).multiply(new BigDecimal(pdfGoodsDto.getStartFax()).add(new BigDecimal(1)));
-            Double value = multiply.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-            pdfGoodsDto.setPrice(value.toString());
-        }
+        // 现在是税后价 不用计算了
+//        if (Objects.nonNull(pdfGoodsDto.getStartFax())){
+//            BigDecimal multiply = new BigDecimal(pdfGoodsDto.getPrice()).multiply(new BigDecimal(pdfGoodsDto.getStartFax()).add(new BigDecimal(1)));
+//            Double value = multiply.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+//            pdfGoodsDto.setPrice(value.toString());
+//        }
 
         String uploadDir="";
         if ("1".equals(head)) {