新增成本查询

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

@@ -618,32 +618,26 @@ public class PriceService {
         if ("加厚铜版纸不干胶".equals(product.getKind())) {
             basePrice = 2;
         }
-        if ("黑胶铜版(遮盖/遮光)".equals(product.getKind())) {
-            basePrice = 4;
-        }
         if ("牛皮纸".equals(product.getKind())) {
             basePrice = 1.8;
         }
         if ("书写纸".equals(product.getKind())) {
             basePrice = 1.8;
         }
-        if ("易碎纸".equals(product.getKind())) {
+
+        List<String> base_4 = Arrays.asList("黑胶铜版(遮盖/遮光)", "易碎纸", "洒金宣纸(白色)", "亮银", "亮金");
+        if (base_4.contains(product.getKind())) {
             basePrice = 4;
         }
-        if ("洒金宣纸(白色)".equals(product.getKind())) {
+        List<String> base_3 = Arrays.asList("超白浮雕纹", "净白彩岩纹", "pp合成纸不干胶", "素面银镭射", "拉丝银", "拉丝金", "哑金");
-            basePrice = 4;
+        if (base_3.contains(product.getKind())) {
-        }
-        if ("超白浮雕纹".equals(product.getKind())) {
-            basePrice = 3.5;
-        }
-        if ("净白彩岩纹".equals(product.getKind())) {
             basePrice = 3.5;
         }
+
         List<String> base_2 = Arrays.asList("艾丽铜板不干胶", "特光不干胶", "铜板可移不干胶", "大红洒金", "白布纹纸");
         if (base_2.contains(product.getKind())) {
             basePrice = 2.5;
         }
-        basePrice = Math.max(2, basePrice);
         // 计算一张纸能容纳的最大金属标数量
         double maxItemsPerSheet = calculateMaxItemsPerSheet(length, width, paperLength, paperWidth);
 
@@ -678,7 +672,7 @@ public class PriceService {
             return new PricingListVo(100, "超出纸张尺寸限制"); // 返回空列表表示不适用
         }
         List<String> list = Arrays.asList("300克双铜纸", "300克单铜白卡", "300克冰白卡纸", "300克荷兰白卡", "300克水晶磨砂", "300克铂金磨砂", "300克米黄荷兰白", "300克雅典米白灵感纸", "300克米黄丝绵纸", "325克素面镭射卡白底", "330克超白草香纸", "350克雅柔纸", "350克冰白卡纸", "350克荷兰白卡", "350克布纹", "350克蛋壳纹", "350克安格纹", "350克刚古纹", "350克米黄刚古纹", "350克米黄冰白", "350克超白超感纸", "雅柔毯纹超白");
-        int[] counts = new int[]{0, 5, 10, 20, 25, 50};
+        int[] counts = new int[]{1, 5, 10, 20, 25, 50};
         double[] basePrices = new double[]{1.8, 9, 17, 34, 41.25, 82.5};
         if ("300克单铜白卡".equals(product.getKind())) {
             basePrices = new double[]{2, 10, 19, 38, 45, 90};
@@ -732,7 +726,6 @@ public class PriceService {
 
         double basePrice = PriceUtils.TableCountDoublePrice(requiredSheets, basePrices, counts);
 
-        basePrice = Math.max(2.5, basePrice);
         BigDecimal price = new BigDecimal(basePrice).multiply(new BigDecimal(requiredSheets)).setScale(2, RoundingMode.HALF_UP);
 
         ProductVo pro = new ProductVo();

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

@@ -7517,7 +7517,7 @@ public class ProductService {
         }
         stickersList.add(new PriceUtils().getA(kind, length, width, count, price, addPrice, number, dto.getCraftTang(), dto.getYinbai()));
         if (dto.getN_mq_num() != null && dto.getN_mq_num() >= 1) {
-            double base_price = 6 + 4;
+            double base_price = 5;
 
             for (Product product : stickersList) {
                 product.setPrice(product.getPrice() + ((dto.getN_mq_num()) * base_price));

src/main/webapp/views/priceView/totalAdmin.jsp

@@ -38,12 +38,6 @@
                     <option value="300克单铜白卡">300克单铜白卡</option>
                     <option value="300克冰白卡纸">300克冰白卡纸</option>
                     <option value="300克荷兰白卡">300克荷兰白卡</option>
-                    <option value="300克水晶磨砂">300克水晶磨砂</option>
-                    <option value="300克铂金磨砂">300克铂金磨砂</option>
-                    <option value="300克米黄荷兰白">300克米黄荷兰白</option>
-                    <option value="300克雅典米白灵感纸">300克雅典米白灵感纸</option>
-                    <option value="300克米黄丝绵纸">300克米黄丝绵纸</option>
-                    <option value="325克素面镭射卡白底">325克素面镭射卡白底</option>
                     <option value="330克超白草香纸">330克超白草香纸</option>
                     <option value="350克雅柔纸">350克雅柔纸</option>
                     <option value="350克冰白卡纸">350克冰白卡纸</option>
@@ -153,12 +147,6 @@
                     <option value="300克单铜白卡">300克单铜白卡</option>
                     <option value="300克冰白卡纸">300克冰白卡纸</option>
                     <option value="300克荷兰白卡">300克荷兰白卡</option>
-                    <option value="300克水晶磨砂">300克水晶磨砂</option>
-                    <option value="300克铂金磨砂">300克铂金磨砂</option>
-                    <option value="300克米黄荷兰白">300克米黄荷兰白</option>
-                    <option value="300克雅典米白灵感纸">300克雅典米白灵感纸</option>
-                    <option value="300克米黄丝绵纸">300克米黄丝绵纸</option>
-                    <option value="325克素面镭射卡白底">325克素面镭射卡白底</option>
                     <option value="330克超白草香纸">330克超白草香纸</option>
                     <option value="350克雅柔纸">350克雅柔纸</option>
                     <option value="350克冰白卡纸">350克冰白卡纸</option>
@@ -189,10 +177,17 @@
                 $("#sticker_craft select").attr("disabled", false);
 
                 html = `<option value='加厚铜版纸不干胶'>加厚铜版纸不干胶</option>
-                        <option value='艾丽铜板不干胶'>艾丽铜板不干胶</option>
-                        <option value='特光不干胶'>特光不干胶</option>
                         <option value='铜板可移不干胶'>铜板可移不干胶</option>
-                        <option value='黑胶铜版(遮盖/遮光)'>黑胶铜版(遮盖/遮光)</option>
+                        <option value='透明不干胶'>透明不干胶</option>
+                        <option value='亚银不干胶'>亚银不干胶</option>
+                        <option value='PVC不干胶'>PVC不干胶</option>
+                        <option value='pp合成纸不干胶'>pp合成纸不干胶</option>
+                        <option value='素面银镭射'>素面银镭射</option>
+                        <option value='拉丝银'>拉丝银</option>
+                        <option value='拉丝金'>拉丝金</option>
+                        <option value='亮银'>亮银</option>
+                        <option value='亮金'>亮金</option>
+                        <option value='哑金'>哑金</option>
                         <option value='牛皮纸'>牛皮纸</option>
                         <option value='书写纸'>书写纸</option>
                         <option value='易碎纸'>易碎纸</option>
@@ -206,16 +201,7 @@
                         <option value='大地纸(白草香)'>大地纸(白草香)</option>
                         <option value='米色七彩(树纹)'>米色七彩(树纹)</option>
                         <option value='白布纹纸'>白布纹纸</option>
-                        <option value='超白浮雕纹'>超白浮雕纹</option>
-                        <option value='净白彩岩纹'>净白彩岩纹</option>
-                        <option value='珠光米黄莱妮纹'>珠光米黄莱妮纹</option>
-                        <option value='珠光星翠'>珠光星翠</option>
-                        <option value='珠光金黄'>珠光金黄</option>
                         <option value='珠光冰白'>珠光冰白</option>
-                        <option value='莹光红'>莹光红</option>
-                        <option value='黄色莹光纸'>黄色莹光纸</option>
-                        <option value='橙色莹光纸'>橙色莹光纸</option>
-                        <option value='绿色莹光纸'>绿色莹光纸</option>
                         `
             }
             $("select[name='kind']").empty().append(html);