diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java index 242eae7..573a4cf 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java @@ -253,77 +253,72 @@ public class DataService { } List bloBsList = tbPrintMachineMapper.selectByShopId(tbShopInfo.getId().toString()); + if(Objects.nonNull(bloBsList)&&ObjectUtil.isNotEmpty(bloBsList)){ + bloBsList.parallelStream().forEach(it-> { - if (ObjectUtil.isEmpty(bloBsList) || bloBsList.size() <= 0) { - log.error("此店铺没有对应的打印机设备"); - return Result.fail(CodeEnum.printmachinenoexsit); - } + if (!"network".equals(it.getConnectionType())) { + log.error("非网络打印机"); + return; + } - bloBsList.parallelStream().forEach(it-> { + if (!"1".equals(it.getStatus().toString())) { + log.error("打印机状态异常"); + return; + } - if (!"network".equals(it.getConnectionType())) { - log.error("非网络打印机"); - return; - } - - if (!"1".equals(it.getStatus().toString())) { - log.error("打印机状态异常"); - return; - } - - if (!it.getSubType().equals("cash")) { - log.error("非小票打印机"); - return; - } + if (!it.getSubType().equals("cash")) { + log.error("非小票打印机"); + return; + } - List list = null; - List memberData = null; - List productCategories = null; - List> mapList = shopUserDutyPayMapper.selectByDutyId(shopUserDuty.getId()); - if (ObjectUtil.isNotEmpty(mapList) && mapList.size() > 0) { - list = JSONUtil.parseJSONStr2TList(JSONUtil.toJSONString(mapList), HandoverInfo.PayInfo.class); - } + List list = null; + List memberData = null; + List productCategories = null; + List> mapList = shopUserDutyPayMapper.selectByDutyId(shopUserDuty.getId()); + if (ObjectUtil.isNotEmpty(mapList) && mapList.size() > 0) { + list = JSONUtil.parseJSONStr2TList(JSONUtil.toJSONString(mapList), HandoverInfo.PayInfo.class); + } - memberData = new ArrayList<>(); - ShopUserDutyPay shopUserDutyPay = shopUserDutyPayMapper.selectByDuctIdAndType(shopUserDuty.getId(), "deposit"); - if (ObjectUtil.isNotEmpty(shopUserDutyPay)) { - memberData.add(new HandoverInfo.MemberData(shopUserDutyPay.getAmount().toPlainString(), "会员卡消费")); - } + memberData = new ArrayList<>(); + ShopUserDutyPay shopUserDutyPay = shopUserDutyPayMapper.selectByDuctIdAndType(shopUserDuty.getId(), "deposit"); + if (ObjectUtil.isNotEmpty(shopUserDutyPay)) { + memberData.add(new HandoverInfo.MemberData(shopUserDutyPay.getAmount().toPlainString(), "会员卡消费")); + } - memberData.add(new HandoverInfo.MemberData(ObjectUtil.isNull(shopUserDuty.getMemberInAmount()) ? BigDecimal.ZERO.toPlainString() : shopUserDuty.getMemberInAmount().toPlainString(), "会员卡充值")); + memberData.add(new HandoverInfo.MemberData(ObjectUtil.isNull(shopUserDuty.getMemberInAmount()) ? BigDecimal.ZERO.toPlainString() : shopUserDuty.getMemberInAmount().toPlainString(), "会员卡充值")); - List> categries = shopUserDutyPayMapper.selectCetoryBydutyId(shopUserDuty.getId()); - if (ObjectUtil.isNotEmpty(categries) && categries.size() > 0) { - productCategories = JSONUtil.parseJSONStr2TList(JSONUtil.toJSONString(categries), HandoverInfo.ProductCategory.class); - } + List> categries = shopUserDutyPayMapper.selectCetoryBydutyId(shopUserDuty.getId()); + if (ObjectUtil.isNotEmpty(categries) && categries.size() > 0) { + productCategories = JSONUtil.parseJSONStr2TList(JSONUtil.toJSONString(categries), HandoverInfo.ProductCategory.class); + } - List productInfoPOS = null; - List productInfos = null; - if (isprintProduct) { + List productInfoPOS = null; + List productInfos = null; + if (isprintProduct) { // // // productInfoPOS=shopUserDutyPayMapper.selectProductByDutyId(shopUserDuty.getId()); - productInfos = shopUserDutyMapper.selectByDutyId(shopUserDuty.getId()); - } + productInfos = shopUserDutyMapper.selectByDutyId(shopUserDuty.getId()); + } - HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(), - ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null, - DateUtils.getTime(new Date()), - ObjectUtil.isNull(shopStaff)?"":ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(), - list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), - "0", - shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(), - shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), - shopUserDuty.getReturnAmount().toPlainString(), - shopUserDuty.getOrderNum().toString(), - productCategories, ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? "0" : shopUserDuty.getQuickAmount().toPlainString(), - null, productInfos + HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(), + ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null, + DateUtils.getTime(new Date()), + ObjectUtil.isNull(shopStaff)?"":ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(), + list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), + "0", + shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(), + shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), + shopUserDuty.getReturnAmount().toPlainString(), + shopUserDuty.getOrderNum().toString(), + productCategories, ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? "0" : shopUserDuty.getQuickAmount().toPlainString(), + null, productInfos - ); + ); // tbHandover tbHandover=new tbHandover(); // @@ -352,10 +347,10 @@ public class DataService { // tbHandover.setProductInfos(JSONUtil.toJSONString(handoverInfo.getProductInfos())); // tbHandover.setCreateTime(new Date()); // tbHandoverMapper.insert(tbHandover); - String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单,请及时处理\"}"; - PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo)); - }); - + String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单,请及时处理\"}"; + PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo)); + }); + } } }