Lawsun 1 gadu atpakaļ
vecāks
revīzija
eaab5d4024

+ 12 - 17
.idea/workspace.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1、用户统计详情;">
+    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1、我邀请的用户活跃列表;">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/controller/home/statistic.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/statistic.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/models/mysql/rel_user_inviter.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/mysql/rel_user_inviter.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/models/mysql/users.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/mysql/users.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/routers/home/shop.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/routers/home/shop.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -260,14 +255,7 @@
       <workItem from="1690506765249" duration="16389000" />
       <workItem from="1691058586577" duration="6589000" />
       <workItem from="1691547091961" duration="8363000" />
-      <workItem from="1691635063702" duration="14049000" />
-    </task>
-    <task id="LOCAL-00023" summary="1.记录显示红包/分佣来源用户信息;">
-      <created>1670992932618</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1670992932618</updated>
+      <workItem from="1691635063702" duration="14800000" />
     </task>
     <task id="LOCAL-00024" summary="1.rearrange code;">
       <created>1671158424385</created>
@@ -605,7 +593,14 @@
       <option name="project" value="LOCAL" />
       <updated>1691246300647</updated>
     </task>
-    <option name="localTasksCounter" value="72" />
+    <task id="LOCAL-00072" summary="1、我邀请的用户活跃列表;">
+      <created>1691747306397</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1691747306397</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -651,7 +646,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.修复餐币发放数量错误的bug;" />
     <MESSAGE value="1.增加合作餐店列表接口;" />
     <MESSAGE value="1.补充餐店经纬度位置;2.补充餐店订单更新排名;" />
     <MESSAGE value="1.补充餐店排序字段;" />
@@ -676,7 +670,8 @@
     <MESSAGE value="1.gte 大于等于 ;" />
     <MESSAGE value="1、统计;" />
     <MESSAGE value="1、用户统计详情;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、用户统计详情;" />
+    <MESSAGE value="1、我邀请的用户活跃列表;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、我邀请的用户活跃列表;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 1 - 1
app/controller/home/statistic.js

@@ -142,7 +142,7 @@ module.exports = class StatisticController extends Base {
       // const dataParse = await that.ctx.anyParse();
       // 2023/7/26 查询
       const users = await that.app.model.Users.findAll({
-        attributes: [ 'user_id', 'nickname', 'intergral', 'money', 'commission', 'headimgurl' ],
+        // attributes: [ 'user_id', 'nickname', 'intergral', 'money', 'commission', 'headimgurl' ],
         order: [[ 'intergral', 'desc' ]],
         where: { intergral: { [seq.Op.gte]: 1 } },
       });

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
node_modules/egg-ts-helper/.tmp/eggInfo.json


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels