From 396656bd66e6aced6a1029e2963918c3d3704d2b Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 22 Jun 2026 14:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9618=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/lingtao/net/service/ProductService.java     | 10 +++++-----
 src/main/webapp/views/main.jsp                       | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 4792e51..23fe2f6 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -8579,11 +8579,11 @@ public class ProductService {
             }
         }
         //淘系的价格全部按照目前的价格乘以1.15
-        if (!isIn) {
-            for (Product product : list) {
-                product.setPrice(Math.ceil(product.getPrice() * 1.15));
-            }
-        }
+//        if (!isIn) {
+//            for (Product product : list) {
+//                product.setPrice(Math.ceil(product.getPrice() * 1.15));
+//            }
+//        }
         return list;
     }
 
diff --git a/src/main/webapp/views/main.jsp b/src/main/webapp/views/main.jsp
index ab2d4b2..8834477 100644
--- a/src/main/webapp/views/main.jsp
+++ b/src/main/webapp/views/main.jsp
@@ -593,17 +593,17 @@
     let shop_list_gai = [1045, 1061, 1029, 1054, 1053, 1055];
     let role_list = [${sessionScope.USER_SESSION.role}];
     var system_isPdd = false;
-    var system_isGai = true;
+    var system_isGai = false;
     shop_list.forEach(shop_id => {
         if (role_list.includes(shop_id)) {
             system_isPdd = true;
         }
     })
-    shop_list_gai.forEach(shop_id => {
-        if (role_list.includes(shop_id)) {
-            system_isGai = false;
-        }
-    })
+    // shop_list_gai.forEach(shop_id => {
+    //     if (role_list.includes(shop_id)) {
+    //         system_isGai = false;
+    //     }
+    // })
     // 不给客服看
     /* if(${ !sessionScope.USER_SESSION.role.contains('999') }){ */
     // 春节倒计时