diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index aad7a8c..e8661ae 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -2491,8 +2491,13 @@ public class ProductService {
}
}
// double base = number < 6 && number > 1 ? 5 : 0;
+ double apprise = 0;
for (Product product : priceList) {
product.setWeight(df.format((width + 0.6) * (length + 0.6) * product.getCount() / 10000));
+ if (apprise > product.getPrice()) {
+ product.setPrice(apprise);
+ }
+ apprise = product.getPrice();
}
/* } */
@@ -4715,7 +4720,7 @@ public class ProductService {
Product pro = new Product();
double price = basePrice * dto.getCount() * area * dto.getNumber();
if (area <= 0.25) {
- price = basePrice * dto.getCount() * area + dto.getNumber() + 6;
+ price = basePrice * dto.getCount() * area * dto.getNumber() + dto.getNumber() + 6;
}
pro.setPrice(Math.ceil(Math.max(price, minPrice)));
pro.setCount(dto.getCount());
diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp
index 087090e..51b3c50 100644
--- a/src/main/webapp/views/product/stickers.jsp
+++ b/src/main/webapp/views/product/stickers.jsp
@@ -904,7 +904,7 @@
// PVC、透明没有覆哑膜
if (data.value == 1) {
$(".nofm").find(":input").attr("disabled", true);
- count_html = `
+ count_html = `