修改海报价格,特种纸bug
这个提交包含在:
@@ -417,18 +417,18 @@ public class PosterPrice {
|
|||||||
weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
|
weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// if (width * length < 40 * 50) {
|
if (width * length < 40 * 50) {
|
||||||
// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
|
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
|
||||||
// } else {
|
} else {
|
||||||
danjia = last_price;
|
danjia = last_price;
|
||||||
for (int i = 0; i < areas.length; i++) {
|
for (int i = 0; i < areas.length; i++) {
|
||||||
if (area <= areas[i]) {
|
if (area <= areas[i]) {
|
||||||
danjia = prices[i];
|
danjia = prices[i];
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
price = Math.max(area * danjia, min_price);
|
||||||
}
|
}
|
||||||
price = Math.max(area * danjia, min_price);
|
|
||||||
// }
|
|
||||||
Product pro = new Product();
|
Product pro = new Product();
|
||||||
List<Product> list = new ArrayList<Product>();
|
List<Product> list = new ArrayList<Product>();
|
||||||
pro.setCount(count);
|
pro.setCount(count);
|
||||||
@@ -601,18 +601,18 @@ public class PosterPrice {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!"7".equals(kind2) && !"10".equals(kind2)) {
|
if (!"7".equals(kind2) && !"10".equals(kind2)) {
|
||||||
// if (width * length < 40 * 50) {
|
if (width * length < 40 * 50) {
|
||||||
// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
|
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
|
||||||
// } else {
|
} else {
|
||||||
danjia = last_price;
|
danjia = last_price;
|
||||||
for (int i = 0; i < areas.length; i++) {
|
for (int i = 0; i < areas.length; i++) {
|
||||||
if (area <= areas[i]) {
|
if (area <= areas[i]) {
|
||||||
danjia = prices[i];
|
danjia = prices[i];
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
price = Math.max(area * danjia, min_price);
|
||||||
}
|
}
|
||||||
price = Math.max(area * danjia, min_price);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3242,18 +3242,18 @@ public class PriceUtils {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (width * length < 40 * 50) {
|
if (width * length < 40 * 50) {
|
||||||
// price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
|
price = new PriceUtils().getTestPrice(length, width, count, number, areas, prices, min_price, last_price);
|
||||||
// } else {
|
} else {
|
||||||
dj = last_price;
|
dj = last_price;
|
||||||
for (int i = 0; i < areas.length; i++) {
|
for (int i = 0; i < areas.length; i++) {
|
||||||
if (area <= areas[i]) {
|
if (area <= areas[i]) {
|
||||||
dj = prices[i];
|
dj = prices[i];
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
price = Math.max(area * dj, min_price);
|
||||||
}
|
}
|
||||||
price = Math.max(area * dj, min_price);
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (number > 1 && width * length >= 40 * 50) {
|
if (number > 1 && width * length >= 40 * 50) {
|
||||||
pro.setPrice(Math.ceil(price * number));
|
pro.setPrice(Math.ceil(price * number));
|
||||||
|
|||||||
@@ -186,7 +186,7 @@
|
|||||||
<input type="checkbox" name="craft" lay-filter="mianka" value="单面烫金" title="单面烫金">
|
<input type="checkbox" name="craft" lay-filter="mianka" value="单面烫金" title="单面烫金">
|
||||||
<input type="checkbox" name="craft" lay-filter="mianka" value="双面烫金" title="双面烫金">
|
<input type="checkbox" name="craft" lay-filter="mianka" value="双面烫金" title="双面烫金">
|
||||||
<div id="tang_type" class="layui-inline" style="display: none;width: 90px">
|
<div id="tang_type" class="layui-inline" style="display: none;width: 90px">
|
||||||
<select name="craft" class="select">
|
<select name="craft" class="select" disabled>
|
||||||
<option value="烫金" selected>烫金</option>
|
<option value="烫金" selected>烫金</option>
|
||||||
<option value="烫银">烫银</option>
|
<option value="烫银">烫银</option>
|
||||||
<option value="烫蓝">烫蓝</option>
|
<option value="烫蓝">烫蓝</option>
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户