|
@@ -1295,11 +1295,15 @@ public class ProductService {
|
|
|
priceList = new PriceUtils().tags600Price(dto, kind, kind2, area, count);
|
|
priceList = new PriceUtils().tags600Price(dto, kind, kind2, area, count);
|
|
|
|
|
|
|
|
for (Product product : priceList) {
|
|
for (Product product : priceList) {
|
|
|
|
|
+ int num = getNum(width, length);
|
|
|
// 服装吊牌里面的600克吊牌把价格*1.3倍
|
|
// 服装吊牌里面的600克吊牌把价格*1.3倍
|
|
|
if (!("6".equals(kind) && "无".equals(kind2))) {
|
|
if (!("6".equals(kind) && "无".equals(kind2))) {
|
|
|
- if (area <= 0.00486) {
|
|
|
|
|
|
|
+ if (num == 1) {
|
|
|
product.setPrice(Math.floor(product.getPrice() * 1.3));
|
|
product.setPrice(Math.floor(product.getPrice() * 1.3));
|
|
|
}
|
|
}
|
|
|
|
|
+ if (num == 2) {
|
|
|
|
|
+ product.setPrice(Math.floor(product.getPrice() * 1.2));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if ("4".equals(kind)) {
|
|
if ("4".equals(kind)) {
|
|
|
product.setPrice(Math.floor(product.getPrice() * 1.3));
|
|
product.setPrice(Math.floor(product.getPrice() * 1.3));
|
|
@@ -1692,7 +1696,7 @@ public class ProductService {
|
|
|
}
|
|
}
|
|
|
double craft_price = 0;
|
|
double craft_price = 0;
|
|
|
if (craft_list.contains("圆角")) {
|
|
if (craft_list.contains("圆角")) {
|
|
|
- craft_price += 4 * itemCount;
|
|
|
|
|
|
|
+ craft_price += 4 * itemCount / 100;
|
|
|
}
|
|
}
|
|
|
if ((craft_list.contains("单面烫金") || craft_list.contains("双面烫金") || craft_list.contains("烫镭射银"))) {
|
|
if ((craft_list.contains("单面烫金") || craft_list.contains("双面烫金") || craft_list.contains("烫镭射银"))) {
|
|
|
double tangPrice = 45 + 0.1 * itemCount;
|
|
double tangPrice = 45 + 0.1 * itemCount;
|
|
@@ -1725,7 +1729,7 @@ public class ProductService {
|
|
|
}
|
|
}
|
|
|
dto2 = new Product();
|
|
dto2 = new Product();
|
|
|
dto2.setCount(count_list[i]);
|
|
dto2.setCount(count_list[i]);
|
|
|
- dto2.setPrice(Math.ceil(prices[i] + craft_price));
|
|
|
|
|
|
|
+ dto2.setPrice(Math.ceil((prices[i] + craft_price) * number));
|
|
|
priceList.add(dto2);
|
|
priceList.add(dto2);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -5339,7 +5343,7 @@ public class ProductService {
|
|
|
double basePrice = prices[base][prices[base].length - 1];
|
|
double basePrice = prices[base][prices[base].length - 1];
|
|
|
pro = new Product();
|
|
pro = new Product();
|
|
|
pro.setCount(count);
|
|
pro.setCount(count);
|
|
|
- pro.setPrice(Math.ceil(basePrice / maxCount * count * number));
|
|
|
|
|
|
|
+ pro.setPrice(Math.ceil(basePrice / maxCount * count * number * 1.2));
|
|
|
pro.setNumber(number);
|
|
pro.setNumber(number);
|
|
|
pro.setWeight(df.format(baseWeight * count));
|
|
pro.setWeight(df.format(baseWeight * count));
|
|
|
priceList.add(pro);
|
|
priceList.add(pro);
|
|
@@ -5641,6 +5645,7 @@ public class ProductService {
|
|
|
double miniprice = 400;
|
|
double miniprice = 400;
|
|
|
double mo_price = 300;
|
|
double mo_price = 300;
|
|
|
double base_price = 3.5;
|
|
double base_price = 3.5;
|
|
|
|
|
+ int mini_count = 30;
|
|
|
if (width <= 3 && length <= 3) {
|
|
if (width <= 3 && length <= 3) {
|
|
|
|
|
|
|
|
} else if (width <= 4 && length <= 4) {
|
|
} else if (width <= 4 && length <= 4) {
|
|
@@ -5658,12 +5663,15 @@ public class ProductService {
|
|
|
} else if (width <= 8 && length <= 8) {
|
|
} else if (width <= 8 && length <= 8) {
|
|
|
mo_price = 420;
|
|
mo_price = 420;
|
|
|
base_price = 7;
|
|
base_price = 7;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ mo_price = 480;
|
|
|
|
|
+ base_price = 8;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Product pro = new Product();
|
|
Product pro = new Product();
|
|
|
pro.setCount(count);
|
|
pro.setCount(count);
|
|
|
- pro.setWeight(df.format(0.005 * count * dto.getNumber()));
|
|
|
|
|
- pro.setPrice(Math.max(Math.ceil(base_price * count * dto.getNumber() + mo_price * dto.getNumber()), miniprice));
|
|
|
|
|
|
|
+ pro.setWeight(df.format(0.005 * dto.getNumber() * Math.max(mini_count, count)));
|
|
|
|
|
+ pro.setPrice(Math.max(Math.ceil(base_price * Math.max(mini_count, count) * dto.getNumber() + mo_price * dto.getNumber()), miniprice));
|
|
|
priceList.add(pro);
|
|
priceList.add(pro);
|
|
|
for (int i = 0; i < count_list.length; i++) {
|
|
for (int i = 0; i < count_list.length; i++) {
|
|
|
int item_count = count_list[i];
|
|
int item_count = count_list[i];
|
|
@@ -5674,13 +5682,6 @@ public class ProductService {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
pro = new Product();
|
|
pro = new Product();
|
|
|
- if (base_price < 4.5) {
|
|
|
|
|
- if (item_count > 100 && item_count <= 500) {
|
|
|
|
|
- base_price = 3.5;
|
|
|
|
|
- } else if (item_count > 500) {
|
|
|
|
|
- base_price = 3;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
pro = new Product();
|
|
pro = new Product();
|
|
|
pro.setCount(item_count);
|
|
pro.setCount(item_count);
|
|
@@ -5836,7 +5837,7 @@ public class ProductService {
|
|
|
Product pro = new Product();
|
|
Product pro = new Product();
|
|
|
pro.setCount(item_count);
|
|
pro.setCount(item_count);
|
|
|
pro.setWeight(df.format(0.005 * item_count * dto.getNumber()));
|
|
pro.setWeight(df.format(0.005 * item_count * dto.getNumber()));
|
|
|
- pro.setPrice(Math.ceil(price * dto.getNumber() + craft_price));
|
|
|
|
|
|
|
+ pro.setPrice(Math.ceil((price * dto.getNumber() + craft_price) * 1.2));
|
|
|
list.add(pro);
|
|
list.add(pro);
|
|
|
}
|
|
}
|
|
|
return list;
|
|
return list;
|