From 80fb7be8597faf4650d61905910d467ddf34fc6f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 1 Mar 2025 10:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=8C=E4=BD=8D=E8=B4=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderInfoServiceImpl.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 828bf586..d4ae6fad 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
@@ -201,13 +201,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (packAmount.getPrice().compareTo(param.getPackFee()) != 0) {
             throw new ValidateException("生成订单失败，打包费不正确");
         }
-        BigDecimal seatAmount = BigDecimal.ZERO;
-        if (shopInfo.getIsTableFee().equals(0)) {
-            seatAmount = shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum()));
-        }
-        log.info("下单3 打包费{} 餐位费{} 金额{}", param.getPackFee(), seatAmount, param.getOriginAmount());
+        log.info("下单3 打包费{} 金额{}", param.getPackFee(), param.getOriginAmount());
         //总金额
-        if (totalAmount.add(param.getPackFee()).add(seatAmount).compareTo(param.getOriginAmount()) != 0) {
+        if (totalAmount.add(param.getPackFee()).compareTo(param.getOriginAmount()) != 0) {
             throw new ValidateException("生成订单失败，订单金额不正确");
         }
         //生成订单
@@ -440,6 +436,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     public void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson) {
         CzgPayNotifyDTO czgCallBackDto = JSONObject.parseObject(resultJson.toString(), CzgPayNotifyDTO.class);
         OrderPayment payment = paymentService.queryChain().eq(OrderPayment::getOrderNo, orderNo).one();
+        if (StrUtil.isNotBlank(payment.getTradeNumber())) {
+            log.info("订单处理过，payment id：{}", payment.getId());
+            return;
+        }
         paymentService.updateChain()
                 .set(OrderPayment::getTradeNumber, czgCallBackDto.getPayOrderId())
                 .set(OrderPayment::getRespJson, resultJson.toString())
@@ -633,7 +633,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setSeatNum(param.getSeatNum());
         }
         orderInfo.setPlaceNum(param.getPlaceNum());
-        orderInfo.setOriginAmount(orderInfo.getOriginAmount().add(param.getOriginAmount()));
+        orderInfo.setOriginAmount(orderInfo.getOriginAmount().add(param.getOriginAmount()).add(orderInfo.getSeatAmount()));
         orderInfo.setOrderAmount(orderInfo.getOriginAmount());
         orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee()));
         orderInfo.setRoundAmount(BigDecimal.ZERO);