From 1dd5185c682c8ef6cf86b37e2720278cc9677258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Sat, 20 Jul 2024 09:22:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A4=E7=8F=AD=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/CloudPrinterController.java       | 2 +-
 .../system/cashierservice/service/CloudPrinterService.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
index 6614cdc..0e14bca 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
@@ -28,7 +28,7 @@ public class CloudPrinterController {
      * @return
      */
     @GetMapping("print")
-    public Result print(        @RequestHeader("token") String token,
+    public Result print(@RequestHeader("token") String token,
                                  @RequestHeader("loginName") String loginName,
                                  @RequestHeader("clientType") String clientType,
                                  @RequestParam("type") String type,
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
index ba4a37a..c824db8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
@@ -645,7 +645,7 @@ public class CloudPrinterService {
 
             HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
                     ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())?DateUtils.getTime(shopUserDuty.getLoginTime()):null,
-                    ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime())?DateUtils.getTime(shopUserDuty.getLoginOutTime()):"",
+                    ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime())?DateUtils.getTime(shopUserDuty.getLoginOutTime()):DateUtils.getTime(new Date()),
                     ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
                     list,memberData,shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount())?BigDecimal.ZERO:shopUserDuty.getQuickAmount()).toPlainString(),
                     "0",