From 2f811a2bfc79f1240fb4c77b93a8b7f9742aac89 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Thu, 23 Jul 2026 09:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=AF=E5=9E=AB=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lingtao/net/service/ProductService.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index edccebd..9977115 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -5551,7 +5551,7 @@ public class ProductService {
                 craft.add(item);
             }
             requstVo.setCrafts(craft);
-            if ("18".equals(dto.getKindValue()) || "19".equals(dto.getKindValue()) || "20".equals(dto.getKindValue())) {
+            if ("18".equals(dto.getKindValue())) {
                 requstVo.setNum(base_count);
 //                rate_list = new double[]{0.70, 0.68, 0.65, 0.62, 0.58};
 //                counts = new int[]{50, 100, 200, 500, 1000};
@@ -5578,6 +5578,8 @@ public class ProductService {
                 }
                 if ("18".equals(dto.getKindValue()) && count < 10) {
                     price = 150;
+                } else if ("19".equals(dto.getKindValue()) || "20".equals(dto.getKindValue())) {
+                    price = Math.ceil(result.getData().getPrice() / (1 - 0.6));
                 } else {
                     price = Math.ceil(result.getData().getPrice() / (1 - 0.7) / base_count * count * rate_item);
                 }
@@ -5626,7 +5628,10 @@ public class ProductService {
         // 根据款数重新算价格
         for (Product product : priceList) {
             if (!sdList.contains(dto.getKindValue())) {
-                product.setPrice(Math.floor(product.getPrice() * number));
+                product.setPrice(Math.ceil(product.getPrice() * number));
+            }
+            if (craft_list.contains("装OPP袋")) {
+                product.setPrice(Math.ceil(product.getPrice() + Math.max(0.2 * product.getCount() * number, 5)));
             }
             if ("3".equals(kind)) {
                 wei = 0.3;