修改卡片价格

src/main/java/lingtao/net/service/ProductService.java

@@ -820,6 +820,7 @@ public class ProductService {
                     }
                     int min = getNum(length, width);
                     String[] kind_list = {"3", "4", "5", "7"};
+                    dto.setD("");
                     priceList = getHekaPrice(min, dto, priceList, count);
                     boolean isyaofeng = false;
 
@@ -3202,6 +3203,7 @@ public class ProductService {
             // 海报（款数*个数=个数）
             case "17":
                 // 贡缎布
+                crafts_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
                 if ("7".equals(kind)) {
                     priceList = PriceUtils.satinClothPrice(kind2, length, width, count, number);
                     if (dto.getYaheng() != null && dto.getYaheng() > 0) {
@@ -3279,7 +3281,6 @@ public class ProductService {
                     // 裱板
                     if ("0".equals(kind)) {
                         priceList = new PosterPrice().acountPrice00(kind2, area, count, number);
-                        crafts_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
                         for (Product product : priceList) {
                             if (crafts_list.contains("铁架支架")) {
                                 product.setPrice(Math.ceil(product.getPrice() + 35 * dto.getZheye()));
@@ -3363,11 +3364,19 @@ public class ProductService {
                             Product pro = new Product();
                             pro.setCount(dto.getCount());
                             pro.setPrice(Math.ceil(price * number));
+                            if (crafts_list.contains("刮板")) {
+                                pro.setPrice(Math.ceil(price * number + 2 * dto.getPcount()));
+                            }
                             priceList.add(pro);
 
                         } else {
 
                             priceList = new PosterPrice().acountPrice02(kind2, area, count, number, width * 100, length * 100);
+                            for (Product product : priceList) {
+                                if (crafts_list.contains("刮板")) {
+                                    product.setPrice(Math.ceil(product.getPrice() + 2 * dto.getPcount()));
+                                }
+                            }
                         }
                     } else if ("3".equals(kind)) {// 布
                         if (kind2.equals("11") || kind2.equals("12") || kind2.equals("13")) {
@@ -4818,6 +4827,8 @@ public class ProductService {
     }
 
     private List<Product> getJiadaoPrice(Product dto, Double length, Double width) {
+        List<String> carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
+
         double[][] prices = {
                 {90, 148, 240, 550},
                 {100, 160, 250, 550},
@@ -4825,6 +4836,15 @@ public class ProductService {
                 {120, 180, 266, 595},
                 {130, 203, 290, 648},
         };
+        if (!carftList.contains("白底黑字")) {
+            prices = new double[][]{
+                    {138, 148, 240, 550},
+                    {150, 160, 250, 550},
+                    {165, 175, 258, 550},
+                    {170, 180, 266, 595},
+                    {193, 203, 290, 648},
+            };
+        }
         int[] count_list = new int[]{10, 20, 40, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000};
         double[] lengths = {1.2, 1.5, 1.8, 2, 2.4};
         if ("2".equals(dto.getKind())) {
@@ -4835,6 +4855,15 @@ public class ProductService {
                     {137, 240, 316, 630},
                     {146, 254, 340, 681},
             };
+            if (!carftList.contains("黑底白字")) {
+                prices = new double[][]{
+                        {226, 236, 290, 587},
+                        {230, 240, 298, 587},
+                        {230, 240, 308, 587},
+                        {230, 240, 316, 630},
+                        {244, 254, 340, 681},
+                };
+            }
         }
         if ("3".equals(dto.getKind())) {
             prices = new double[][]{
@@ -4851,7 +4880,6 @@ public class ProductService {
         int last_count = 0;
         int current_int = Arrays.binarySearch(lengths, length);
         double[] prices_list = prices[current_int];
-        List<String> carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
         double craft_price = 0;
         if (carftList.contains("切割机")) {
             craft_price = Math.ceil(dto.getStickNum() * 15);
@@ -4983,7 +5011,9 @@ public class ProductService {
             if (craft_list.contains("满底烫镭射银") && "双面".equals(dto.getCraftShua())) {
                 product.setPrice(Math.ceil(product.getPrice() * 1.4));
             }
-
+            if (craft_list.contains("打孔")) {
+                carft_price += Math.max(0.03 * item_count, 30);
+            }
             if (craft_list.contains("配葫芦针")) {
                 carft_price += Math.max(0.016 * item_count, 10);
             }
@@ -5003,8 +5033,8 @@ public class ProductService {
             if (craft_list.contains("穿尼龙绳")) {
                 carft_price += Math.max(0.2 * item_count, 40);
             }
-            if (craft_list.contains("棉绳")) {
+            if (craft_list.contains("配棉绳")) {
-                carft_price += Math.max(0.015 * item_count, 40);
+                carft_price += Math.max(0.015 * item_count, 25);
             }
             product.setPrice(Math.ceil(product.getPrice() + carft_price) * dto.getNumber());
         }

src/main/webapp/views/main.jsp

@@ -431,7 +431,8 @@
             <!--向上轮播-->
             <div class="swiper" style="height: 100%;width: 800px;">
                 <div class="swiper-wrapper">
-                    <div class="swiper-slide" data-swiper-autoplay="5000">【修改】即日起  uv烫镭射银/镭射金3-4天发货 广州发货</div>
+<%--                    <div class="swiper-slide" data-swiper-autoplay="5000">【修改】即日起  uv烫镭射银/镭射金2点之前的订单当天出货 广州发货</div>--%>
+                    <div class="swiper-slide" data-swiper-autoplay="5000"></div>
                 </div>
             </div>
         </div>

src/main/webapp/views/product/coupon.jsp

@@ -456,10 +456,10 @@
                         <p>
                             工艺&nbsp;<span style="font-size:12px;color:red">优惠券异形模切+打码限于简单刀版（无法做圆形  椭圆机）最小9*5.4 300克腰封压1痕最小尺寸10.8*5.4cm,压2痕最小尺寸13.5*5.4CM,低于最小尺寸按异形模切报价</span>
                         </p>
-                        <div class="layui-input-block doublefumo" style="display:inline-block;">
+<%--                        <div class="layui-input-block doublefumo" style="display:inline-block;">--%>
-                            <input type="checkbox" class="ui_double_fm" name="craft" lay-filter="ui_fm" value="双面覆哑膜"
+<%--                            <input type="checkbox" class="ui_double_fm" name="craft" lay-filter="ui_fm" value="双面覆哑膜"--%>
-                                   title="双面覆哑膜">
+<%--                                   title="双面覆哑膜">--%>
-                        </div>
+<%--                        </div>--%>
 
                         <div class="layui-input-block craft tj" style="display:inline-block;">
                             <input type="checkbox" name="craft" class="tangjin" lay-filter="switch" value="单面烫金"
@@ -534,8 +534,8 @@
                             <input type="checkbox" name="craft" class="mq" lay-filter="switchMQ" value="直角裁切"
                                    title="直角裁切" checked>
                             <span class="ui_fm_l">
-                                <input type="checkbox" name="craft" class="ui_fm" lay-filter="ui_yf_fm" value="双面覆膜"
+                                <input type="checkbox" name="craft" class="ui_fm" lay-filter="ui_yf_fm" value="双面覆哑膜"
-                                       title="双面覆膜"/>
+                                       title="双面覆哑膜"/>
                             </span>
                             <span class="yhydx">
 
@@ -1298,6 +1298,7 @@
                     $("#z4_craft").find(":input").attr("disabled", false);
                     $("#peijian_ui").find(":input").attr("disabled", false);
                     $("#z4_craft .ui_double_fm").prop("checked", true);
+                    $('.ui_fm_l').find(":input").prop('checked', true);
                     $("#z4_craft .scolor").hide();
                     $("#peijian_ui .scolor").hide();
                     $("#z4_craft .dadianxianhide").hide();
@@ -1820,11 +1821,13 @@
                 //卡片默认覆膜
                 if (couponKind != "少数量" && data.value != 1 && data.value != 8 && data.value != 9 && data.value != 10 && data.value != 11) {
                     $('.ui_double_fm').prop('checked', true);
+                    $('.ui_fm_l').find(":input").prop('checked', true);
                     form.on('checkbox(ui_fm)', function (switchData) {
                         if (!switchData.elem.checked) {
                             layer.msg('卡片不能取消 [覆膜] 工艺！', {offset: ['300px', '300px']}, function () {
                             });
                             $('.ui_double_fm').prop('checked', true);
+                            $('.ui_fm_l').find(":input").prop('checked', true);
                             form.render('checkbox');
                         }
                         getProductImage(switchData.elem.checked ? switchData.value : '')

src/main/webapp/views/product/leiTag.jsp

@@ -76,6 +76,7 @@
                 </div>
                 <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="满底烫镭射银">
                     <div class="layui-inline shuangmian " style="width: 110px;display: none">
                         <select class="select" name="craftShua">
@@ -168,7 +169,7 @@
                 for (let i = 0; i < result.length; i++) {
                     // 只留一个remark
                     remark = "";
-                    html += '<div><img style="width:' + result[0].imgWidth + 'px" src="' + result[i].imgUrl + '"></div>';
+                    html += '<div><img style="width:100%;height: 100%;object-fit: contain" src="' + result[i].imgUrl + '"></div>';
                     remark += '<div><span>' + result[i].remark + '<span/></div>';
                 }
                 $("#carousel").append(html);

src/main/webapp/views/product/poster.jsp

@@ -510,6 +510,17 @@
                     <input type="checkbox" name="craft" lay-filter="switch" value="裁切" title="裁切" checked>
                 </div>
             </div>
+            <div class="guaban">
+                <p>
+                    工艺
+                </p>
+                <div class="layui-form-item">
+                    <input type="checkbox" name="craft" lay-filter="switch" value="刮板" title="刮板">
+                    <div class="layui-inline pcount-lay" style="width: 50px;display: none">
+                        <input type="text" value="1" name="pcount" class="layui-input">
+                    </div>
+                </div>
+            </div>
             <hr>
             <div class="layui-form-item">
                 <button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button>
@@ -606,6 +617,13 @@
                     $(".yaheng-lay").hide();
                 }
             }
+            if (data.value == "刮板") {
+                if (data.elem.checked) {
+                    $(".pcount-lay").show();
+                } else {
+                    $(".pcount-lay").hide();
+                }
+            }
 
         })
         // 根据类目获取产品名称
@@ -640,6 +658,8 @@
             $(".ui_zb").find(":input").attr("disabled", true);
             $(".dengxiang").hide();
             $(".dengxiang").find(":input").attr("disabled", true);
+            $(".guaban").hide();
+            $(".guaban").find(":input").attr("disabled", true);
             // 制度牌
             if (kind == 0) {
                 // !背胶单裱3mmPVC(户内高清）
@@ -669,6 +689,8 @@
                     $(".dengPian").show();
                     $(".dengPian").find(":input").attr("disabled", false);
                 }
+                $(".guaban").show();
+                $(".guaban").find(":input").attr("disabled", false);
             }
             // 布
             if (kind == 3) {
@@ -720,7 +742,7 @@
                         for (let i = 0; i < result.length; i++) {
                             // 只留一个remark
                             remark = "";
-                            html += '<div><img style="width:' + result[0].imgWidth + 'px" src="' + result[i].imgUrl + '" class="imgUrl"></div>';
+                            html += '<div><img style="width:' + result[0].imgWidth + 'px;object-fit: contain" src="' + result[i].imgUrl + '" class="imgUrl"></div>';
                             remark += '<div><span>' + result[i].remark + '<span/></div>';
                         }
                         $("#carousel").append(html);
@@ -1083,6 +1105,12 @@
             $(".normol-size").hide();
             $(".dengxiang").hide();
             $(".dengxiang").find(":input").attr("disabled", true);
+            $(".guaban").hide();
+            $(".guaban").find(":input").attr("disabled", true);
+            if (kindValue == 2) {
+                $(".guaban").show();
+                $(".guaban").find(":input").attr("disabled", false);
+            }
             if (kindValue == 2 && data.value == 24) {
                 // 下拉框第一列添加空的option
                 $(".dengx-type").show()
@@ -1092,6 +1120,7 @@
                 $(".normol-size").show();
                 $(".dengxiang").show();
                 $(".dengxiang").find(":input").attr("disabled", false);
+                $(".guaban p").hide();
             }
             $(".zdt_xiezhen").hide();
             if (kindValue == 1 && data.value == 8) {
@@ -1601,17 +1630,28 @@
                                 var span_result = kindData[kind] + '-' + kind2 + ' - ' + size + 'cm(同款内容)\n';
                             }
                         } else if (value == 2) { //户外写真
+                            arr = [];
+                            $("input:checkbox[name='craft']:checked").each(function (i) {
+                                // 没有被禁用的工艺加到arr中
+                                if (!$(this).is(':disabled')) {
+                                    if ($(this).val() == "刮板") {
+                                        arr.push($("input[name='pcount']").val() + "个" + $(this).val());
+                                    } else {
+                                        arr.push($(this).val());
+                                    }
+                                }
+                            });
                             if (kind2 == "户外写真灯片") {
                                 var craftBu = [$('input[name="craftJingcai"]:checked').val()];
+                                arr.push(craftBu);
                                 craftList = craftBu;
-                                var span_result = kindData[kind] + ' - ' + kind2 + ' - ' + craftBu + ' - ' + size + 'cm(同款内容)\n';
+                                var span_result = kindData[kind] + ' - ' + kind2 + ' - ' + size + 'cm(同款内容)\n';
                             } else if (kind2 == "摆摊软膜灯箱") {
-                                var craftBu = [$('.dengxiang input[name="craft"]:checked').val()];
+                                var span_result = kindData[kind] + ' - ' + kind2 + ' - ' + size + 'cm(同款内容)\n';
-                                craftList = craftBu;
-                                var span_result = kindData[kind] + ' - ' + kind2 + ' - ' + craftBu + ' - ' + size + 'cm(同款内容)\n';
                             } else {
                                 var span_result = kindData[kind] + '-' + kind2 + ' - ' + size + 'cm(同款内容)\n';
                             }
+                            span_result += "工艺 :" + arr + "\n";
                         } else if (value == 3) { //布
                             if (kind2 == "喷绘布") {
                                 var craftBu = [$('input[name="craftPenHuiBu"]:checked').val()];

src/main/webapp/views/product/tape.jsp

@@ -62,7 +62,7 @@
                 颜色
             </p>
             <div class="layui-form-item">
-                <select id="color" lay-filter="color" class="select" lay-search>
+                <select id="color" lay-filter="color" name="craft" class="select" lay-search>
                     <option value="白底黑字">白底黑字</option>
                     <option value="白底深咖字">白底深咖字</option>
                     <option value="白底灰字">白底灰字</option>
@@ -161,7 +161,7 @@
                 for (let i = 0; i < result.length; i++) {
                     // 只留一个remark
                     remark = "";
-                    html += '<div><img style="width:' + result[0].imgWidth + 'px" src="' + result[i].imgUrl + '"></div>';
+                    html += '<div><img style="width:100%;height: 100%;object-fit: contain" src="' + result[i].imgUrl + '"></div>';
                     remark += '<div><span>' + result[i].remark + '<span/></div>';
                 }
                 $("#carousel").append(html);
@@ -206,8 +206,8 @@
             }
             if (kind == '2') {
                 html = `
-                    <option value="黑底自字">黑底自字</option>
+                    <option value="黑底白字">黑底白字</option>
-                    <option value="深咖底自字">深咖底自字</option>
+                    <option value="深咖底白字">深咖底白字</option>
                     <option value="灰底白字">灰底白字</option>
                     <option value="天蓝底白字">天蓝底白字</option>
                     <option value="橙底白字">橙底白字</option>