czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: czg_team:87797e58121f796219a6f92d1b1f68220b42e980
Branches Tags
czg_team:master czg_team:test czg_team:prod czg_team:dev czg_team:pay czg_team:backup-250910
...
compare: czg_team:3d6061342a72e63d294de31e330dcde22d47c332
Branches Tags
czg_team:test czg_team:prod czg_team:dev czg_team:pay czg_team:backup-250910 czg_team:master

2 Commits
87797e5812 ... 3d6061342a

Author SHA1 Message Date
wangw
3d6061342a Merge remote-tracking branch 'origin/test' into test 2025-12-29 15:49:01 +08:00
wangw
76f6e7776e 打印机类型 2025-12-29 15:47:02 +08:00
2 changed files with 2 additions and 3 deletions
Expand all files Collapse all files

1
cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
View File

@@ -42,6 +42,5 @@ public class OrderDetailSmallVO implements Serializable {
private LocalDateTime dishOutTime; private LocalDateTime dishOutTime;
private LocalDateTime foodServeTime; private LocalDateTime foodServeTime;
private Integer isTemporary; private Integer isTemporary;
private String printStatus;
} }

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PrintMachineLogServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class PrintMachineLogServiceImpl extends ServiceImpl<PrintMachineLogMappe
Map<Integer, String> yxxStatusMap = MapUtil.builder(0, "离线(设备上线后自动补打)").put(1, "在线").put(2, "获取失败").put(3, "未激活").put(4, "设备已禁用").build(); Map<Integer, String> yxxStatusMap = MapUtil.builder(0, "离线(设备上线后自动补打)").put(1, "在线").put(2, "获取失败").put(3, "未激活").put(4, "设备已禁用").build();
// 云想印 // 云想印
if ("云享印".equals(config.getContentType())) { if ("云想印".equals(config.getContentType())) {
cn.hutool.json.JSONObject resp = JSONUtil.parseObj(respJson); cn.hutool.json.JSONObject resp = JSONUtil.parseObj(respJson);
int code = resp.getInt("code"); int code = resp.getInt("code");
cn.hutool.json.JSONObject data = resp.getJSONObject("data").getJSONObject("data"); cn.hutool.json.JSONObject data = resp.getJSONObject("data").getJSONObject("data");
@@ -240,7 +240,7 @@ public class PrintMachineLogServiceImpl extends ServiceImpl<PrintMachineLogMappe
super.save(entity); super.save(entity);
// 云想印 // 云想印
if ("云享印".equals(config.getContentType())) { if ("云想印".equals(config.getContentType())) {
// 延迟3ms，复查打印状态 (用户可以根据设备信息查询到当前设备的在线情况（注：该接口只能提供参考，设备的离线状态是在设备离线3分钟后才会生效）) // 延迟3ms，复查打印状态 (用户可以根据设备信息查询到当前设备的在线情况（注：该接口只能提供参考，设备的离线状态是在设备离线3分钟后才会生效）)
ThreadUtil.safeSleep(1000 * 5); ThreadUtil.safeSleep(1000 * 5);
String jsonStr = checkPrintStatus(config.getAddress(), entity.getTaskId()); String jsonStr = checkPrintStatus(config.getAddress(), entity.getTaskId());