Browse Source

修改冷转印价格

zhuyiyi 6 months ago
parent
commit
79f2153f17

+ 2 - 2
src/main/java/lingtao/net/service/ProductService.java

@@ -2409,7 +2409,7 @@ public class ProductService {
                         }
 
                         double baseCount = Math.max(Math.ceil(dto.getCount() * dto.getNumber() / num), 1);
-                        double countNum = Math.max(Math.ceil(dto.getCount() / num), 1);
+                        double countNum = Math.max(Math.ceil(dto.getNumber() / num), 1);
                         int coNumber = dto.getCo_number();
                         if (coNumber <= 0) {
                             coNumber = 1;
@@ -2429,7 +2429,7 @@ public class ProductService {
                                 break;
                             }
                             baseCount = Math.max(Math.ceil(quantitySteps[i] * dto.getNumber() / num), 1);
-                            countNum = Math.max(Math.ceil(dto.getCount() / num), 1);
+                            countNum = Math.max(Math.ceil(dto.getNumber() / num), 1);
                             double currentPrice = new PriceUtils().CalculatePrice(craft_list, baseCount, coNumber, countNum);
 
                             pro = new Product();

+ 12 - 7
src/main/java/lingtao/net/util/PriceUtils.java

@@ -3446,19 +3446,24 @@ public class PriceUtils {
         }
         double price = 0;
         if (craft_list.contains("冷转印")) {
-            if (countNum == 1) {
-                price = 260 * Math.ceil(count / countNum) + (coNumber - 1) * 100;
+            double banfei = 200;
+            if (countNum > 1) {
+                price = 260 * countNum;
+                banfei = 0;
+                count = Math.abs(count - countNum);
 
-            } else {
+            }
+            if (count > 0) {
                 if (count <= 5) {
-                    price = 260;
+                    price += 260;
                 } else if (count < 100) {
-                    price = 14 * count + 200;
+                    price += 14 * count + banfei;
                 } else {
-                    price = 12 * count;
+                    price += 12 * count;
                 }
-                price = price + (coNumber - 1) * 100;
             }
+
+            price = price + (coNumber - 1) * 100;
         }
 
         return price;