修改哑金不干胶白墨，修改包装纸款数啥价格

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

@@ -549,11 +549,7 @@ public class ProductService {
                                 basePrice = basePrice + 0.02;
                             }
 
-                            if ("0".equals(dto.getKindValue())) {
+                            product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5) * number);
-                                product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5));
-                            } else {
-                                product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5) * number);
-                            }
                             if ("配牙签".equals(dto.getCraftShua()) && "6.5".equals(dto.getToothpick_size()) && ((width == 9 && length == 2.5) || length == 9 && width == 2.5)) {
                                 if (product.getCount() == 500) {
                                     double other_price = 60;
@@ -588,7 +584,7 @@ public class ProductService {
                         }
                     }
                 }
-                if ("插旗".equals(dto.getStickerKind())) {
+                if ("插旗".equals(dto.getStickerKind()) && "常规".equals(dto.getKind2Value())) {
                     if (number > 1 && "0".equals(dto.getKindValue())) {
                         for (Product product : priceList) {
                             product.setPrice(product.getPrice() * number);
@@ -4987,7 +4983,7 @@ public class ProductService {
             priceList.add(pro);
         }
         for (Product product : priceList) {
-            product.setPrice(Math.ceil(product.getPrice() * number));
+            product.setPrice(Math.ceil(product.getPrice() + (number - 1) * 15));
         }
         return priceList;
     }

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

@@ -1194,7 +1194,7 @@
                 $('.at').prop('disabled', 'disabled');
             }
             // 透明不干胶带白墨工艺
-            if (data.value == 2 || data.value == "银平光") {
+            if (data.value == 2 || data.value == "银平光" || data.value == 6) {
                 // 复选框的disabled
                 $(".yb").show();
                 $(".yb").find(":input").attr("disabled", false);