|
@@ -532,29 +532,31 @@ public class ProductService {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if ("0".equals(dto.getKindValue()) && !"专版打印".contentEquals(dto.getStickerKind())) {
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ if (number > 1) {
|
|
|
|
|
+ for (Product product : stickersList) {
|
|
|
|
|
+ product.setPrice(product.getPrice() * number);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
double huaxianPrice = 0.0;
|
|
double huaxianPrice = 0.0;
|
|
|
if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
|
|
if (("0".equals(dto.getKindValue()) || "1".equals(dto.getKindValue())) && "划线".equals(dto.getCraftQieType())) {
|
|
|
//宽度大于50 长度185-500
|
|
//宽度大于50 长度185-500
|
|
|
for (Product product : stickersList) {
|
|
for (Product product : stickersList) {
|
|
|
if ("0".equals(dto.getKindValue())) {
|
|
if ("0".equals(dto.getKindValue())) {
|
|
|
if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
|
|
if (!((width >= 5 && length >= 18.5 && length <= 500) || (length >= 5 && width >= 18.5 && width <= 500))) {
|
|
|
- huaxianPrice = Math.max(0.1 * product.getCount(), 50);
|
|
|
|
|
|
|
+ huaxianPrice = Math.max(0.1 * product.getCount() * number, 50);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- huaxianPrice = Math.max(0.2 * product.getCount(), 50);
|
|
|
|
|
|
|
+ huaxianPrice = Math.max(0.12 * product.getCount() * number, 50);
|
|
|
}
|
|
}
|
|
|
product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
|
|
product.setPrice(Math.ceil(product.getPrice() + huaxianPrice));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if ("0".equals(dto.getKindValue()) && !"专版打印".contentEquals(dto.getStickerKind())) {
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- if (number > 1) {
|
|
|
|
|
- for (Product product : stickersList) {
|
|
|
|
|
- product.setPrice(product.getPrice() * number);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
return priceList;
|
|
return priceList;
|
|
|
case "1":
|
|
case "1":
|