Browse Source

Accept Merge Request #3: (shichen -> prod)

Merge Request: feat(Mex): 用户订单列表增加商品ID筛选功能

Created By: @史晨
Accepted By: @史晨
URL: https://g-rqti0371.coding.net/p/farm/d/kku_laravel/git/merge/3?initial=true
史晨 6 months ago
parent
commit
fd81d2a244

+ 1 - 1
app/Module/AppGame/Handler/Matchexchange/MyHandler.php

@@ -57,7 +57,7 @@ class MyHandler extends BaseHandler
             $pageNum = max($pageNum, 1);
 
             // 调用服务获取用户订单列表
-            $result = MexOrderService::getUserOrders($userId, $pageNum, $pageSize);
+            $result = MexOrderService::getUserOrders($userId, $pageNum, $pageSize, $itemId);
 
             // 设置分页信息
             $responsePage = new ResponsePage();

+ 6 - 2
app/Module/Mex/Logic/MexOrderLogic.php

@@ -215,9 +215,13 @@ class MexOrderLogic
      * @param int $pageSize 每页数量
      * @return array 订单列表
      */
-    public static function getUserOrders(int $userId, int $page = 1, int $pageSize = 20): array
+    public static function getUserOrders(int $userId, int $page = 1, int $pageSize = 20, $itemId =  null): array
     {
-        $orders = MexOrder::where('user_id', $userId)
+        $where['user_id'] = $userId;
+        if ($itemId) {
+            $where['item_id'] = $itemId;
+        }
+        $orders = MexOrder::where($where)
             ->orderBy('created_at', 'desc')
             ->paginate($pageSize, ['*'], 'page', $page);
 

+ 6 - 6
app/Module/Mex/Services/MexOrderService.php

@@ -10,7 +10,7 @@ use App\Module\Fund\Enums\FUND_CURRENCY_TYPE;
 
 /**
  * 农贸市场订单服务
- * 
+ *
  * 提供订单相关的对外服务接口
  */
 class MexOrderService
@@ -65,20 +65,20 @@ class MexOrderService
 
     /**
      * 获取用户订单列表
-     * 
+     *
      * @param int $userId 用户ID
      * @param int $page 页码
      * @param int $pageSize 每页数量
      * @return array 订单列表
      */
-    public static function getUserOrders(int $userId, int $page = 1, int $pageSize = 20): array
+    public static function getUserOrders(int $userId, int $page = 1, int $pageSize = 20, $itemId = null): array
     {
-        return MexOrderLogic::getUserOrders($userId, $page, $pageSize);
+        return MexOrderLogic::getUserOrders($userId, $page, $pageSize, $itemId);
     }
 
     /**
      * 获取订单详情
-     * 
+     *
      * @param int $userId 用户ID
      * @param int $orderId 订单ID
      * @return array|null 订单详情
@@ -90,7 +90,7 @@ class MexOrderService
 
     /**
      * 获取待撮合的买入订单
-     * 
+     *
      * @param int $itemId 商品ID
      * @param int $limit 限制数量
      * @return array 订单列表