|
|
@@ -7250,14 +7250,17 @@ public class ProductService {
|
|
|
}
|
|
|
if (dto.getCraftPai() != null && !"".equals(dto.getCraftPai())) {
|
|
|
for (Product product : stickersList) {
|
|
|
- double price = product.getPrice();
|
|
|
+ double price = 0;
|
|
|
if ("半排废".equals(dto.getCraftPai())) {
|
|
|
price = price + product.getCount() * 0.1;
|
|
|
}
|
|
|
if ("全排废".equals(dto.getCraftPai())) {
|
|
|
price = price + product.getCount() * 0.13;
|
|
|
}
|
|
|
- product.setPrice(Math.max(price, 80));
|
|
|
+ if ("1".equals(kind)) {
|
|
|
+ price = Math.ceil(price * number);
|
|
|
+ }
|
|
|
+ product.setPrice(Math.max(product.getPrice() + price, 80));
|
|
|
product.setKindLabel(null);
|
|
|
}
|
|
|
}
|
|
|
@@ -7276,8 +7279,11 @@ public class ProductService {
|
|
|
base_price = 10;
|
|
|
}
|
|
|
for (Product product : stickersList) {
|
|
|
- double price = product.getPrice();
|
|
|
- product.setPrice(price + ((dto.getN_mq_num() - 1) * base_price));
|
|
|
+ double price = ((dto.getN_mq_num() - 1) * base_price);
|
|
|
+ if ("1".equals(kind)) {
|
|
|
+ price = Math.ceil(price * number);
|
|
|
+ }
|
|
|
+ product.setPrice(product.getPrice() + price);
|
|
|
}
|
|
|
}
|
|
|
if ("彩色印刷+烫金/银".equals(dto.getCraftTang()) || "纯烫金".equals(dto.getCraftTang()) || "烫镭射银".equals(dto.getCraftTang())) {
|
|
|
@@ -7294,6 +7300,10 @@ public class ProductService {
|
|
|
for (int i = 0; i < bigCountArr.length; i++) {
|
|
|
if (product.getCount() >= bigCountArr[i]) {
|
|
|
price = productPrice + basePrice[i];
|
|
|
+ if ("1".equals(kind)) {
|
|
|
+ price = Math.ceil(productPrice + basePrice[i] * number);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
product.setPrice(Math.max(price, productPrice));
|