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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
SongZhang
2024-08-09 15:58:00 +08:00
parent 63f5c54284 5b14a4f342
commit c300f61def
2 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
View File

@@ -253,12 +253,7 @@ public class DataService {
} }
List<TbPrintMachineWithBLOBs> bloBsList = tbPrintMachineMapper.selectByShopId(tbShopInfo.getId().toString()); List<TbPrintMachineWithBLOBs> bloBsList = tbPrintMachineMapper.selectByShopId(tbShopInfo.getId().toString());
if(Objects.nonNull(bloBsList)&&ObjectUtil.isNotEmpty(bloBsList)){
if (ObjectUtil.isEmpty(bloBsList) || bloBsList.size() <= 0) {
log.error("此店铺没有对应的打印机设备");
return Result.fail(CodeEnum.printmachinenoexsit);
}
bloBsList.parallelStream().forEach(it-> { bloBsList.parallelStream().forEach(it-> {
if (!"network".equals(it.getConnectionType())) { if (!"network".equals(it.getConnectionType())) {
@@ -355,7 +350,7 @@ public class DataService {
String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo)); PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo));
}); });
}
} }
} }

2
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -743,7 +743,7 @@ public class OrderService {
} else { } else {
String orderNo = generateOrderNumber(); String orderNo = generateOrderNumber();
TbOrderInfo orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "", TbOrderInfo orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
"table", "case", userId, shopId.toString(), "table", "cash", userId, shopId.toString(),
"", (byte) 1, day, masterId); "", (byte) 1, day, masterId);
orderInfo.setStatus("pending"); orderInfo.setStatus("pending");
tbOrderInfoMapper.insert(orderInfo); tbOrderInfoMapper.insert(orderInfo);