会员升级

app/services/user/UserBillServices.php

@@ -230,6 +230,29 @@ class UserBillServices extends BaseServices
         return compact('list', 'count');
     }
 
+
+    /**
+     * 获取积分列表
+     * @param int $uid
+     * @param array $where_time
+     * @param string $field
+     * @return array
+     */
+    public function getEnergyList(int $uid = 0, $where_time = [], string $field = '*')
+    {
+        [$page, $limit] = $this->getPageValue();
+        $where = ['category' => 'energy'];
+        if ($uid) $where['uid'] = $uid;
+        if ($where_time) $where['add_time'] = $where_time;
+        $list = $this->dao->getList($where, $field, $page, $limit);
+        foreach ($list as &$item) {
+            $item['number'] = intval($item['number']);
+            $item['balance'] = intval($item['balance']);
+        }
+        $count = $this->dao->count($where);
+        return compact('list', 'count');
+    }
+
     /**
      * 获取签到列表
      * @param int $uid

app/services/user/UserServices.php

@@ -459,6 +459,8 @@ class UserServices extends BaseServices
     {
         /** @var UserWechatuserServices $userWechatUser */
         $userWechatUser = app()->make(UserWechatuserServices::class);
+        /** @var UserAwardIntegralServices $award_integral_service */
+        $award_integral_service = app()->make(UserAwardIntegralServices::class);
         $fields = 'u.*,w.country,w.province,w.city,w.sex,w.unionid,w.openid,w.user_type as w_user_type,w.groupid,w.tagid_list,w.subscribe,w.subscribe_time';
         [$list, $count] = $userWechatUser->getWhereUserList($where, $fields);
         if ($list) {
@@ -538,6 +540,8 @@ class UserServices extends BaseServices
                     }
                 }
                 $item['is_extend_info'] = $is_extend_info;
+                $item['static_integral'] = $award_integral_service->getIntegralSum(['status' => 0, 'type' => 0, 'uid' => $item['uid']]);
+                $item['action_integral'] = $award_integral_service->getIntegralSum(['status' => 0, 'type' => 1, 'uid' => $item['uid']]);
             }
         }
         return compact('count', 'list');
@@ -1452,6 +1456,21 @@ class UserServices extends BaseServices
                 $services = app()->make(UserSpreadServices::class);
                 return $services->getSpreadList(['store_id' => 0, 'staff_id' => 0, 'uid' => $id], '*', ['spreadUser', 'admin'], false);
                 break;
+            case 'static_integral':
+                /** @var UserAwardIntegralServices $award_integral_service */
+                $award_integral_service = app()->make(UserAwardIntegralServices::class);
+                return $award_integral_service->getIntegralList(['type' => 0, 'uid' => $id]);
+                break;
+            case 'action_integral':
+                /** @var UserAwardIntegralServices $award_integral_service */
+                $award_integral_service = app()->make(UserAwardIntegralServices::class);
+                return $award_integral_service->getIntegralList(['type' => 1, 'uid' => $id]);
+                break;
+            case 'energy':
+                /** @var UserBillServices $services */
+                $services = app()->make(UserBillServices::class);
+                return $services->getEnergyList($id, [], 'title,number,balance,mark,add_time');
+                break;
             default:
                 throw new AdminException('type参数错误');
         }