|
|
@@ -548,7 +548,7 @@ public class ProductService {
|
|
|
if ("12".equals(dto.getToothpick_size())) {
|
|
|
basePrice = basePrice + 0.02;
|
|
|
}
|
|
|
- if ("常规".equals(dto.getKind2Value())) {
|
|
|
+ if ("常规".equals(dto.getKind2Value()) && "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);
|