|
|
@@ -549,11 +549,7 @@ public class ProductService {
|
|
|
basePrice = basePrice + 0.02;
|
|
|
}
|
|
|
|
|
|
- if ("0".equals(dto.getKindValue())) {
|
|
|
- product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5));
|
|
|
- } else {
|
|
|
- product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5) * number);
|
|
|
- }
|
|
|
+ product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5) * number);
|
|
|
if ("配牙签".equals(dto.getCraftShua()) && "6.5".equals(dto.getToothpick_size()) && ((width == 9 && length == 2.5) || length == 9 && width == 2.5)) {
|
|
|
if (product.getCount() == 500) {
|
|
|
double other_price = 60;
|
|
|
@@ -588,7 +584,7 @@ public class ProductService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if ("插旗".equals(dto.getStickerKind())) {
|
|
|
+ if ("插旗".equals(dto.getStickerKind()) && "常规".equals(dto.getKind2Value())) {
|
|
|
if (number > 1 && "0".equals(dto.getKindValue())) {
|
|
|
for (Product product : priceList) {
|
|
|
product.setPrice(product.getPrice() * number);
|
|
|
@@ -4987,7 +4983,7 @@ public class ProductService {
|
|
|
priceList.add(pro);
|
|
|
}
|
|
|
for (Product product : priceList) {
|
|
|
- product.setPrice(Math.ceil(product.getPrice() * number));
|
|
|
+ product.setPrice(Math.ceil(product.getPrice() + (number - 1) * 15));
|
|
|
}
|
|
|
return priceList;
|
|
|
}
|