From 1f23043b12eb6e9e4e66f40a11b93c59daa7ee74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 20 Mar 2025 10:05:24 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=87=86=E7=A1=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index b09c42a1d..181ddbb5a 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -41,7 +41,7 @@ + select a.*, b.role_id from sys_user as a + left join sys_users_roles as b on a.id=b.user_id + + + and (a.nick_name like concat('%', #{key}, '%') or a.account like concat('%', #{key}, '%')) + + + and a.create_time >= #{startTime} + + + + and a.create_time <= #{endTime} + + + + and a.status=#{status} + + + order by a.create_time desc + From 403cd2647cba7aaeca1b78f8832049fca364199f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 20 Mar 2025 11:05:50 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=B8=E7=8E=8B?= =?UTF-8?q?=E9=A4=90=E8=A1=A8=E4=B8=BB=E9=94=AEid=E4=B8=BAshopId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/entity/FreeDineConfig.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java index 041b44846..b6b26abc6 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java @@ -30,9 +30,6 @@ public class FreeDineConfig implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id(keyType = KeyType.Auto) - private Long id; - /** * 是否启用 */ @@ -71,6 +68,7 @@ public class FreeDineConfig implements Serializable { /** * 门店id */ + @Id private Long shopId; /** From 4ecbeb030b214973bb8b0700fdaa00f519701313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 20 Mar 2025 11:15:46 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BA=A4=E7=8F=AD=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/HandoverRecordController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java index ad41e5abc..c4e57c9bf 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/HandoverRecordController.java @@ -100,9 +100,6 @@ public class HandoverRecordController { //@SaAdminCheckPermission("handoverRecord:handover") public CzgResult handover(@RequestParam Integer isPrint) { Long id = handoverRecordService.handover(); - if (isPrint == 1){ - rabbitPublisher.sendHandoverPrintMsg(id.toString()); - } return CzgResult.success(id); } From 239acdffaf6425312305baf7b2190307802f555d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 20 Mar 2025 11:17:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BA=A4=E7=8F=AD=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/service/order/print/PrinterImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index 4b084b457..97f4d5dfc 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -162,7 +162,7 @@ public interface PrinterImpl { StringBuilder builder = new StringBuilder() .append(getFormatLabel(handoverRecord.getShopName(), signLabelInfo.center, signLabelInfo.f)).append(signLabelInfo.br) .append(getFormatLabel("交班小票", signLabelInfo.l,signLabelInfo.center)).append(signLabelInfo.br) - .append("交班时间: ").append(handoverRecord.getHandoverTime()).append(signLabelInfo.br) + .append("交班时间: ").append(DateUtil.format(handoverRecord.getHandoverTime(), "yyyy-MM-dd HH:mm:ss")).append(signLabelInfo.br) .append("收银员: ").append(handoverRecord.getStaffName()).append(signLabelInfo.br) .append("当班总收入: ").append(handoverRecord.getHandAmount()).append(signLabelInfo.br) .append("现金收入: ").append(handoverRecord.getCashAmount()).append(signLabelInfo.br)