修改冷转印烫画价格

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

@@ -2413,7 +2413,7 @@ public class ProductService {
                             coNumber = 1;
                         }
 
-                        double price = new PriceUtils().CalculatePrice(craft_list, baseCount, coNumber, countNum);
+                        double price = new PriceUtils().CalculatePrice(craft_list, baseCount, coNumber, countNum, width * length * dto.getCount() * number);
 
                         Product pro = new Product();
                         pro.setCount(dto.getCount());
@@ -2428,7 +2428,7 @@ public class ProductService {
                             }
                             baseCount = Math.max(Math.ceil(quantitySteps[i] * dto.getNumber() / num), 1);
                             countNum = Math.max(Math.ceil(dto.getNumber() / num), 1);
-                            double currentPrice = new PriceUtils().CalculatePrice(craft_list, baseCount, coNumber, countNum);
+                            double currentPrice = new PriceUtils().CalculatePrice(craft_list, baseCount, coNumber, countNum, width * length * quantitySteps[i] * number);
 
                             pro = new Product();
 
@@ -3824,7 +3824,7 @@ public class ProductService {
                         wei = 0.05;
                     }
                     product.setWeight(df.format(length * width * product.getCount() / 10000 * number * wei));
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number * 1.3));
                 }
                 return priceList;
             case "节目单":
@@ -4564,7 +4564,11 @@ public class ProductService {
                 double[] areas = {1, 4, 6, 9, 12, 16, 20, 25, 36, 45, 48.6, 54, 60, 72, 81};
 
                 area = length * width;
-                return getAreaCenterPrice(count_list, count, area, prices, areas, number);
+                priceList = getAreaCenterPrice(count_list, count, area, prices, areas, number);
+                for (Product product : priceList) {
+                    product.setPrice(Math.ceil(product.getPrice() * 1.3));
+                }
+                return priceList;
             case "透卡":
                 prices = new int[][]{
                         {136, 163, 177, 190, 197, 227, 257, 303, 333, 407, 430},