zhuyiyi преди 3 месеца
родител
ревизия
0828111404
променени са 2 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 3 3
      src/main/java/lingtao/net/util/PVCStickersPrice.java
  2. 4 4
      src/main/java/lingtao/net/util/PriceUtils.java

+ 3 - 3
src/main/java/lingtao/net/util/PVCStickersPrice.java

@@ -45,7 +45,7 @@ public class PVCStickersPrice {
 				} else if (product.getCount() == 100000) {
 					price = 700;
 				}
-				product.setPrice(product.getPrice() + price);
+				product.setPrice(Math.ceil(product.getPrice() + price));
 			}
 		} else if ((length <= 9 && width <= 5.4) || (length <= 5.4 && width <= 9)) {
 			for (Product product : stickersList) {
@@ -78,7 +78,7 @@ public class PVCStickersPrice {
 				} else if (product.getCount() == 100000) {
 					price = 1500;
 				}
-				product.setPrice(product.getPrice() + price);
+				product.setPrice(Math.ceil(product.getPrice() + price));
 			}
 		} else {
 			for (Product product : stickersList) {
@@ -99,7 +99,7 @@ public class PVCStickersPrice {
 				} else {
 					price = 3;
 				}
-				product.setPrice(product.getPrice() + (price * area > 50 ? price * area : 50));
+				product.setPrice(Math.ceil(product.getPrice() + (price * area > 50 ? price * area : 50)));
 			}
 		}
 		return stickersList;

+ 4 - 4
src/main/java/lingtao/net/util/PriceUtils.java

@@ -2322,7 +2322,7 @@ public class PriceUtils {
                 // 根据款数重新算价格
                 for (Product product : list) {
                     product.setWeight(df.format(length * width * product.getCount() / 10000 * 0.3 * number));
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number));
                 }
             } else if ("双面印刷".equals(craftShua)) {
                 // 数量
@@ -2341,7 +2341,7 @@ public class PriceUtils {
                 }
                 // 根据款数重新算价格
                 for (Product product : list) {
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number));
                 }
             }
         } else {
@@ -2398,7 +2398,7 @@ public class PriceUtils {
                 price = fixPrice + (num - 5 > 0 ? num - 5 : 0) * zhang + designFee * number + 0.1 * count * number;
                 Product dto = new Product();
                 dto.setCount(count);
-                dto.setPrice(price);
+                dto.setPrice(Math.ceil(price));
                 list.add(dto);
             } else {
                 // 数量
@@ -2418,7 +2418,7 @@ public class PriceUtils {
                 // 根据款数重新算价格
                 for (Product product : list) {
                     product.setWeight(df.format(weight));
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number));
                 }
             }
         }