新增伸缩手拉旗,新增熨斗,限制鼠标垫尺寸
This commit is contained in:
@@ -357,7 +357,7 @@ public class ProductController {
|
||||
}
|
||||
String size = product.getSize();
|
||||
|
||||
if (("17".equals(product.getProTypeValue()) && "6".equals(product.getKindValue())) || "手拉旗".equals(product.getProTypeValue())) {
|
||||
if (("17".equals(product.getProTypeValue()) && "6".equals(product.getKindValue())) || ("手拉旗".equals(product.getProTypeValue()) && "常规".equals(product.getStickerKind()))) {
|
||||
if (!StringUtils.isEmpty(size)) {
|
||||
String sizeList[] = size.split(",");
|
||||
size = sizeList[0];
|
||||
|
||||
@@ -251,7 +251,7 @@ public class ProductService {
|
||||
String sizeList[] = size.split(",");
|
||||
size = sizeList[0];
|
||||
}
|
||||
} else if ("手拉旗".equals(proType)) {
|
||||
} else if (("手拉旗".equals(dto.getProTypeValue()) && "常规".equals(dto.getStickerKind()))) {
|
||||
size += "*" + dto.getWidth();
|
||||
}
|
||||
int count = dto.getCount();
|
||||
@@ -2690,7 +2690,12 @@ public class ProductService {
|
||||
}
|
||||
apprise = product.getPrice();
|
||||
}
|
||||
|
||||
if (craft_list.contains("熨斗")) {
|
||||
dto.setPo_number(dto.getPo_number() == null ? 1 : dto.getPo_number());
|
||||
for (Product product : priceList) {
|
||||
product.setPrice(product.getPrice() + 40 * Math.max(dto.getPo_number(), 1));
|
||||
}
|
||||
}
|
||||
return priceList;
|
||||
}
|
||||
if (length <= 2) {
|
||||
@@ -2705,6 +2710,7 @@ public class ProductService {
|
||||
// 1006 1003 1005 1037 1058 1002 1033 1045 卓盛 航和 米笛儿 竹范 领淘文具 榆家 涛莱 拼多多uv单独报价
|
||||
List<String> crafts = new ArrayList<>(dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft()));
|
||||
crafts.remove("刮板");
|
||||
crafts.remove("熨斗");
|
||||
crafts.remove("哑光");
|
||||
if (crafts.size() > 0 && "烫金".equals(crafts.get(0))) {
|
||||
crafts.remove(0);
|
||||
@@ -2729,6 +2735,7 @@ public class ProductService {
|
||||
product.setPrice(product.getPrice() + 2 * Math.max(dto.getPcount(), 1));
|
||||
}
|
||||
}
|
||||
|
||||
if ("宠物转印贴".equals(dto.getKind())) {
|
||||
for (Product product : priceList) {
|
||||
product.setPrice(Math.ceil(product.getPrice() == 50 ? product.getPrice() : product.getPrice() * 1.3));
|
||||
@@ -4483,11 +4490,39 @@ public class ProductService {
|
||||
/*
|
||||
* if(kind.equals("1")) { if(length == 70 && width == 24) { priceList = new FgqPrice().getSlqSpeicPrice(count, priceList, 1); }else if(length == 50 && width == 17) { priceList = new FgqPrice().getSlqSpeicPrice(count, priceList, 2); }else { priceList = new FgqPrice().getSlqPrice(count, priceList); } }else {
|
||||
*/
|
||||
priceList = new FgqPrice().getSlqPrice(count, priceList);
|
||||
if ("常规".equals(dto.getStickerKind())) {
|
||||
priceList = new FgqPrice().getSlqPrice(count, priceList);
|
||||
}
|
||||
if ("伸缩手拉旗".equals(dto.getStickerKind())) {
|
||||
double base_price = 0;
|
||||
if ((length == 24 && width == 70) || (length == 70 && width == 24)) {
|
||||
base_price = 30;
|
||||
}
|
||||
if ((length == 24 && width == 50) || (length == 50 && width == 24)) {
|
||||
base_price = 30;
|
||||
}
|
||||
if ((length == 24 && width == 100) || (length == 100 && width == 24)) {
|
||||
base_price = 35;
|
||||
}
|
||||
if ((length == 17 && width == 70) || (length == 70 && width == 17)) {
|
||||
base_price = 30;
|
||||
}
|
||||
if ((length == 17 && width == 50) || (length == 50 && width == 17)) {
|
||||
base_price = 30;
|
||||
}
|
||||
if ((length == 17 && width == 100) || (length == 100 && width == 17)) {
|
||||
base_price = 35;
|
||||
}
|
||||
Product product = new Product();
|
||||
product.setCount(dto.getCount());
|
||||
product.setNumber(number);
|
||||
product.setPrice(Math.ceil(base_price * dto.getCount()));
|
||||
priceList.add(product);
|
||||
|
||||
}
|
||||
/* } */
|
||||
for (Product product : priceList) {
|
||||
product.setPrice(Math.floor(product.getPrice() * number));
|
||||
|
||||
product.setWeight(df.format(length * width * product.getCount() / 10000 * number * 0.075));
|
||||
}
|
||||
return priceList;
|
||||
@@ -5398,6 +5433,9 @@ public class ProductService {
|
||||
pro.setWeight(df.format(width * length * 1.2 * count * 0.1 / 1000 * Double.parseDouble(kind)));
|
||||
priceList.add(pro);
|
||||
}
|
||||
for (Product product : priceList) {
|
||||
product.setPrice(Math.ceil(product.getPrice() * number));
|
||||
}
|
||||
return priceList;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user