Przeglądaj źródła

修改种子纸工艺

zhuyiyi 3 miesięcy temu
rodzic
commit
f5c2d30424

+ 5 - 0
src/main/java/lingtao/net/service/ProductService.java

@@ -2565,9 +2565,14 @@ public class ProductService {
                     if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("压痕")) {
                         price += Math.max(count * 0.2, 10);
                     }
+
                     price = price * number;//款数翻倍
                     price = Math.max(price, 60);
 
+                    if (!StringUtils.isEmpty(crafts) && Arrays.asList(crafts).contains("装opp袋")) {
+                        price += Math.ceil(Math.max(count * 0.15 * number, 5));
+                    }
+
                     if (!StringUtils.isEmpty(dto.getSwitchz3Size())) {
                         price += 100;
                     }

+ 10 - 6
src/main/webapp/views/product/coupon.jsp

@@ -599,6 +599,9 @@
                         <span class="z3_craft_mq">
                             <input type="checkbox" name="craft" lay-filter="z3Crafts" value="模切" title="模切"/>
                         </span>
+                        <span class="z3_craft_opp">
+                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="装opp袋" title="装opp袋"/>
+                        </span>
                         <input type="checkbox" class="shengz" name="craft" lay-filter="z3Crafts" value="绳子"
                                title="绳子">
                         <div class="shengz scolor" style="width: 150px;display: none">
@@ -988,6 +991,7 @@
                 $(".z3_craft_yh").show();
                 $(".z3_craft_bm").show();
                 $(".z3_craft_mq").hide();
+                $(".z3_craft_opp").show();
                 $("#3z_menpiao_size").hide();
                 $("#3z_kapian_size").hide();
                 $("#3z_yuan_size").hide();
@@ -1334,7 +1338,9 @@
             });
 
             $(".guaguaSize").hide();
+            $(".guaguaSize").find("select").attr("disabled", true);
             $(".guaguaSize1").hide();
+            $(".guaguaSize1").find("select").attr("disabled", true);
             var kind;
             var kindValue;
             form.on('radio(kind)', function (data) {
@@ -2016,13 +2022,12 @@
                     } else {
 
                     }
-                    $(".guaguaSize1").hide();
-                    $(".guaguaSize").hide();
                     if (kind == 13 || kind == "刮刮卡") {
                         $(".guaguaSize").show();
-                        $(".guaguaSize1 select[name='size1']").attr("disabled", true);
+                        $(".guaguaSize select[name='size1']").attr("disabled", false);
                     } else {
                         $(".guaguaSize").hide();
+                        $(".guaguaSize select[name='size1']").attr("disabled", true);
                     }
                     form.render('checkbox');
                 } else {
@@ -2054,13 +2059,12 @@
 
                     $(".lessCountHideCraft").find(".specialCraft").prop('checked', false);
                     $("#size").show();
-                    $(".guaguaSize1").hide();
-                    $(".guaguaSize").hide();
                     if (kind == 13 || kind == "刮刮卡") {
                         $(".guaguaSize1").show();
-                        $(".guaguaSize select[name='size1']").attr("disabled", true);
+                        $(".guaguaSize1 select[name='size1']").attr("disabled", false);
                     } else {
                         $(".guaguaSize1").hide();
+                        $(".guaguaSize1 select[name='size1']").attr("disabled", true);
                     }
                 }
                 $(".kindValue2 input[value='10']").prop("disabled", true).prop("checked", false);