edit
Esse commit está contido em:
@@ -1366,7 +1366,7 @@ public class ProductService {
|
|||||||
double desFee = 0;
|
double desFee = 0;
|
||||||
if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
|
if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
|
||||||
if (dto.getP() == 1) {
|
if (dto.getP() == 1) {
|
||||||
desFee = 0.6* (number - 1);
|
desFee = 0.6 * (number - 1);
|
||||||
} else {
|
} else {
|
||||||
if (number == 2) {
|
if (number == 2) {
|
||||||
desFee = 5.5;
|
desFee = 5.5;
|
||||||
@@ -3211,9 +3211,10 @@ public class ProductService {
|
|||||||
if (number > 3) {
|
if (number > 3) {
|
||||||
desFee = 11 + 11 + 11 * (number - 3);
|
desFee = 11 + 11 + 11 * (number - 3);
|
||||||
}
|
}
|
||||||
for (Product product : priceList) {
|
}
|
||||||
product.setPrice(Math.ceil(product.getPrice() + desFee));
|
|
||||||
}
|
for (Product product : priceList) {
|
||||||
|
product.setPrice(Math.ceil(product.getPrice() + desFee));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
|
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
|
||||||
@@ -4537,7 +4538,7 @@ public class ProductService {
|
|||||||
double desFee = 0;
|
double desFee = 0;
|
||||||
if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
|
if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
|
||||||
if (dto.getP() == 1) {
|
if (dto.getP() == 1) {
|
||||||
desFee = 0.6* (number - 1);
|
desFee = 0.6 * (number - 1);
|
||||||
} else {
|
} else {
|
||||||
if (number == 2) {
|
if (number == 2) {
|
||||||
desFee = 3.5;
|
desFee = 3.5;
|
||||||
|
|||||||
@@ -537,7 +537,7 @@
|
|||||||
</body>
|
</body>
|
||||||
<%@include file="/views/copyResult.jsp" %>
|
<%@include file="/views/copyResult.jsp" %>
|
||||||
<script>
|
<script>
|
||||||
setNumberOptions();
|
//setNumberOptions();
|
||||||
function setNumberOptions() {
|
function setNumberOptions() {
|
||||||
let html = '';
|
let html = '';
|
||||||
if (window.parent.system_isPdd) {
|
if (window.parent.system_isPdd) {
|
||||||
@@ -555,6 +555,7 @@
|
|||||||
}
|
}
|
||||||
$("#desType").empty().append(html);
|
$("#desType").empty().append(html);
|
||||||
}
|
}
|
||||||
|
|
||||||
layui.use(['table', 'form', 'carousel'], function () {
|
layui.use(['table', 'form', 'carousel'], function () {
|
||||||
var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
|
var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
|
||||||
var carousel = layui.carousel;
|
var carousel = layui.carousel;
|
||||||
@@ -572,7 +573,7 @@
|
|||||||
var number = $("#number").val();
|
var number = $("#number").val();
|
||||||
let number_kindValue = $("input[name='kindValue']:checked").val();
|
let number_kindValue = $("input[name='kindValue']:checked").val();
|
||||||
let number_kind2Value = $("select[name='kind2Value'] option:selected").val();
|
let number_kind2Value = $("select[name='kind2Value'] option:selected").val();
|
||||||
if ( number > 1 && ((number_kindValue == 0 && number_kind2Value == 0) || (number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
|
if (window.parent.system_isPdd && number > 1 && ((number_kindValue == 0 && number_kind2Value == 0) || (number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
|
||||||
$("#ui_des").show();
|
$("#ui_des").show();
|
||||||
} else {
|
} else {
|
||||||
$("#ui_des").hide();
|
$("#ui_des").hide();
|
||||||
@@ -1662,7 +1663,7 @@
|
|||||||
|
|
||||||
|
|
||||||
if (number > 1) {
|
if (number > 1) {
|
||||||
if ($("#ui_des").css("display") != "none") {
|
if (window.parent.system_isPdd && $("#ui_des").css("display") != "none") {
|
||||||
let numberType = $("#desType option:selected").text();
|
let numberType = $("#desType option:selected").text();
|
||||||
span_result += "款数:" + number + "-" + numberType + "\n";
|
span_result += "款数:" + number + "-" + numberType + "\n";
|
||||||
}
|
}
|
||||||
|
|||||||
Referência em uma Nova Issue
Bloquear um usuário