订单查询筛选店铺

cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java

@@ -72,7 +72,7 @@ public class UPpPackageController {
      */
     @GetMapping("/order")
     public CzgResult<Page<PpOrderListVO>> getMyOrderList(GbOrderQueryParam reqVo) {
-        return CzgResult.success(ppPackageOrderService.queryOrderList(null, StpKit.USER.getLoginIdAsLong(), reqVo));
+        return CzgResult.success(ppPackageOrderService.queryOrderList(reqVo.getShopId(), StpKit.USER.getLoginIdAsLong(), reqVo));
     }
 
     /**

cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml

@@ -17,10 +17,10 @@
         left join tb_user_info u on o.user_id = u.id
         where 1=1
         <if test="shopId != null">
-            and o.shop_id = #{shopId} and o.status != 'ing'
+            and o.shop_id = #{shopId}
         </if>
         <if test="userId != null">
-            and o.user_id = #{userId}
+            and o.user_id = #{userId} and o.status != 'ing'
         </if>
         <if test="param.orderNo != null">
             and o.order_no = #{param.orderNo}