Merge branch 'colonel' into develop

application/modules/Marketing/controllers/Colonel.php

@@ -210,8 +210,21 @@ class ColonelController extends Base
      */
     public function bill_infoAction()
     {
+        (new ColonelCenterValidate())->validate();
         $params = $this->params;
         $data = PindanActivityInviteOrderService::getPayInfoList($params);
         return $this->success(["result" => $data]);
     }
+
+    /**
+     * 团长分销，下单记录
+     * @throws \App\Exception\custom\ParamException
+     */
+    public function invite_order_recordAction()
+    {
+        (new ColonelCenterValidate())->validate();
+        $params = $this->params;
+        $data = PindanActivityInviteOrderService::getInviteOrderRecord($params);
+        return $this->success(["result" => $data]);
+    }
 }

application/services/marketing/PindanActivityInviteOrderService.php

@@ -7,6 +7,7 @@ use App\Models\marketing\mysql\ColonelDistributorColonel;
 use App\Models\marketing\mysql\ColonelDistributorInviteOrder;
 use App\Models\marketing\mysql\ColonelDistributorInviteOrderNum;
 use App\Models\marketing\mysql\ColonelDistributorPayInfo;
+use App\Services\user\UserService;
 
 class PindanActivityInviteOrderService
 {
@@ -211,4 +212,52 @@ class PindanActivityInviteOrderService
         }
         return array_values($res);
     }
+
+    /**
+     * 团长分销，下单记录
+     * @param array $params
+     * @return array
+     */
+    public static function getInviteOrderRecord($params = [])
+    {
+        $userId = $params["user_id"];
+        $lastId = empty($params["last_id"]) ? "" : $params["last_id"];
+        $limit = empty($params["page_size"]) ? 10 : $params["page_size"];
+
+        $where = [];
+        $where["colonel_user_id"] = $userId;
+        $where["LIMIT"] = $limit;
+        $where["ORDER"] = ["invite_order_id" => "DESC"];
+
+        if (!empty($lastId)) {
+            $where["invite_order_id[<]"] = $lastId;
+        }
+
+        $list = ColonelDistributorInviteOrder::select(["invite_order_id", "user_id", "is_refund"], $where, []);
+        if (!empty($list)) {
+            $userIds = array_unique(array_column($list, "user_id"));
+            $userList = UserService::userWechatBind(["user_id"=>$userIds]);
+            if (!empty($userList)) {
+                $userList = array_column($userList, null, "user_id");
+            }
+
+            $count = count($list);
+            foreach ($list as $key => $item) {
+                if (!empty($userList[$item["user_id"]])) {
+                    $list[$key]["user_nick"] = $userList[$item["user_id"]]["user_nick"];
+                    $list[$key]["user_avatar"] = $userList[$item["user_id"]]["user_avatar"];
+                } else {
+                    $list[$key]["user_nick"] = "";
+                    $list[$key]["user_avatar"] = "";
+                }
+                $lastId = $item["invite_order_id"];
+            }
+            if ($count < $limit) {
+                $lastId = "-1";
+            }
+        } else {
+            $lastId = "-1";
+        }
+        return ["list" => $list, "last_id" => $lastId];
+    }
 }
\ No newline at end of file