此提交包含在:
2025-04-03 16:44:24 +08:00
父節點 8a85fa1d2a
當前提交 6a3a71e03a
共有 3 個檔案被更改,包括 7 行新增3 行删除
+1 -1
查看文件
@@ -3012,7 +3012,7 @@ public class ProductService {
} }
if (number > 1 && width * length * 10000 < 40 * 50) { 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)) { if (("0".equals(kind) && "0".equals(kind2)) || ("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) {
double desFee = 0; double desFee = 0;
if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) { if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
desFee = 3; desFee = 3;
+4
查看文件
@@ -119,7 +119,11 @@ public class PosterPrice {
pro.setWeight(weight); pro.setWeight(weight);
pro.setCount(count); pro.setCount(count);
// 价格 = 面积 * 单价 + (款数-1) * 40 // 价格 = 面积 * 单价 + (款数-1) * 40
if (number > 1 && area >= 40 * 50 / 10000.0) {
pro.setPrice(Math.ceil(price * number)); pro.setPrice(Math.ceil(price * number));
} else {
pro.setPrice(Math.ceil(price));
}
list.add(pro); list.add(pro);
return list; return list;
} }
+1 -1
查看文件
@@ -554,7 +554,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 == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) { if (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();