From e178b27aa28ea75bac5358d082a8ee1ea7343dfa Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 23 Jun 2025 16:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8A=E7=89=8C=E7=BF=BB?=
 =?UTF-8?q?=E5=80=8D=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lingtao/net/realm/ShiroRealm.java       | 10 ++++++----
 src/main/java/lingtao/net/service/ProductService.java |  6 ++++--
 src/main/java/lingtao/net/util/PriceUtils.java        |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/lingtao/net/realm/ShiroRealm.java b/src/main/java/lingtao/net/realm/ShiroRealm.java
index 02d5cab..da6a92a 100644
--- a/src/main/java/lingtao/net/realm/ShiroRealm.java
+++ b/src/main/java/lingtao/net/realm/ShiroRealm.java
@@ -64,7 +64,7 @@ public class ShiroRealm extends AuthorizingRealm {
     private boolean isPassIp(String loginIp) {
         // 获取所有的授权IP
         List<String> ipList = loginIpMapper.getAllIp();
-        if(loginIp == "127.0.0.1"){
+        if (loginIp == "127.0.0.1") {
             return true;
         }
         for (String agreeIp : ipList) {
@@ -112,7 +112,9 @@ public class ShiroRealm extends AuthorizingRealm {
                 loginLog.setStatus("异常");
                 agreeLogin = false;
             }
-
+            if ("2".equals(user.getNeedIp())) {
+                agreeLogin = true;
+            }
             loginLog.setLoginTime(new Date());
             loginLog.setRemark(loginRemark);
             loginLogMapper.addLog(loginLog);
@@ -122,7 +124,7 @@ public class ShiroRealm extends AuthorizingRealm {
             }
 
             /** 处理生日 */
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             Date birthDate = null;
             String birthDay = "";
             // 生日日期/类型不为空
@@ -151,7 +153,7 @@ public class ShiroRealm extends AuthorizingRealm {
                 } catch (ParseException e) {
                     // e.printStackTrace();
                 }
-            }
+            }*/
 
             /** 处理session（将用户信息存入session） */
             // 将用户信息存入session
diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 79e3615..fe1c6e5 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -1090,8 +1090,10 @@ public class ProductService {
 
                         for (Product product : priceList) {
                             // 服装吊牌里面的600克吊牌把价格*1.3倍
-                            if (!("6".equals(kind) && "无".equals(kind2) && area <= 0.00486)) {
-                                product.setPrice(Math.floor(product.getPrice() * 1.3));
+                            if (!("6".equals(kind) && "无".equals(kind2))) {
+                                if (area <= 0.00486) {
+                                    product.setPrice(Math.floor(product.getPrice() * 1.3));
+                                }
                             }
                             if ("4".equals(kind)) {
                                 // 服装吊牌里面的900克吊牌把价格
diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java
index 8844c12..8ecda2f 100644
--- a/src/main/java/lingtao/net/util/PriceUtils.java
+++ b/src/main/java/lingtao/net/util/PriceUtils.java
@@ -416,7 +416,7 @@ public class PriceUtils {
             }
             Product product = new Product();
             product.setCount(count_item);
-            product.setPrice(Math.ceil(price * number));
+            product.setPrice(Math.ceil(price));
             priceList.add(product);
         }
         return priceList;
@@ -3428,8 +3428,10 @@ public class PriceUtils {
                 endIndex = Math.min(i + 1, areas.length - 1);
             }
         }
-        if (startIndex == endIndex) {
+        if (startIndex == 0) {
             price = price_list[endIndex];
+        } else if (startIndex == endIndex) {
+            price = (price_list[endIndex] / areas[endIndex]) * area;
         } else {
             price = ((areas[endIndex] - area) / (areas[endIndex] - areas[startIndex])) * price_list[startIndex] + ((area - areas[startIndex]) / (areas[endIndex] - areas[startIndex])) * price_list[endIndex];
         }