From 26b6a5a5da67e72520d1db83b62c2645f654de52 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 28 Feb 2025 10:50:51 +0800
Subject: [PATCH] =?UTF-8?q?pageHelper=20=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E7=A9=BA=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  1 -
 .../src/main/resources/application.yml        |  1 -
 .../src/main/resources/application.yml        |  1 -
 .../src/main/resources/application.yml        |  1 -
 .../java/com/czg/order/dto/CheckOrderPay.java | 26 +++++++++++++++++++
 cash-common/cash-common-tools/pom.xml         | 12 +--------
 cash-dependencies/pom.xml                     | 16 ++----------
 .../service/impl/ShopCouponServiceImpl.java   |  2 +-
 .../service/impl/OrderInfoServiceImpl.java    |  5 ++--
 cash-service/pom.xml                          | 12 +--------
 10 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/cash-api/account-server/src/main/resources/application.yml b/cash-api/account-server/src/main/resources/application.yml
index 0b033ca2f..da51c33fd 100644
--- a/cash-api/account-server/src/main/resources/application.yml
+++ b/cash-api/account-server/src/main/resources/application.yml
@@ -34,7 +34,6 @@ alipay:
 
 pagehelper:
   helper-dialect: mysql
-  reasonable: true
   support-methods-arguments: true
 
 dubbo:
diff --git a/cash-api/order-server/src/main/resources/application.yml b/cash-api/order-server/src/main/resources/application.yml
index 5c570891f..aad8910e3 100644
--- a/cash-api/order-server/src/main/resources/application.yml
+++ b/cash-api/order-server/src/main/resources/application.yml
@@ -21,7 +21,6 @@ mybatis-flex:
 
 pagehelper:
   helper-dialect: mysql
-  reasonable: true
   support-methods-arguments: true
 
 dubbo:
diff --git a/cash-api/product-server/src/main/resources/application.yml b/cash-api/product-server/src/main/resources/application.yml
index 50a1b0481..3b1312ad7 100644
--- a/cash-api/product-server/src/main/resources/application.yml
+++ b/cash-api/product-server/src/main/resources/application.yml
@@ -21,5 +21,4 @@ mybatis-flex:
     jdbc-type-for-null: 'null'
 pagehelper:
   helper-dialect: mysql
-  reasonable: true
   support-methods-arguments: true
diff --git a/cash-api/system-server/src/main/resources/application.yml b/cash-api/system-server/src/main/resources/application.yml
index 2208e15a4..8dc079bba 100644
--- a/cash-api/system-server/src/main/resources/application.yml
+++ b/cash-api/system-server/src/main/resources/application.yml
@@ -12,5 +12,4 @@ logging:
 
 pagehelper:
   helper-dialect: mysql
-  reasonable: true
   support-methods-arguments: true
\ No newline at end of file
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
index e6f0a6799..df286e8eb 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
@@ -87,4 +87,30 @@ public class CheckOrderPay implements Serializable {
     public Integer getPointsNum() {
         return pointsNum == null ? 0 : pointsNum;
     }
+
+    public BigDecimal getDiscountRatio() {
+        return discountRatio == null ? BigDecimal.ONE : discountRatio;
+    }
+
+    public BigDecimal getFullCouponDiscountAmount() {
+        return fullCouponDiscountAmount == null ? BigDecimal.ZERO : fullCouponDiscountAmount;
+    }
+
+    public BigDecimal getProductCouponDiscountAmount() {
+        return productCouponDiscountAmount == null ? BigDecimal.ZERO : productCouponDiscountAmount;
+    }
+
+    public BigDecimal getDiscountAmount() {
+        return discountAmount == null ? BigDecimal.ZERO : discountAmount;
+    }
+
+    public BigDecimal getPointsDiscountAmount() {
+        return pointsDiscountAmount == null ? BigDecimal.ZERO : pointsDiscountAmount;
+    }
+
+    public BigDecimal getRoundAmount() {
+        return roundAmount == null ? BigDecimal.ZERO : roundAmount;
+    }
+
+
 }
