Accept Merge Request #32: (dev-lzl -> dev-测试环境分支不要从这拉代码)

Merge Request: 合并——修改查询查看单个订单

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/32?initial=true

src/main/java/com/sqx/modules/order/dao/AppOrderDao.java

@@ -98,4 +98,6 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
     int countUnFinishByShopId(@Param("shopId") Long shopId);
 
     int countCurDayPayByShopId(@Param("shopId") Long shopId, @Param("payTime") String payTime);
+
+    IPage<TbOrder> selectOrderPage(Page<TbOrder> pages,@Param("userId") Long userId,@Param("orderId") Integer orderId);
 }

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

@@ -2529,10 +2529,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     public Result selectOrder(Long userId, Integer orderId,Integer page, Integer limit) {
         HashMap hashMap = new HashMap();
         Page<TbOrder> pages = new Page(page, limit);
-        LambdaQueryWrapper<TbOrder> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(TbOrder::getOrderId,orderId)
-                .eq(TbOrder::getUserId,userId);
-        IPage<TbOrder> tbOrderList = baseMapper.selectPage(pages, wrapper);
+        IPage<TbOrder> tbOrderList = baseMapper.selectOrderPage(pages, userId,orderId);
         BigDecimal money = new BigDecimal(0);
         ArrayList list = new ArrayList();
         for (int i = 0; i < tbOrderList.getRecords().size(); i++) {

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

@@ -602,5 +602,15 @@
           and shop_id = #{shopId}
           and date(pay_time) = date(#{payTime})
     </select>
+    <select id="selectOrderPage" resultType="com.sqx.modules.order.entity.TbOrder">
+        select tor.*, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.shop_lng as shopLng,
+        gs.shop_lat as shopLat, gs.phone as shopPhone,
+        gs.errand_money as errandMoney, gs.exempt_min_money as exemptMinMoney, gs.minimum_delivery as minimumDelivery,
+        gs.distribution_distance as distributionDistance
+        from tb_order tor left join goods_shop gs on tor.shop_id = gs.shop_id
+        where tor.user_id = #{userId}
+            and tor.order_id = #{orderId}
+
+    </select>
 
 </mapper>