|
@@ -1611,15 +1611,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
SenInfoCheckUtil.sendMsg(userEntity.getOpenId(), one.getValue(), msgList, 1);
|
|
SenInfoCheckUtil.sendMsg(userEntity.getOpenId(), one.getValue(), msgList, 1);
|
|
|
|
|
|
|
|
// 如果是预约订单,则不再打印小票(订单支付的时候已经打印过了)
|
|
// 如果是预约订单,则不再打印小票(订单支付的时候已经打印过了)
|
|
|
- if (!StrUtil.equals(order.getReservationFlag(), Constant.YES)) {
|
|
|
|
|
|
|
+ if (!StrUtil.equals(tbOrder.getReservationFlag(), Constant.YES)) {
|
|
|
if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
|
|
if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
|
|
|
- int sequence = -1;
|
|
|
|
|
- // 查询当天店铺所有已支付的订单号,按支付时间排序
|
|
|
|
|
- try {
|
|
|
|
|
- sequence = selectCurrentOrderSequenceByShopId(tbOrder, shopId);
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- log.warn("打印非当天已支付订单,订单id:{}", order.getOrderId());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ int sequence = selectCurrentOrderSequenceByShopId(tbOrder, shopId);
|
|
|
tbOrder.setCountOrder(sequence);
|
|
tbOrder.setCountOrder(sequence);
|
|
|
FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder);
|
|
FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder);
|
|
|
}
|
|
}
|