跑腿订单新增订单支付顺序字段

src/main/java/com/sqx/modules/errand/entity/TbIndent.java

@@ -138,6 +138,9 @@ public class TbIndent implements Serializable {
     @ApiModelProperty("收货码")
     private String orderCode;
 
+    @ApiModelProperty("订单支付顺序号")
+    private String orderPaySequence;
+
     @ApiModelProperty("备注")
     private String remarks;
 

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -246,6 +246,12 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         tbIndent.setShopDistrict(goodsShop.getDistrict());
         tbIndent.setShopLng(goodsShop.getShopLng());
         tbIndent.setShopLat(goodsShop.getShopLat());
+
+        // 新增，订单支付顺序号
+        if (ObjectUtil.isNotNull(order.getCountOrder())) {
+            tbIndent.setOrderPaySequence(String.valueOf(order.getCountOrder()));
+        }
+
         tbIndent.setShopAddressDetail(goodsShop.getDetailedAddress());
         if(order.getOrderType()==2){
             tbIndent.setUserName(address.getUserName());

src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -18,6 +18,8 @@ public interface AppOrderService extends IService<TbOrder> {
 
     Result print(Long orderId);
 
+    int selectCurrentOrderSequenceByShopId(TbOrder order, Long shopId);
+
     Result updateOrder(TbOrder order);
 
     Result deleteOrderList(List<Integer> orderId);

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

@@ -588,6 +588,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
         // 已接单状态的订单生成跑腿订单
         if (order.getStatus() == 6) {
+            int i = selectCurrentOrderSequenceByShopId(order, order.getShopId());
+            order.setCountOrder(i);
+
             // 如果是外卖订单,则生成一个跑腿的订单
             tbIndentService.insertIndent(order);
 
@@ -1538,7 +1541,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
      * @param shopId 店铺id
      * @return
      */
-    private int selectCurrentOrderSequenceByShopId(TbOrder order, Long shopId) {
+    @Override
+    public int selectCurrentOrderSequenceByShopId(TbOrder order, Long shopId) {
         if (Integer.valueOf(Constant.YES).equals(order.getIsPay())) {
             List<Long> orderIds = appOrderDao.selectCurrentOrderSequenceByShopId(shopId, order.getPayTime());
 
@@ -1575,6 +1579,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             //商家接单
             order.setShopReceivingTime(format1);
 
+            int i = selectCurrentOrderSequenceByShopId(tbOrder, tbOrder.getShopId());
+            tbOrder.setCountOrder(i);
             // 生成跑腿订单
             tbIndentService.insertIndent(tbOrder);