czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

打印修改

Browse Source
This commit is contained in:
SongZhang
2024-10-12 15:04:37 +08:00
parent 676daf9a8c
commit 0b68aa89d5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintConsumer.java
View File

@@ -134,7 +134,7 @@ public class PrintConsumer {
} }
private List<TbPrintMachine> getPrintMachine(Integer shopId, String subType, String model) { private List<TbPrintMachine> getPrintMachine(Integer shopId, String subType, String printMethod) {
TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId); TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId);
if (ObjectUtil.isEmpty(shopInfo)) { if (ObjectUtil.isEmpty(shopInfo)) {
log.error("店铺信息不存在"); log.error("店铺信息不存在");
@@ -145,15 +145,13 @@ public class PrintConsumer {
.eq(TbPrintMachine::getStatus, 1) .eq(TbPrintMachine::getStatus, 1)
.eq(TbPrintMachine::getShopId, shopId) .eq(TbPrintMachine::getShopId, shopId)
.eq(TbPrintMachine::getSubType, subType) .eq(TbPrintMachine::getSubType, subType)
.eq(TbPrintMachine::getPrintMethod, printMethod)
.eq(TbPrintMachine::getConnectionType, "network")); .eq(TbPrintMachine::getConnectionType, "network"));
if (list.isEmpty()) { if (list.isEmpty()) {
log.error("店铺未配置打印机，店铺id: {}", shopId); log.error("店铺未配置打印机，店铺id: {}", shopId);
return list; return list;
} }
list = list.stream()
.filter(item -> StrUtil.isNotBlank(item.getPrintMethod())
&& model.equals(item.getPrintMethod())).collect(Collectors.toList());
log.info("打印机列表: {}", list); log.info("打印机列表: {}", list);
return list; return list;

2
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
View File

@@ -64,7 +64,7 @@ public abstract class PrinterHandler {
c.getId().toString().equals(categoryId) c.getId().toString().equals(categoryId)
).count(); ).count();
if (count == 0) { if (machine.getClassifyPrint() != null && "1".equals(machine.getClassifyPrint()) && count == 0) {
log.warn("分类未添加菜品: {} : {}", item.getProductName(), sku.getSpecSnap()); log.warn("分类未添加菜品: {} : {}", item.getProductName(), sku.getSpecSnap());
return; return;
} }