增加订单商铺手机号，骑手手机号

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

@@ -1456,6 +1456,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             TbCouponUser tbCouponUser = tbCouponUserDao.selectById(tbOrder.getCouponId());
             tbOrder.setCouponMoney(tbCouponUser.getMoney());
         }
+        GoodsShop goodsShop=goodsShopDao.selectById(tbOrder.getShopId());
+        if(goodsShop!=null){
+            tbOrder.setShopName(goodsShop.getShopName());
+            tbOrder.setShopPhone(goodsShop.getPhone());
+        }
         List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>().eq("order_id", tbOrder.getOrderId()));
         tbOrder.setOrderGoodsList(orderGoodsList);
         return Result.success().put("data", tbOrder);

src/main/resources/mapper/order/OrderMapper.xml

@@ -267,13 +267,14 @@
 
     <select id="waitTakeFood" resultType="com.sqx.modules.order.entity.TbOrder">
         select tor.*, tu.avatar as avatar, ti.rider_user_id as riderUserId, gs.shop_name as shopName, gs.shop_cover as
-        shopCover, gs.detailed_address as detailedAddress,
+        shopCover, gs.detailed_address as detailedAddress,tu1.phone as riderPhone,gs.phone as shopPhone,
         (select count(*) from tb_order where order_type = 1 and status in (6, 3) and pay_time &lt; tor.pay_time
         and shop_id = tor.shop_id) as countOrder
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
         left join tb_indent ti on tor.order_id = ti.order_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
+        left join tb_user tu1 on ti.rider_user_id = tu1.user_id
         where tor.user_id = #{userId}
         and order_type = #{orderType}
         <if test="status!=null and status!=5">