edit
This commit is contained in:
@@ -532,20 +532,7 @@ public class ProductService {
|
||||
}
|
||||
}
|
||||
}
|
||||
double huaxianPrice = 0.0;
|
||||
if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
|
||||
//宽度大于50 长度185-500
|
||||
for (Product product : stickersList) {
|
||||
if ("0".equals(dto.getKindValue())) {
|
||||
if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
|
||||
huaxianPrice = Math.max(0.1 * product.getCount(), 50);
|
||||
}
|
||||
} else {
|
||||
huaxianPrice = Math.max(0.2 * product.getCount(), 50);
|
||||
}
|
||||
product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
|
||||
}
|
||||
}
|
||||
|
||||
if ("0".equals(dto.getKindValue()) && !"专版打印".contentEquals(dto.getStickerKind())) {
|
||||
|
||||
|
||||
@@ -556,6 +543,21 @@ public class ProductService {
|
||||
}
|
||||
}
|
||||
|
||||
double huaxianPrice = 0.0;
|
||||
if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
|
||||
//宽度大于50 长度185-500
|
||||
for (Product product : stickersList) {
|
||||
if ("0".equals(dto.getKindValue())) {
|
||||
if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
|
||||
huaxianPrice = Math.max(0.1 * product.getCount() * number, 50);
|
||||
}
|
||||
} else {
|
||||
huaxianPrice = Math.max(0.12 * product.getCount() * number, 50);
|
||||
}
|
||||
product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
|
||||
}
|
||||
}
|
||||
|
||||
return priceList;
|
||||
case "1":
|
||||
dto.setWidth(width);
|
||||
|
||||
Reference in New Issue
Block a user