|
|
@@ -825,6 +825,7 @@ public class ProductService {
|
|
|
boolean isyaofeng = false;
|
|
|
|
|
|
double moqiePrice = 0;
|
|
|
+ craft_list = new ArrayList<>(craft_list);
|
|
|
if (!craft_list.contains("模切") && (craft_list.contains("压痕") || craft_list.contains("压点线"))) {
|
|
|
//压1痕最小尺寸10.8*5.4cm,压2痕最小尺寸13.5*5.4CM按照贺卡模切价格算
|
|
|
boolean is_moqie = false;
|
|
|
@@ -838,6 +839,12 @@ public class ProductService {
|
|
|
is_moqie = true;
|
|
|
}
|
|
|
}
|
|
|
+ if (craft_list.contains("压痕") && dto.getYaheng() == 3 || (craft_list.contains("压点线") && dto.getDadianxian() == 3)) {
|
|
|
+ craft_list.add("模切");
|
|
|
+ }
|
|
|
+ if (craft_list.contains("压痕") && dto.getYaheng() == 4 || (craft_list.contains("压点线") && dto.getDadianxian() == 4)) {
|
|
|
+ craft_list.add("模切");
|
|
|
+ }
|
|
|
if (is_moqie) {
|
|
|
isyaofeng = true;
|
|
|
for (int i = 0; i < dto.getCraft().length; i++) {
|
|
|
@@ -4440,7 +4447,8 @@ public class ProductService {
|
|
|
if (craLists.contains("手绘")) {
|
|
|
product.setPrice(150.00 * number);
|
|
|
}
|
|
|
- product.setWeight(df.format(0.075 * length * width * product.getCount() / 10000 * number + product.getCount() * wei));
|
|
|
+ product.setWeight(df.format(0.075 * length * width * product.getCount() / 10000 * number + product.getCount() * wei * number
|
|
|
+ ));
|
|
|
}
|
|
|
return priceList;
|
|
|
case "卡贴":
|