diff --git a/cash-common/cash-common-tools/pom.xml b/cash-common/cash-common-tools/pom.xml
index b8e7c5566..52f9b09c0 100644
--- a/cash-common/cash-common-tools/pom.xml
+++ b/cash-common/cash-common-tools/pom.xml
@@ -49,17 +49,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.jsqlparser</groupId>
-                    <artifactId>jsqlparser</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>sqlparser4.5</artifactId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/cash-dependencies/pom.xml b/cash-dependencies/pom.xml
index 457ba1e41..541d6f7c8 100644
--- a/cash-dependencies/pom.xml
+++ b/cash-dependencies/pom.xml
@@ -33,7 +33,7 @@
         <dubbo-registry-nacos.version>3.3.3</dubbo-registry-nacos.version>
         <dubbo.version>3.3.3</dubbo.version>
         <seata.version>2.0.0</seata.version>
-        <pagehelper.version>6.1.0</pagehelper.version>
+        <pagehelper.version>2.1.0</pagehelper.version>
         <alipay-sdk-java.version>4.40.54.ALL</alipay-sdk-java.version>
         <aliyun-sms.version>2.0.24</aliyun-sms.version>
         <aliyun.oss.version>2.8.3</aliyun.oss.version>
@@ -168,21 +168,9 @@
                 <artifactId>seata-spring-boot-starter</artifactId>
                 <version>${seata.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper</artifactId>
-                <version>${pagehelper.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.github.jsqlparser</groupId>
-                        <artifactId>jsqlparser</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>sqlparser4.5</artifactId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
                 <version>${pagehelper.version}</version>
             </dependency>
             <!--
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java
index a30508878..85dc39e1c 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java
@@ -91,12 +91,12 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
     @Override
     public Page<ShopActivateCouponRecord> find(Long userId, Long shopId, Integer status) {
         Page<Object> page = PageUtil.buildPage();
-        PageHelper.startPage(Math.toIntExact(page.getPageNumber()),Math.toIntExact(page.getPageSize()));
         List<Long> shopUserIds = shopUserService.queryChain()
                 .eq(ShopUser::getUserId, userId)
                 .eq(ShopUser::getShopId, shopId)
                 .select(ShopUser::getId).listAs(Long.class);
         if (CollectionUtil.isNotEmpty(shopUserIds)) {
+            PageHelper.startPage(Math.toIntExact(page.getPageNumber()),Math.toIntExact(page.getPageSize()));
             return PageUtil.convert(new PageInfo<>(couponRecordService.findByUser(shopUserIds, status)));
         }
         return new Page<>();
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 7cc742d72..460e1c49c 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -282,7 +282,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (prodCouponAmount.getPrice().compareTo(param.getProductCouponDiscountAmount()) != 0) {
             throw new ValidateException("生成支付订单失败，商品优惠券优惠金额不正确");
         }
-        BigDecimal newTotalAmount = BigDecimal.ZERO;
+        BigDecimal newTotalAmount;
         //折扣金额 如 9折 计算 为 订单金额*0.9 向上取整
         if (param.getDiscountRatio().compareTo(BigDecimal.ONE) != 0) {
             newTotalAmount = totalAmount.getPrice().multiply(param.getDiscountRatio()).setScale(2, RoundingMode.UP);
@@ -648,7 +648,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     private void upOrderPayInfo(OrderInfo orderInfo, CheckOrderPay param) {
         orderInfo.setPointsNum(param.getPointsNum());
-        orderInfo.setOriginAmount(param.getOriginAmount());
         orderInfo.setRoundAmount(param.getRoundAmount());
         orderInfo.setOrderAmount(param.getOrderAmount());
         orderInfo.setPointsDiscountAmount(param.getPointsDiscountAmount());
@@ -660,7 +659,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         //折扣信息
         orderInfo.setDiscountInfo(buildDiscountInfo(orderInfo));
         //最终折扣
-        orderInfo.setDiscountRatio(param.getOriginAmount().divide(param.getOrderAmount(), 2, RoundingMode.UP));
+        orderInfo.setDiscountRatio(orderInfo.getOriginAmount().divide(param.getOrderAmount(), 2, RoundingMode.UP));
         saveOrUpdate(orderInfo);
     }
 
diff --git a/cash-service/pom.xml b/cash-service/pom.xml
index a0247ae2c..2891a4ef9 100644
--- a/cash-service/pom.xml
+++ b/cash-service/pom.xml
@@ -42,17 +42,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.jsqlparser</groupId>
-                    <artifactId>jsqlparser</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>sqlparser4.5</artifactId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.czg</groupId>