修改商户接单时异常

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1554,7 +1554,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             order.setShopReceivingTime(format1);
 
             // 生成跑腿订单
-            tbIndentService.insertIndent(order);
+            tbIndentService.insertIndent(tbOrder);
 
             //设置小程序消息推送
             CommonInfo one = commonInfoService.findOne(269);
@@ -1591,8 +1591,13 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             // 如果是预约订单，则不再打印小票（订单支付的时候已经打印过了）
             if (!StrUtil.equals(order.getReservationFlag(), Constant.YES)) {
                 if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
+                    int sequence = -1;
                     // 查询当天店铺所有已支付的订单号，按支付时间排序
-                    int sequence = selectCurrentOrderSequenceByShopId(tbOrder.getOrderId(), shopId);
+                    try {
+                        sequence = selectCurrentOrderSequenceByShopId(tbOrder.getOrderId(), shopId);
+                    } catch (Exception e) {
+                        log.warn("打印非当天已支付订单，订单id:{}", order.getOrderId());
+                    }
                     tbOrder.setCountOrder(sequence);
                     FeiYunUtils.print(goodsShop.getSnCode(), null, tbOrder);
                 }