贺卡新增内部模切
This commit is contained in:
@@ -1094,6 +1094,9 @@ public class ProductService {
|
||||
}
|
||||
carft_price += carft_base_price * Math.ceil(product.getCount() / 1000.0);
|
||||
}
|
||||
if (craft_list.contains("内部模切")) {
|
||||
carft_price += 15 * dto.getN_mq_num();
|
||||
}
|
||||
//腰封的模切费单独计算
|
||||
product.setPrice(Math.ceil((product.getPrice() + carft_price) * number + Math.max(Math.ceil(moqiePrice * product.getCount() * number), moqiePrice > 0 ? 55 : 0)));
|
||||
product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.3 * 0.86));
|
||||
@@ -1307,7 +1310,9 @@ public class ProductService {
|
||||
}
|
||||
if ("4".equals(kind)) {
|
||||
product.setPrice(Math.floor(product.getPrice() * 1.3));
|
||||
|
||||
if (num == 1 && "无".equals(kind2)) {
|
||||
product.setPrice(Math.floor(product.getPrice() * 1.3));
|
||||
}
|
||||
// 服装吊牌里面的900克吊牌把价格
|
||||
if (product.getCount() <= 2000) {
|
||||
product.setPrice(Math.floor(product.getPrice() * 1.1));
|
||||
@@ -4912,7 +4917,7 @@ public class ProductService {
|
||||
craft_price += Math.max(dto.getMaxian(), 1) * 1.5;
|
||||
}
|
||||
if (craft_list.contains("丝带")) {
|
||||
craft_price += Math.max(dto.getPcount(), 1) * 1.5;
|
||||
craft_price += Math.max(dto.getPcount(), 1) * 3.5;
|
||||
}
|
||||
for (int i = 0; i < counts.length; i++) {
|
||||
int countItem = counts[i];
|
||||
@@ -4930,6 +4935,13 @@ public class ProductService {
|
||||
pro.setPrice(Math.ceil((double) base_price / counts[isFirst ? Math.max(i - 1, 0) : i] * Math.max(min_count, isFirst ? count : countItem) + craft_price));
|
||||
priceList.add(pro);
|
||||
}
|
||||
if (priceList.size() == 0) {
|
||||
Product pro = new Product();
|
||||
pro.setCount(count);
|
||||
pro.setNumber(number);
|
||||
pro.setPrice(Math.ceil((double) prices[prices.length - 1] / counts[counts.length - 1] * Math.max(min_count, count) + craft_price));
|
||||
priceList.add(pro);
|
||||
}
|
||||
return priceList;
|
||||
}
|
||||
|
||||
@@ -5379,7 +5391,7 @@ public class ProductService {
|
||||
}
|
||||
pro = new Product();
|
||||
pro.setCount(itemCount);
|
||||
pro.setPrice(Math.ceil(prices[base][i] * number));
|
||||
pro.setPrice(Math.ceil(prices[base][i] * number * 1.2));
|
||||
pro.setNumber(number);
|
||||
pro.setWeight(df.format(baseWeight * itemCount));
|
||||
priceList.add(pro);
|
||||
@@ -5779,13 +5791,13 @@ public class ProductService {
|
||||
if ("2".equals(dto.getKind())) {
|
||||
max_width = 420;
|
||||
max_length = 310;
|
||||
base_price = 45;
|
||||
base_price = 35;
|
||||
min_price = 60;
|
||||
}
|
||||
if ("3".equals(dto.getKind())) {
|
||||
max_width = 420;
|
||||
max_length = 310;
|
||||
base_price = 48;
|
||||
base_price = 40;
|
||||
min_price = 60;
|
||||
}
|
||||
width = width * 10 + 4;
|
||||
@@ -7248,7 +7260,7 @@ public class ProductService {
|
||||
double price = 0;
|
||||
for (int i = 0; i < bigCountArr.length; i++) {
|
||||
if (product.getCount() >= bigCountArr[i]) {
|
||||
price = productPrice + basePrice[i] * number;
|
||||
price = productPrice + basePrice[i];
|
||||
}
|
||||
}
|
||||
product.setPrice(Math.max(price, productPrice));
|
||||
|
||||
Reference in New Issue
Block a user