diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 0389ce1..c3363ad 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -1641,7 +1641,7 @@ public class ProductService { craft_price += 4 * itemCount / 100; } if (craft_list.contains("印刷颜色") && dto.getCo_number() != null && dto.getCo_number() > 0) { - craft_price += sePrice * (dto.getCo_number()); + craft_price += sePrice * (dto.getCo_number() > 1 ? 6 : dto.getCo_number()); } if ((craft_list.contains("单面烫金") || craft_list.contains("双面烫金") || craft_list.contains("烫镭射银"))) { double tangPrice = 45 + 0.1 * itemCount; @@ -3188,6 +3188,7 @@ public class ProductService { } } + return chucklePrice(role, priceList); // 便签本/联单 case "16": @@ -6706,7 +6707,7 @@ public class ProductService { craft_price += Math.ceil(0.15 * dto.getCount() * dto.getNumber()); } int number = dto.getNumber(); - double designFee = 5.5 * (number - 1); + double designFee = 5 * (number - 1); double cardDesignFee = 0.0; int card_num = getNum((length - 4) / 10, (width - 4) / 10); if (card_num <= 1) { @@ -6719,7 +6720,7 @@ public class ProductService { cardDesignFee = 20.5; } Product pro = new Product(); - pro.setPrice(Math.ceil(Math.max((base_price * num + cardDesignFee) * number, min_price) + designFee + bao_price + (craft_price == 0 ? craft_price : Math.max(craft_price, 5)))); + pro.setPrice(Math.ceil(Math.max((base_price * num) * number, min_price) + designFee + bao_price + (craft_price == 0 ? craft_price : Math.max(craft_price, 5)))); pro.setCount(dto.getCount()); pro.setNumber(dto.getNumber()); pro.setWeight(df.format(dto.getNumber() * (length - 4) / 1000 * (width - 4) / 1000 * dto.getCount() * 0.2 * 0.86)); diff --git a/src/main/webapp/views/product/specialCard2.jsp b/src/main/webapp/views/product/specialCard2.jsp index 1329378..77fa6af 100644 --- a/src/main/webapp/views/product/specialCard2.jsp +++ b/src/main/webapp/views/product/specialCard2.jsp @@ -200,7 +200,10 @@
@@ -724,7 +727,7 @@ }); return false; } - if(craft_list.includes("配流苏") && craft_list.includes("穿流苏")){ + if (craft_list.includes("配流苏") && craft_list.includes("穿流苏")) { $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox"); $(data.elem).prop("checked", false); layer.msg("配流苏 - 穿流苏不能同时选择", {offset: ['300px', '300px']}, function () { @@ -902,7 +905,7 @@ } else if ($(this).val() == "压凹" || $(this).val() == "击凸") { arrs.push($("#color_type select option:selected").val() + $(this).val()); } else if ($(this).val() == "印刷颜色") { - arrs.push($(this).val() + $(".printColor input[name='co_number']").val()); + arrs.push( $(".printColor select[name='co_number'] option:selected").text()); } else { arrs.push($(this).val()); } @@ -977,9 +980,9 @@ } } span_result += '包邮,免费设计呢~(偏远地区需补邮费)' - if(window.parent.system_isGai){ - span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" - } + if (window.parent.system_isGai) { + span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" + } addLog(span_result); $("#span_result").val(span_result);