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

打印样式修改

This commit is contained in:
谭凯凯 2024-10-15 10:56:22 +08:00 committed by Tankaikai
parent 71745dc96e
commit cb1d05a042
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,10 @@ public class PrintConsumer {
wrapper.like(TbPrintMachine::getPrintType, printType);
}
List<TbPrintMachine> list = mpPrintMachineMapper.selectList(wrapper);
for (TbPrintMachine item : list) {
//实际打印以传递的参数为准
item.setPrintMethod(printMethod);
}
if (list.isEmpty()) {
log.error("店铺未配置打印机，店铺id: {}", shopId);
return list;

54
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/ShopPrintLogServiceImpl.java
View File

@ -70,8 +70,8 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
@Override
public PageInfo<TbPrintMachineLog> page(Map<String, Object> params) {
MapProxy mapProxy = MapProxy.create(params);
Integer pageNum = mapProxy.getInt("pageNum",1);
Integer pageSize = mapProxy.getInt("pageSize",10);
Integer pageNum = mapProxy.getInt("pageNum", 1);
Integer pageSize = mapProxy.getInt("pageSize", 10);
PageInfo<TbPrintMachineLog> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> baseMapper.selectList(getWrapper(params)));
return pageInfo;
}
@ -114,19 +114,19 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
respMsg = status + "_" + yxxStatusMap.get(status);
}
if(code == 0){
if (code == 0) {
String taskId = resp.getJSONObject("data").getStr("orderId");
entity.setTaskId(taskId);
}
// 飞鹅云打印机暂时没有适配，先return不做打印记录
}else if ("fePrinter".equals(config.getContentType())) {
} else if ("fePrinter".equals(config.getContentType())) {
cn.hutool.json.JSONObject resp = JSONUtil.parseObj(respJson);
int ret = resp.getInt("ret");
if (ret != 0) {
failFlag = 1;
respCode = ret + "";
respMsg = resp.getStr("msg");
}else{
} else {
String printOrderId = resp.getStr("data");
entity.setTaskId(printOrderId);
}
@ -142,7 +142,7 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
}
entity.setPrintContent(printContent);
entity.setCreateTime(new Date());
if(failFlag == 0){
if (failFlag == 0) {
entity.setPrintTime(entity.getCreateTime());
}
entity.setFailFlag(failFlag);
@ -153,53 +153,59 @@ public class ShopPrintLogServiceImpl extends ServiceImpl<TbPrintMachineLogMapper
// 云想印
if ("yxyPrinter".equals(config.getContentType())) {
// 延迟3ms，复查打印状态 (用户可以根据设备信息查询到当前设备的在线情况（注：该接口只能提供参考，设备的离线状态是在设备离线3分钟后才会生效）)
ThreadUtil.safeSleep(1000*3);
ThreadUtil.safeSleep(1000 * 5);
String jsonStr = PrinterUtils.checkPrintStatus(config.getAddress(), entity.getTaskId());
cn.hutool.json.JSONObject resp = JSONUtil.parseObj(jsonStr);
int code = resp.getInt("code");
if(code == 0){
if (code == 0) {
cn.hutool.json.JSONObject data = resp.getJSONObject("data");
boolean status = data.containsKey("status");
if(!status){
if (!status) {
return;
}
boolean success = data.getBool("status",false);
if(entity.getFailFlag()==0 && success){
boolean success = data.getBool("status", false);
if (entity.getFailFlag() == 0 && success) {
entity.setFailFlag(0);
entity.setRespMsg("打印成功");
entity.setPrintTime(entity.getCreateTime());
}else if(entity.getFailFlag()==1 && success) {
} else if (entity.getFailFlag() == 1 && success) {
entity.setFailFlag(0);
entity.setPrintTime(new Date());
entity.setRespMsg("打印成功");
// 如果设备在线 and 休眠5秒后查询结果是未打印，即视为设备已离线，云端3分钟后才会同步到离线信息
}else if(entity.getFailFlag()==0 && !success){
} else if (entity.getFailFlag() == 0 && !success) {
entity.setFailFlag(1);
entity.setPrintTime(null);
entity.setRespMsg("0_离线(设备上线后自动补打)");
}else {
} else {
entity.setFailFlag(1);
entity.setPrintTime(null);
entity.setRespMsg(StrUtil.concat(true,"打印失败，", "_", entity.getRespMsg()));
entity.setRespMsg(StrUtil.concat(true, "打印失败，", "_", entity.getRespMsg()));
}
super.updateById(entity);
}
// 飞鹅云打印机
}else if("fePrinter".equals(config.getContentType())){
ThreadUtil.safeSleep(1000*3);
// 飞鹅云打印机
} else if ("fePrinter".equals(config.getContentType())) {
ThreadUtil.safeSleep(1000 * 5);
Boolean success = FeieyunPrintUtil.checkPrintStatus(entity.getTaskId());
if(success == null){
if (success == null) {
entity.setFailFlag(1);
entity.setRespMsg("打印失败，未知错误");
}else if(success) {
} else if (success) {
entity.setFailFlag(0);
entity.setPrintTime(new Date());
entity.setRespMsg("打印成功");
}else {
} else {
String msg = FeieyunPrintUtil.checkOnline(entity.getAddress());
entity.setFailFlag(1);
entity.setPrintTime(null);
entity.setRespMsg(StrUtil.concat(true,"打印失败，", "_", msg));
if (msg.indexOf("在线") > 0) {
entity.setFailFlag(0);
entity.setPrintTime(new Date());
entity.setRespMsg("打印成功");
} else {
entity.setFailFlag(1);
entity.setPrintTime(null);
entity.setRespMsg(StrUtil.concat(true, "打印失败，", "_", msg));
}
}
super.updateById(entity);
}