1.代客下单 结算单打印

This commit is contained in:
2024-08-27 14:53:34 +08:00
parent fbe7b72e4b
commit 6dcd8368a0

View File

@@ -133,7 +133,6 @@ public class PayService {
private MpShopTableMapper mpShopTableMapper; private MpShopTableMapper mpShopTableMapper;
public Result queryPayType(String shopId) { public Result queryPayType(String shopId) {
return Result.success(CodeEnum.SUCCESS, tbShopPayTypeMapper.selectByShopId(shopId)); return Result.success(CodeEnum.SUCCESS, tbShopPayTypeMapper.selectByShopId(shopId));
} }
@@ -156,7 +155,6 @@ public class PayService {
} }
JSONObject tokeObj = TokenUtil.parseParamFromToken(token); JSONObject tokeObj = TokenUtil.parseParamFromToken(token);
if (Objects.isNull(tokeObj)) { if (Objects.isNull(tokeObj)) {
return Result.fail(CodeEnum.TOKENTERROR); return Result.fail(CodeEnum.TOKENTERROR);
@@ -295,9 +293,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
}
// 修改台桌状态 // 修改台桌状态
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>() mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
@@ -323,9 +319,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); producer.printMechine(orderId);
}
return Result.success(CodeEnum.PAYING); return Result.success(CodeEnum.PAYING);
} }
@@ -374,9 +368,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
}
// 修改台桌状态 // 修改台桌状态
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>() mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, orderInfo.getTableId()) .eq(TbShopTable::getQrcode, orderInfo.getTableId())
@@ -398,9 +390,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); producer.printMechine(orderId);
}
return Result.success(CodeEnum.PAYING); return Result.success(CodeEnum.PAYING);
} }
@@ -529,14 +519,12 @@ public class PayService {
} }
int count = tbShopPayTypeMapper.countSelectByShopIdAndPayType(orderInfo.getShopId(), "deposit"); int count = tbShopPayTypeMapper.countSelectByShopIdAndPayType(orderInfo.getShopId(), "deposit");
if (count < 1) { if (count < 1) {
return Result.fail(CodeEnum.PAYTYPENOEXIST); return Result.fail(CodeEnum.PAYTYPENOEXIST);
} }
JSONObject tokeObj = TokenUtil.parseParamFromToken(token); JSONObject tokeObj = TokenUtil.parseParamFromToken(token);
if (Objects.isNull(tokeObj)) { if (Objects.isNull(tokeObj)) {
return Result.fail(CodeEnum.TOKENTERROR); return Result.fail(CodeEnum.TOKENTERROR);
@@ -630,9 +618,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
}
// 发送库存记录mq消息 // 发送库存记录mq消息
JSONObject mqData = new JSONObject(); JSONObject mqData = new JSONObject();
@@ -686,7 +672,6 @@ public class PayService {
} }
TbUserInfo tbUserInfo = tbUserInfoMapper.selectByCardNo(memberCode); TbUserInfo tbUserInfo = tbUserInfoMapper.selectByCardNo(memberCode);
if (ObjectUtil.isEmpty(tbUserInfo)) { if (ObjectUtil.isEmpty(tbUserInfo)) {
return Result.fail(ACCOUNTEIXST); return Result.fail(ACCOUNTEIXST);
@@ -745,9 +730,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
}
// 发送库存记录mq消息 // 发送库存记录mq消息
JSONObject mqData = new JSONObject(); JSONObject mqData = new JSONObject();
@@ -834,9 +817,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(String.valueOf(orderId)); producer.printMechine(String.valueOf(orderId));
}
// 发送库存记录mq消息 // 发送库存记录mq消息
JSONObject mqData = new JSONObject(); JSONObject mqData = new JSONObject();
@@ -915,9 +896,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
}
// 发送库存记录mq消息 // 发送库存记录mq消息
JSONObject mqData = new JSONObject(); JSONObject mqData = new JSONObject();
@@ -999,9 +978,7 @@ public class PayService {
producer.putOrderCollect(jsonObject.toJSONString()); producer.putOrderCollect(jsonObject.toJSONString());
if (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(orderId); producer.printMechine(orderId);
}
// 发送库存记录mq消息 // 发送库存记录mq消息
JSONObject mqData = new JSONObject(); JSONObject mqData = new JSONObject();
@@ -1035,7 +1012,6 @@ public class PayService {
} }
TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
@@ -1266,11 +1242,7 @@ 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 (StrUtil.isNotBlank(orderInfo.getTableId())) {
producer.printMechine(String.valueOf(orderId)); producer.printMechine(String.valueOf(orderId));
}
//修改耗材数据 //修改耗材数据
JSONObject jsonObject1 = new JSONObject(); JSONObject jsonObject1 = new JSONObject();