|
@@ -4829,7 +4829,7 @@ public class ProductService {
|
|
|
priceList = getAreaCenterPrice(counts, count, width * length, prices, areas, number);
|
|
priceList = getAreaCenterPrice(counts, count, width * length, prices, areas, number);
|
|
|
|
|
|
|
|
for (Product product : priceList) {
|
|
for (Product product : priceList) {
|
|
|
- if("2".equals(dto.getKind())){
|
|
|
|
|
|
|
+ if ("2".equals(dto.getKind())) {
|
|
|
product.setPrice(Math.ceil(product.getPrice() * 1.1));
|
|
product.setPrice(Math.ceil(product.getPrice() * 1.1));
|
|
|
}
|
|
}
|
|
|
product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.3));
|
|
product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.3));
|
|
@@ -5564,6 +5564,10 @@ public class ProductService {
|
|
|
if (width <= 4 && length <= 4) {
|
|
if (width <= 4 && length <= 4) {
|
|
|
base_price = 4;
|
|
base_price = 4;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (width > 6 || length > 6) {
|
|
|
|
|
+ base_price = 5.5;
|
|
|
|
|
+ mo_price = 300;
|
|
|
|
|
+ }
|
|
|
if (base_price < 4.5) {
|
|
if (base_price < 4.5) {
|
|
|
if (count > 100 && count <= 500) {
|
|
if (count > 100 && count <= 500) {
|
|
|
base_price = 3.5;
|
|
base_price = 3.5;
|