From 28bb39230be2a11538827d079ec9858e79368ebc Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 28 Feb 2025 15:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=9D=E5=A4=96=20=E6=94=AF=E4=BB=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/controller/OrderPayController.java  | 1 -
 .../main/java/com/czg/service/order/service/PayService.java   | 1 -
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java  | 4 +---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
index e34f992c..64f201ec 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
@@ -143,7 +143,6 @@ public class OrderPayController {
     /**
      * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
      * openId  必填
-     *
      * checkOrderPay.orderAmount 必填
      */
     @PostMapping("/shopPayApi/js2Pay")
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
index 3bb3e2eb..efd0827f 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
@@ -3,7 +3,6 @@ package com.czg.service.order.service;
 import com.czg.entity.resp.CzgBaseResp;
 import com.czg.entity.resp.CzgRefundResp;
 import com.czg.order.dto.OrderInfoRefundDTO;
-import com.czg.order.entity.OrderInfo;
 import com.czg.resp.CzgResult;
 import com.czg.service.order.dto.OrderPayParamDTO;
 import com.czg.service.order.dto.VipPayParamDTO;
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 621b3d0e..31bc708e 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
@@ -35,7 +35,6 @@ import com.czg.service.RedisService;
 import com.czg.service.order.dto.BigDecimalDTO;
 import com.czg.service.order.enums.OrderStatusEnums;
 import com.czg.service.order.mapper.OrderInfoMapper;
-import com.czg.service.order.service.PayService;
 import com.czg.utils.AssertUtil;
 import com.czg.utils.CzgStrUtils;
 import com.czg.utils.PageUtil;
@@ -134,8 +133,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (orderId == null && StrUtil.isBlank(tableCode)) {
             throw new ValidateException("订单id或台桌码不可为空");
         }
-        HistoryOrderVo historyOrderVo = new HistoryOrderVo();
-//        OrderInfo orderInfo;
+        HistoryOrderVo historyOrderVo;
         if (orderId == null) {
             historyOrderVo = queryChain()
                     .select()