From fed5b28ce26d7259a9c7d16e7a991a006b4a29fc Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 5 Sep 2024 09:24:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98=EF=BC=8C=E5=82=A8=E5=80=BC?=
 =?UTF-8?q?=E5=8D=A1=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98,=20=E5=8F=B0?=
 =?UTF-8?q?=E6=A1=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 11 +++++++----
 .../service/impl/shopimpl/TbShopTableServiceImpl.java |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
index 90640034..9def3612 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
@@ -214,6 +214,7 @@ public class TbPayServiceImpl implements TbPayService {
 
 
             ResponseEntity<String> response = restTemplate.postForEntity(gateWayUrl.concat("merchantOrder/scanPay"), scanPayReq, String.class);
+            log.info("响应信息, {}", response);
             if (response.getStatusCodeValue() == 200 && ObjectUtil.isNotEmpty(response.getBody())) {
                 JSONObject object = JSONObject.parseObject(response.getBody());
                 if (object.get("code").equals("0")) {
@@ -241,6 +242,7 @@ public class TbPayServiceImpl implements TbPayService {
                             .eq(TbOrderDetail::getOrderId, scanPayDTO.getOrderId()));
 
 
+                    return orderInfo;
 
                 } else {
                     String status = ObjectUtil.isNotEmpty(object.getJSONObject("data")) ? object.getJSONObject("data").getString("status") : null;
@@ -258,7 +260,7 @@ public class TbPayServiceImpl implements TbPayService {
 //                orderInfo.setStatus("fail");
 //                orderInfo.setPayOrderNo(payment.getTradeNumber());
 //                tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
-
+                    return orderInfo;
                 }
             }
         } else {
@@ -276,6 +278,7 @@ public class TbPayServiceImpl implements TbPayService {
                     BigDecimal.valueOf(payment.getAmount()).setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(),
                     payType.equals("wechatPay") ? thirdApply.getSmallAppid() : null,
                     scanPayDTO.getCode(), DateUtils.getSsdfTimes(), thirdApply.getStoreId(), callBack, thirdApply.getAppToken());
+            log.info("响应信息, {}", publicResp);
             if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) {
                 if ("000000".equals(publicResp.getCode())) {
                     MainScanResp mainScanResp = publicResp.getObjData();
@@ -300,7 +303,7 @@ public class TbPayServiceImpl implements TbPayService {
                                 .eq(TbOrderDetail::getOrderId, orderInfo.getId())
                                 .set(TbOrderDetail::getStatus, "closed"));
 
-
+                        return orderInfo;
                     } else if ("TRADE_AWAIT".equals(mainScanResp.getState())) {
                         orderInfo.setStatus("paying");
                         orderInfo.setPayOrderNo(payment.getTradeNumber());
@@ -310,13 +313,13 @@ public class TbPayServiceImpl implements TbPayService {
                         payment.setUpdatedAt(System.currentTimeMillis());
                         orderPaymentService.updateById(payment);
 
+                        return orderInfo;
                     }
                 }
             }
 
         }
-
-        return orderInfo;
+        throw new BadRequestException("支付失败");
 
     }
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 6e094e06..280ce65f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -147,10 +147,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             } else if (tbCashierCartMapper.selectCount(new LambdaQueryWrapper<TbCashierCart>()
                     .eq(TbCashierCart::getShopId, date.getShopId())
                     .eq(TbCashierCart::getTableId, date.getQrcode())
+                            .eq(TbCashierCart::getTradeDay, cn.ysk.cashier.utils.DateUtils.getDay())
                     .eq(TbCashierCart::getStatus, "create")) < 1 || (orderId != null &&
                     tbOrderDetailMapper.selectCount(new LambdaQueryWrapper<TbOrderDetail>()
                             .eq(TbOrderDetail::getShopId, date.getShopId())
                             .eq(TbOrderDetail::getStatus, "unpaid")
+                                    .ge(TbOrderDetail::getCreateTime, DateUtil.beginOfDay(new Date()))
                             .eq(TbOrderDetail::getOrderId, orderId)) < 1)
             ) {
                 date.setStatus("idle");