From 6b3e8f197b6489a18508bbc44a9f7c595ba0ef7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 22 Sep 2025 14:43:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(shop-order):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将订单金额从 `totalPrice` 更改为 `payPrice`以确保支付逻辑正确。同时移除了未使用的类导入，
包括 `DateUtil`、`ApiResult`、`User`、`Date` 和 `formatDateTime`，以优化代码结构。
---
 .../gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java
index d1d3445..01a1411 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java
@@ -1,6 +1,5 @@
 package com.gxwebsoft.shop.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,9 +9,7 @@ import com.gxwebsoft.common.core.utils.*;
 import com.gxwebsoft.common.core.service.PaymentCacheService;
 import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService;
 import com.gxwebsoft.common.core.config.SpringContextUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.system.entity.Payment;
-import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.shop.entity.*;
 import com.gxwebsoft.shop.service.*;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
@@ -39,13 +36,10 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.sql.Date;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.gxwebsoft.common.core.utils.DateTimeUtil.formatDateTime;
-
 /**
  * 订单Service实现
  *
@@ -311,7 +305,7 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
         System.out.println("微信支付服务构建完成");
 
         // 订单金额
-        BigDecimal decimal = order.getTotalPrice();
+        BigDecimal decimal = order.getPayPrice();
         final BigDecimal multiply = decimal.multiply(new BigDecimal(100));
         Integer money = multiply.intValue();