From 05c85707dc7685e09c9851b17f42c8b81cda1c2e Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Tue, 29 Oct 2024 11:41:06 +0800
Subject: [PATCH] 1

---
 .../java/com/fuint/business/order/entity/AllOrderInfo.java    | 4 ----
 .../business/order/service/impl/OilOrderServiceImpl.java      | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
index f3aba4ad8..a75077ae3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
@@ -64,10 +64,6 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
      * 优惠金额
      */
     private Double discountAmount;
-    /**
-     * 找零金额
-     */
-    private Double seekZero;
     /**
      * 支付时间
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index 565d8bc9c..987fbdb6e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -433,7 +433,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         // 商品实付金额
         Double goodsActualPay = Double.valueOf(map.get("goodsActualPay"));
         // 找零金额
-        BigDecimal seekZero = new BigDecimal(map.get("seekZero"));
+        Double seekZero = Double.valueOf(map.get("seekZero"));
         // 油枪id
         String oilGunId = map.get("oilGunId");
         // 活动营销优惠金额
@@ -687,7 +687,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         } else {
             cashierOrder.setPayAmount(oilActualPay + goodsActualPay);
         }
-        cashierOrder.setSeekZero(seekZero);
+        cashierOrder.setSeekZero(BigDecimal.valueOf(seekZero));
         cashierOrder.setOrderNo(orderNo);
         cashierOrder.setGoodsOrderAmount(goodsAmount);
         cashierOrder.setGoodsDiscountAmount(goodsDiscount);