zyy/quote_price
1
0
انشعاب 0
کد مسائل تقاضاهای واکشی Actions Packages پروژه‌ها انتشارها دانشنامه فعالیت

修改帆布袋，外卖盒。方巾

فهرست منبع
This commit is contained in:
zhuyiyi
2025-12-01 16:53:15 +08:00
والد 1633d9b102
کامیت a306bca245
5فایلهای تغییر یافته به همراه91 افزوده شده و 79 حذف شده
دانلود پرونده وصله دانلود فایل تغییرات diff Expand all files Collapse all files
src/main/java/lingtao/net/service/ProductService.java
+43 -17
مشاهده پرونده
@@ -1350,7 +1350,7 @@ public class ProductService {
double addPrice = 5; double addPrice = 5;
List<String> craft_list = dto.getCraft() != null ? new ArrayList<>(Arrays.asList(dto.getCraft())) : new ArrayList<>(); List<String> craft_list = dto.getCraft() != null ? new ArrayList<>(Arrays.asList(dto.getCraft())) : new ArrayList<>();
if (craft_list.contains("压痕")) { if (craft_list.contains("压痕") && ((width <= 10 && length <= 7) || (width <= 7 && length <= 10))) {
craft_list.remove("压痕"); craft_list.remove("压痕");
craft_list.add("异形模切"); craft_list.add("异形模切");
} }
@@ -4926,12 +4926,15 @@ public class ProductService {
double[][] prices_list = { double[][] prices_list = {
{450, 880, 1700, 3250, 5380, 10000, 14728, 23685, 43103}, {450, 880, 1700, 3250, 5380, 10000, 14728, 23685, 43103},
}; };
double mini_price = 450;
int pre_count = 0; int pre_count = 0;
double base_price = 0;
Product pro = new Product();
for (int i = 0; i < count_list.length; i++) { for (int i = 0; i < count_list.length; i++) {
double price = prices_list[0][i]; double price = prices_list[0][i];
int item_count = count_list[i]; int item_count = count_list[i];
base_price = prices_list[0][i] / item_count;
if (item_count < count) { if (item_count < count) {
pre_count = item_count; pre_count = item_count;
continue; continue;
@@ -4940,23 +4943,33 @@ public class ProductService {
break; break;
} }
//数量小于50 //数量小于50
Product pro = new Product();
if (pre_count > 0 && count > pre_count) { if ((priceList.size() == 0) && count != item_count && count > pre_count) {
double base_price = prices_list[0][i - 1] / pre_count; if (pre_count > 0) {
base_price = prices_list[0][i - 1] / pre_count;
}
pro = new Product(); pro = new Product();
pro.setCount(count); pro.setCount(count);
pro.setWeight(df.format(0.005 * count * dto.getNumber())); pro.setWeight(df.format(0.005 * count * dto.getNumber()));
pro.setPrice(Math.ceil(base_price * count * dto.getNumber())); pro.setPrice(Math.max(Math.ceil(base_price * count * dto.getNumber()), mini_price));
priceList.add(pro); priceList.add(pro);
} }
base_price = prices_list[0][i] / item_count;
pro = new 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())); pro.setPrice(Math.max(Math.ceil(base_price * item_count * dto.getNumber()), mini_price));
priceList.add(pro); priceList.add(pro);
pre_count = item_count; pre_count = item_count;
} }
if (priceList.size() == 0) {
pro = new Product();
pro.setCount(count);
pro.setWeight(df.format(0.005 * count * dto.getNumber()));
pro.setPrice(Math.max(Math.ceil(base_price * count * dto.getNumber()), mini_price));
priceList.add(pro);
}
} }
if (carft_list.contains("UV印刷")) { if (carft_list.contains("UV印刷")) {
int pre_count = 0; int pre_count = 0;
@@ -5370,16 +5383,29 @@ public class ProductService {
width = width / 100; width = width / 100;
double area = length * width; double area = length * width;
double basePrice = 0; double basePrice = 0;
if (area < 1) { if ("1".equals(dto.getKind())) {
basePrice = 166; if (area < 1) {
} else if (area < 2) { basePrice = 166;
basePrice = 160; } else if (area < 2) {
} else if (area < 5) { basePrice = 160;
basePrice = 150; } else if (area < 5) {
} else if (area < 10) { basePrice = 150;
basePrice = 120; } else if (area < 10) {
} else { basePrice = 120;
basePrice = 100; } else {
basePrice = 100;
}
}
//反光贴
if ("2".equals(dto.getKind())) {
minPrice = 30;
if (area <= 1) {
basePrice = 138;
} else if (area <= 2) {
basePrice = 110;
} else {
basePrice = 100;
}
} }
List<Product> priceList = new ArrayList<>(); List<Product> priceList = new ArrayList<>();
Product pro = new Product(); Product pro = new Product();
src/main/webapp/views/product/chetie.jsp
+40 -54
مشاهده پرونده
@@ -19,8 +19,9 @@
材质 材质
</p> </p>
<div class="layui-form-item"> <div class="layui-form-item">
<select name="ui_bq_name" id="ui_bq_name" lay-filter="ui_fb_name" class="select" lay-search> <select name="kind" id="kind" lay-filter="ui_fb_name" class="select" lay-search>
<option value="1">可移黑胶</option> <option value="1">可移黑胶</option>
<option value="2">反光贴</option>
</select> </select>
</div> </div>
<p> <p>
@@ -50,26 +51,20 @@
<input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang" <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
class="layui-input"> class="layui-input">
</div> </div>
<%--<p> <p>
工艺 工艺
</p> </p>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block" style="display:inline-block;">
印面：
<input type="checkbox" name="craft" lay-filter="ui_craft" value="单面" title="单面" checked>
<input type="checkbox" name="craft" lay-filter="ui_craft" value="双面" title="双面">
</div>
<div class="layui-input-block" style="display:inline-block;">
覆膜工艺：
<input type="checkbox" name="craft" lay-filter="ui_craft" value="亮膜" title="亮膜" checked>
<input type="checkbox" name="craft" lay-filter="ui_craft" value="哑膜" title="哑膜">
</div>
<div class="layui-input-block" style="display:inline-block;"> <div class="layui-input-block" style="display:inline-block;">
裁切工艺： 裁切工艺：
<input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切"> <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切" checked>
<input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切" checked> <input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切">
</div> </div>
</div>--%> <div class="layui-input-block" style="display:inline-block;">
配件：
<input type="checkbox" name="craft" lay-filter="ui_craft" value="刮板" title="刮板" checked>
</div>
</div>
<hr> <hr>
<div class="layui-form-item"> <div class="layui-form-item">
<button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button> <button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button>
@@ -105,8 +100,7 @@
var carousel = layui.carousel; var carousel = layui.carousel;
var table = layui.table; var table = layui.table;
const carft_list2 = ["直角裁切", "异形模切"]; const carft_list2 = ["直角裁切", "异形模切"];
const carft_list1 = ["哑膜", "亮膜"]; const carft_list = ["刮板"];
const carft_list = ["单面", "双面"];
//建造实例 //建造实例
ins = carousel.render({}); ins = carousel.render({});
@@ -158,18 +152,9 @@
} }
); );
const carft = carft_list.filter(craft => craft_list.includes(craft)); const carft = carft_list.filter(craft => craft_list.includes(craft));
if (carft.length > 1) { if (carft.length == 0) {
$(data.elem).prop("checked", false); $(data.elem).prop("checked", true);
layer.msg("印面工艺不能同时选择", {offset: ['300px', '300px']}, function () { layer.msg("配件不能取消选择", {offset: ['300px', '300px']}, function () {
});
form.render();
return false;
}
const carft1 = carft_list1.filter(craft => craft_list.includes(craft));
if (carft1.length > 1) {
$(data.elem).prop("checked", false);
layer.msg("覆膜工艺不能同时选择", {offset: ['300px', '300px']}, function () {
}); });
form.render(); form.render();
return false; return false;
@@ -191,7 +176,7 @@
var number = $("#number").val(); var number = $("#number").val();
var size = $("#size").val(); var size = $("#size").val();
var count = $("#count").val(); var count = $("#count").val();
var kind = $("#ui_bq_name option:selected").text(); var kind = $("#kind option:selected").text();
var craft = []; var craft = [];
if (size == "") { if (size == "") {
layer.msg('请填写尺寸！', {offset: ['300px', '300px']}, function () { layer.msg('请填写尺寸！', {offset: ['300px', '300px']}, function () {
@@ -208,30 +193,31 @@
}); });
return false; return false;
} }
/* $("input:checkbox[name='craft']:checked").each(function (i) { $("input:checkbox[name='craft']:checked").each(function (i) {
// 没有被禁用的工艺加到arr中 // 没有被禁用的工艺加到arr中
if (!$(this).is(':disabled')) { if (!$(this).is(':disabled')) {
craft.push($(this).val()); craft.push($(this).val());
} }
}); });
const carft0 = carft_list.filter(item => craft.includes(item)); const carft2 = carft_list2.filter(item => craft.includes(item));
if (carft0.length == 0) { if (carft2.length == 0) {
layer.msg("请选择印面工艺", {offset: ['300px', '300px']}, function () { layer.msg("请选择裁切工艺", {offset: ['300px', '300px']}, function () {
}); });
return false; return false;
} }
const carft1 = carft_list1.filter(item => craft.includes(item)); /* const carft0 = carft_list.filter(item => craft.includes(item));
if (carft1.length == 0) { if (carft0.length == 0) {
layer.msg("请选择覆膜工艺", {offset: ['300px', '300px']}, function () { layer.msg("请选择印面工艺", {offset: ['300px', '300px']}, function () {
}); });
return false; return false;
} }
const carft2 = carft_list2.filter(item => craft.includes(item)); const carft1 = carft_list1.filter(item => craft.includes(item));
if (carft2.length == 0) { if (carft1.length == 0) {
layer.msg("请选择裁切工艺", {offset: ['300px', '300px']}, function () { layer.msg("请选择覆膜工艺", {offset: ['300px', '300px']}, function () {
}); });
return false; return false;
}*/ }
*/
$.ajax({ $.ajax({
url: "${path}/getThanSum", url: "${path}/getThanSum",
src/main/webapp/views/product/coupon.jsp
+1 -1
مشاهده پرونده
@@ -3403,7 +3403,7 @@
}); });
return false; return false;
} }
if (type == 1 || switchz3Size) { if (type == 1) {
if (arr.indexOf("圆角") == -1 && arr.indexOf("直角") == -1) { if (arr.indexOf("圆角") == -1 && arr.indexOf("直角") == -1) {
layer.msg("圆角，直角必选 无法报价", {offset: ['300px', '300px']}, function () { layer.msg("圆角，直角必选 无法报价", {offset: ['300px', '300px']}, function () {
}); });
src/main/webapp/views/product/handkerchiefPaper.jsp
+2 -2
مشاهده پرونده
@@ -16,7 +16,7 @@
</style> </style>
<div class="big_box"> <div class="big_box">
<div class="left_div"> <div class="left_div">
<h1 class="h1">方巾纸</h1> <span style="color:red;font-weight:700;"></span> <h1 class="h1">方巾</h1> <span style="color:red;font-weight:700;"></span>
<hr> <hr>
<form class="layui-form"> <form class="layui-form">
<input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="方巾纸"/> <input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="方巾纸"/>
@@ -239,7 +239,7 @@
} }
var data = result.data.proList; var data = result.data.proList;
var span_result = '方巾纸 - ' + kind + ' - ' + size + ' CM (同款内容)\n'; var span_result = '方巾 - ' + kind + ' - ' + size + ' CM (同款内容)\n';
span_result += `工艺：` + craft.join(",") + '\n'; span_result += `工艺：` + craft.join(",") + '\n';
src/main/webapp/views/product/takeoutBox.jsp
+5 -5
مشاهده پرونده
@@ -39,10 +39,10 @@
</select> </select>
</div> </div>
<p> <p>
尺寸(长宽高) 尺寸(长宽高) 单位mm
</p> </p>
<div class="layui-form-item"> <div class="layui-form-item">
<input type="text" name="size" id="size" value="12.8*10.5*6.5" placeholder="格式:长*宽" value="" <input type="text" name="size" id="size" value="128*105*65" placeholder="格式:长*宽" value=""
class="layui-input" class="layui-input"
autocomplete="off" readonly> autocomplete="off" readonly>
</div> </div>
@@ -170,13 +170,13 @@
}); });
form.on('select(pcount_filter)', function (data) { form.on('select(pcount_filter)', function (data) {
if (data.value == 1) { if (data.value == 1) {
$("#size").val("12.8*10.5*6.5") $("#size").val("128*105*65")
} }
if (data.value == 3) { if (data.value == 3) {
$("#size").val("21.5*16*6.5") $("#size").val("215*160*65")
} }
if (data.value == 5) { if (data.value == 5) {
$("#size").val("16.5*13.5*5") $("#size").val("165*135*50")
} }
}) })
form.on('checkbox(ui_craft)', function (data) { form.on('checkbox(ui_craft)', function (data) {