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

1.代客下单 结算单打印

Browse Source
This commit is contained in:
SongZhang
2024-08-27 11:41:52 +08:00
parent 9942bc6de6
commit fbe7b72e4b
1 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -295,7 +295,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
} }
@@ -305,10 +305,6 @@ public class PayService {
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
// 打印结算单
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId);
}
return Result.success(CodeEnum.SUCCESS, object.getJSONObject("data")); return Result.success(CodeEnum.SUCCESS, object.getJSONObject("data"));
} else { } else {
String status = ObjectUtil.isNotEmpty(object.getJSONObject("data")) ? object.getJSONObject("data").getString("status") : null; String status = ObjectUtil.isNotEmpty(object.getJSONObject("data")) ? object.getJSONObject("data").getString("status") : null;
@@ -378,7 +374,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
} }
// 修改台桌状态 // 修改台桌状态
@@ -386,9 +382,7 @@ public class PayService {
.eq(TbShopTable::getQrcode, orderInfo.getTableId()) .eq(TbShopTable::getQrcode, orderInfo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
// 打印结算单 // 打印结算单
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId);
}
return Result.success(CodeEnum.SUCCESS, mainScanResp); return Result.success(CodeEnum.SUCCESS, mainScanResp);
} else if ("TRADE_AWAIT".equals(mainScanResp.getState())) { } else if ("TRADE_AWAIT".equals(mainScanResp.getState())) {
@@ -470,9 +464,6 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) {
producer.printMechine(orderId);
}
} }
} }
} }
@@ -498,9 +489,6 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) {
producer.printMechine(orderId);
}
} }
} }
} }
@@ -642,7 +630,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
} }
@@ -757,7 +745,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
} }
@@ -846,7 +834,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(String.valueOf(orderId)); producer.printMechine(String.valueOf(orderId));
} }
@@ -927,7 +915,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
} }
@@ -945,11 +933,6 @@ public class PayService {
.eq(TbShopTable::getQrcode, orderInfo.getTableId()) .eq(TbShopTable::getQrcode, orderInfo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
// 打印结算单
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId);
}
return Result.success(CodeEnum.SUCCESS); return Result.success(CodeEnum.SUCCESS);
} }
@@ -1016,7 +999,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
} }
@@ -1032,10 +1015,6 @@ public class PayService {
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>() mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, orderInfo.getTableId()) .eq(TbShopTable::getQrcode, orderInfo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
// 打印结算单
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(String.valueOf(orderId));
}
return Result.success(CodeEnum.SUCCESS); return Result.success(CodeEnum.SUCCESS);
} }
@@ -1287,8 +1266,8 @@ public class PayService {
// jsonObject.put("data",new ReturnWTZInfo(orderId+"",newOrderInfo.getPayAmount(),details)); // jsonObject.put("data",new ReturnWTZInfo(orderId+"",newOrderInfo.getPayAmount(),details));
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (!orderInfo.getPayType().equals("postPay")) { if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(String.valueOf(newOrderInfo.getId())); producer.printMechine(String.valueOf(orderId));
} }
@@ -1352,10 +1331,7 @@ public class PayService {
.eq(TbShopTable::getQrcode, orderInfo.getTableId()) .eq(TbShopTable::getQrcode, orderInfo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
// 打印结算单
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(String.valueOf(orderId));
}
return Result.success(CodeEnum.SUCCESS); return Result.success(CodeEnum.SUCCESS);
} }