Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -53,6 +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());
+        }
+
         String uploadDir="";
         if ("1".equals(head)) {
             Map<String, Object> model = new HashMap<>();