bacn scan 打印两次问题
This commit is contained in:
@@ -1182,6 +1182,10 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
|||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public void upOrderInfo(OrderInfo orderInfo, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType) {
|
public void upOrderInfo(OrderInfo orderInfo, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType) {
|
||||||
|
if (orderInfo.getStatus().equals(OrderStatusEnums.DONE.getCode())) {
|
||||||
|
log.info("订单{}已完成,不再更新", orderInfo.getId());
|
||||||
|
return;
|
||||||
|
}
|
||||||
OrderInfo upOrderInfo = new OrderInfo()
|
OrderInfo upOrderInfo = new OrderInfo()
|
||||||
.setId(orderInfo.getId())
|
.setId(orderInfo.getId())
|
||||||
.setPayAmount(payAmount)
|
.setPayAmount(payAmount)
|
||||||
@@ -1223,16 +1227,20 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
|||||||
if (StrUtil.isNotBlank(orderInfo.getTableCode())) {
|
if (StrUtil.isNotBlank(orderInfo.getTableCode())) {
|
||||||
ThreadUtil.execAsync(() -> exTable(orderInfo));
|
ThreadUtil.execAsync(() -> exTable(orderInfo));
|
||||||
}
|
}
|
||||||
// 事务成功提交后执行消息发送
|
if (payType == PayEnums.BACK_SCAN) {
|
||||||
String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
|
// 事务成功提交后执行消息发送
|
||||||
rabbitPublisher.sendOrderPrintMsg(printParam, isPrint, "事务环境打印");
|
String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
|
||||||
|
rabbitPublisher.sendOrderPrintMsg(printParam, isPrint, "事务环境打印");
|
||||||
|
}
|
||||||
// log.info("订单{}事务提交后,发送打印消息", orderId);
|
// log.info("订单{}事务提交后,发送打印消息", orderId);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// 非事务环境下直接发送(兼容无事务场景)
|
if (payType == PayEnums.BACK_SCAN) {
|
||||||
String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
|
// 非事务环境下直接发送(兼容无事务场景)
|
||||||
rabbitPublisher.sendOrderPrintMsg(printParam, isPrint, "非事务环境打印");
|
String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
|
||||||
|
rabbitPublisher.sendOrderPrintMsg(printParam, isPrint, "非事务环境打印");
|
||||||
|
}
|
||||||
// log.info("非事务环境下,直接发送订单{}打印消息", orderId);
|
// log.info("非事务环境下,直接发送订单{}打印消息", orderId);
|
||||||
}
|
}
|
||||||
rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString(), "bc");
|
rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString(), "bc");
|
||||||
|
|||||||
Reference in New Issue
Block a user