|
@@ -4981,9 +4981,9 @@ public class ProductService {
|
|
|
List<String> carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
|
|
List<String> carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
|
|
|
for (Product product : priceList) {
|
|
for (Product product : priceList) {
|
|
|
product.setWeight(df.format(width / 100 * length / 100 * product.getCount() * 0.48 * 1.4));
|
|
product.setWeight(df.format(width / 100 * length / 100 * product.getCount() * 0.48 * 1.4));
|
|
|
- if (carftList.contains("装opp袋")) {
|
|
|
|
|
- product.setPrice(Math.ceil(product.getPrice() + Math.max(product.getCount() * dto.getNumber() * 0.33, 100)));
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (carftList.contains("装opp袋")) {
|
|
|
|
|
+// product.setPrice(Math.ceil(product.getPrice() + Math.max(product.getCount() * dto.getNumber() * 0.33, 100)));
|
|
|
|
|
+// }
|
|
|
}
|
|
}
|
|
|
return priceList;
|
|
return priceList;
|
|
|
}
|
|
}
|