edit
This commit is contained in:
@@ -2955,6 +2955,27 @@ public class ProductService {
|
|||||||
product.setWeight(df.format(wei * product.getCount() * number));
|
product.setWeight(df.format(wei * product.getCount() * number));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (number > 1 && width * length * 10000 < 40 * 50) {
|
||||||
|
|
||||||
|
if (("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) {
|
||||||
|
double desFee = 0;
|
||||||
|
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
|
||||||
|
desFee = 3;
|
||||||
|
} else if (dto.getP() == 4) {
|
||||||
|
desFee = 5;
|
||||||
|
} else if (dto.getP() == 5) {
|
||||||
|
desFee = 6;
|
||||||
|
} else {
|
||||||
|
desFee = 11;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Product product : priceList) {
|
||||||
|
product.setPrice(Math.floor(product.getPrice() + desFee * (number - 1)));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return priceList;
|
return priceList;
|
||||||
// 扇子
|
// 扇子
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
<option value="192*128">192*128</option>
|
<option value="192*128">192*128</option>
|
||||||
<option value="144*96">144*96</option>
|
<option value="144*96">144*96</option>
|
||||||
<option value="240*160">240*160</option>
|
<option value="240*160">240*160</option>
|
||||||
<option value="288*180">288*180</option>
|
<option value="288*192">288*192</option>
|
||||||
<option value="120*80">120*80</option>
|
<option value="120*80">120*80</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -227,6 +227,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>
|
||||||
|
<div class="layui-form-item" id="ui_des" style="display:none;">
|
||||||
|
<p>
|
||||||
|
设计内容
|
||||||
|
</p>
|
||||||
|
<select name="desType" lay-filter="desType" id="desType" class="select" lay-search>
|
||||||
|
<option value=""></option>
|
||||||
|
<option value="1">改序号</option>
|
||||||
|
<option value="2">改名字</option>
|
||||||
|
<option value="3">改二维码</option>
|
||||||
|
<option value="4">改图片</option>
|
||||||
|
<option value="5">改内容模板相同</option>
|
||||||
|
<option value="6" selected>改内容模板完全不同</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<!-- 制度牌 -->
|
<!-- 制度牌 -->
|
||||||
<div class="zhiDuPai" style="display:none">
|
<div class="zhiDuPai" style="display:none">
|
||||||
<p>
|
<p>
|
||||||
@@ -532,10 +546,26 @@
|
|||||||
ins = carousel.render({});
|
ins = carousel.render({});
|
||||||
|
|
||||||
var kind;
|
var kind;
|
||||||
|
$("#number").on("input", function (e) {
|
||||||
|
showDes()
|
||||||
|
});
|
||||||
|
|
||||||
|
function showDes() {
|
||||||
|
var number = $("#number").val();
|
||||||
|
let number_kindValue = $("input[name='kindValue']:checked").val();
|
||||||
|
let number_kind2Value = $("select[name='kind2Value'] option:selected").val();
|
||||||
|
if (number > 1 && ((number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
|
||||||
|
$("#ui_des").show();
|
||||||
|
} else {
|
||||||
|
$("#ui_des").hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 根据类目获取产品名称
|
// 根据类目获取产品名称
|
||||||
form.on('radio(kindValue)', function (data) {
|
form.on('radio(kindValue)', function (data) {
|
||||||
kind = data.value;
|
kind = data.value;
|
||||||
$(".zdt_xiezhen").hide();
|
$(".zdt_xiezhen").hide();
|
||||||
|
showDes()
|
||||||
// 制度牌
|
// 制度牌
|
||||||
$(".zhiDuPai").hide();
|
$(".zhiDuPai").hide();
|
||||||
$(".zhiDuPai").find(":input").attr("disabled", true);
|
$(".zhiDuPai").find(":input").attr("disabled", true);
|
||||||
@@ -990,6 +1020,7 @@
|
|||||||
var kind2;
|
var kind2;
|
||||||
// 根据产品名称展示工艺
|
// 根据产品名称展示工艺
|
||||||
form.on('select(kind2Value)', function (data) {
|
form.on('select(kind2Value)', function (data) {
|
||||||
|
showDes()
|
||||||
if (data.value == '红底条幅') {
|
if (data.value == '红底条幅') {
|
||||||
$("#width").find("option[value = 50]").attr("selected", true);
|
$("#width").find("option[value = 50]").attr("selected", true);
|
||||||
$(".redNo").attr("disabled", true);
|
$(".redNo").attr("disabled", true);
|
||||||
@@ -1600,7 +1631,13 @@
|
|||||||
if (dengxType == 1 && value == 2 && kind2 == "摆摊软膜灯箱") {
|
if (dengxType == 1 && value == 2 && kind2 == "摆摊软膜灯箱") {
|
||||||
unit = "套"
|
unit = "套"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (number > 1) {
|
if (number > 1) {
|
||||||
|
if ($("#ui_des").css("display") != "none") {
|
||||||
|
let numberType = $("#desType option:selected").text();
|
||||||
|
span_result += "款数:" + number + "-" + numberType + "\n";
|
||||||
|
}
|
||||||
for (let i = 0; i < data.length; i++) {
|
for (let i = 0; i < data.length; i++) {
|
||||||
span_result += number + '款 各' + data[i].count + unit + ",共" + data[i].price + "元" + '\n'
|
span_result += number + '款 各' + data[i].count + unit + ",共" + data[i].price + "元" + '\n'
|
||||||
data[i].number = number;
|
data[i].number = number;
|
||||||
|
|||||||
Viittaa uudesa ongelmassa
Block a user