修改海报价格，修改滴塑价格

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

@@ -1233,6 +1233,11 @@ public class ProductService {
                             if (craft.contains("绳子")) {
                                 product.setPrice(Math.ceil(product.getPrice() + Math.max(Math.ceil(product.getCount() * 0.015), 10)));
                             }
+                            if ("击凸".equals(dto.getAotu()) || "压凹".equals(dto.getAotu())) {
+                                if (min > 1) {
+                                    product.setPrice(Math.ceil(product.getPrice() * 1.5));
+                                }
+                            }
                         }
                         // 根据款数重新算价格/计算重量
                         for (Product product : priceList) {
@@ -3611,7 +3616,7 @@ public class ProductService {
                     }
                     if (number > 1 && width != null && length != null && width * length * 10000 < 40 * 50) {
 
-                        if (("0".equals(kind) && "0".equals(kind2)) || ("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) {
+                        if (("0".equals(kind) && "0".equals(kind2)) || "2".equals(kind)) {
                             double desFee = 0;
                             if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
                                 if (dto.getP() == 1) {
@@ -5122,11 +5127,17 @@ public class ProductService {
             }
             double craftPrice = 0;
             double miniCraftPrice = 10;
-            if (craft_list.contains("可变二维码") || craft_list.contains("序列号")) {
+            if (craft_list.contains("可变二维码")) {
                 craftPrice = 0.02 * itemCount;
+                miniCraftPrice = 60;
+            }
+            if (craft_list.contains("序列号")) {
+                craftPrice = 0.02 * itemCount;
+                miniCraftPrice = 15;
             }
             if (craft_list.contains("可变二维码+序列号")) {
                 craftPrice = 0.03 * itemCount;
+                miniCraftPrice = 75;
             }
             Product pro = new Product();
             pro.setCount(itemCount);
@@ -7330,7 +7341,7 @@ public class ProductService {
                 } else {
                     danjia = 0.1;
                 }
-                if(dto.getPcount() == 3){
+                if (dto.getPcount() == 3) {
                     danjia = 0.5;
                 }
                 if ("上下编码".equals(dto.getBianma())) {

src/main/java/lingtao/net/util/PriceUtils.java

@@ -2174,9 +2174,7 @@ public class PriceUtils {
         if (dto.getN_mq_num() > 0) {
             price += 10 * dto.getN_mq_num();
         }
-        if (number > 1) {
-            price *= 1.3;
-        }
+        price = Math.ceil(price + (number - 1) * 8);
         pro.setCount(count / number);
         pro.setPrice(price);
         list.add(pro);