diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 4153518..cd7fd83 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -713,8 +713,11 @@ public class ProductService {
}
product.setPrice(Math.ceil(base_price[i] * num * 0.9 * number));
product.setCount(counts[i]);
+ product.setWeight(df.format(number * length * width * product.getCount() * 0.00003));
priceList.add(product);
+
}
+ return priceList;
}
// 根据款数重新算价格/计算重量
for (Product product : priceList) {
@@ -7070,6 +7073,11 @@ public class ProductService {
price = 45;
addPrice = 5.5;
break;
+ case "电线胶-PP合成纸":
+ case "电线胶-PET哑银":
+ price = 50;
+ addPrice = 12;
+ break;
}
stickersList.add(new PriceUtils().getA(kind, length, width, count, price, addPrice, number, dto.getCraftTang(), dto.getYinbai()));
if (dto.getN_mq_num() != null && dto.getN_mq_num() >= 1) {
diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp
index 4e5e0ee..f32a6c6 100644
--- a/src/main/webapp/views/product/stickers.jsp
+++ b/src/main/webapp/views/product/stickers.jsp
@@ -101,6 +101,8 @@
+
+
@@ -733,6 +735,9 @@
if (TJValue == "纯烫金") {
html = "预计发货时间:
广东:纯烫金(2-3天发货) 申通 顺丰;"
}
+ if (kindvalue == '电线胶-PET哑银' || kindvalue == '电线胶-PP合成纸') {
+ html = "预计发货时间:
广东:15点之前的订单当天发货 中通 顺丰";
+ }
} else if (stickerKind == '双面印刷不干胶') {
html += "广州:(3-4天发货) 中通 顺丰";
} else {