From 21a8fd517e929aa42b26cebfd9c1dc8047221350 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 8 Oct 2024 09:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=8A=A5=E9=94=99fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/controller/product/TbPlaceController.java | 1 +
 .../service/impl/shopimpl/TbShopTableServiceImpl.java        | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index 055167b5..4c90d913 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -189,6 +189,7 @@ public class TbPlaceController {
 
     @Log("代客下单 打印菜品单")
     @ApiOperation("代客下单 打印菜品单")
+    @PostMapping("printDishes")
     public ResponseEntity<Object> printDishes(
             @Validated @RequestBody BaseTableDTO baseTableDTO
     ) {
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 30985cb9..ef423450 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
@@ -951,7 +951,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         String date = DateUtils.getSdfTimes();
         Random random = new Random();
         int randomNum = random.nextInt(900) + 100;
-        return StrUtil.isBlank(prefix) ? "DDPL" : prefix + date + randomNum;
+        return StrUtil.isBlank(prefix) ? "DDPL" + date + randomNum : prefix + date + randomNum;
     }
 
     public synchronized void addGlobalCode(String day, String clientType, String shopId) {
@@ -1516,7 +1516,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 //                    orderInfo = tbPayServiceImpl.cashPay(payDTO);
                     break;
                 case "scanCode":
-                    orderInfo = tbPayServiceImpl.scanPay(payDTO.getShopId(), payDTO.getCode(), Integer.valueOf(orderInfo.getMerchantId()), Integer.valueOf(orderInfo.getMemberId()), finalAmount, orderInfo);
+                    orderInfo = tbPayServiceImpl.scanPay(payDTO.getShopId(), payDTO.getCode(), Integer.valueOf(orderInfo.getMerchantId()),
+                            StrUtil.isNotBlank(orderInfo.getMemberId()) ? Integer.valueOf(orderInfo.getMemberId()) : null, finalAmount, orderInfo);
                     break;
                 case "deposit":
                     orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), orderInfo, finalAmount);