1、补充员工字段；

.idea/workspace.xml

@@ -1,10 +1,10 @@
 <?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、关联查询排序问题；">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/controller/home/products.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/products.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 default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1、热卖-新品-销量-库存 排序；">
+      <change beforePath="$PROJECT_DIR$/app/models/mysql/user_login_logs.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/mysql/user_login_logs.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/schedule/dayUsers.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/schedule/dayUsers.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -274,14 +274,7 @@
       <workItem from="1693448014632" duration="596000" />
       <workItem from="1693618204645" duration="54000" />
       <workItem from="1693965606793" duration="9192000" />
-      <workItem from="1694742935995" duration="8978000" />
-    </task>
-    <task id="LOCAL-00029" summary="1.商品补充规格sku；">
-      <created>1673014755284</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1673014755284</updated>
+      <workItem from="1694742935995" duration="10004000" />
     </task>
     <task id="LOCAL-00030" summary="1.rearrange code；">
       <created>1673053043473</created>
@@ -619,7 +612,14 @@
       <option name="project" value="LOCAL" />
       <updated>1694759399533</updated>
     </task>
-    <option name="localTasksCounter" value="78" />
+    <task id="LOCAL-00078" summary="1、热卖-新品-销量-库存 排序；">
+      <created>1694762212337</created>
+      <option name="number" value="00078" />
+      <option name="presentableId" value="LOCAL-00078" />
+      <option name="project" value="LOCAL" />
+      <updated>1694762212337</updated>
+    </task>
+    <option name="localTasksCounter" value="79" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -665,7 +665,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.餐店和普通客户区别分佣比例；" />
     <MESSAGE value="1.查询所有餐店；" />
     <MESSAGE value="1.补充限制付款订单才能分发电子餐费；" />
     <MESSAGE value="1.调整限制兑酒红包的使用；" />
@@ -690,7 +689,8 @@
     <MESSAGE value="1、每日用户登录数量查询；" />
     <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>

app/models/mysql/user_login_logs.js

@@ -35,6 +35,10 @@ module.exports = app => {
       type: DataTypes.TIME,
       allowNull: true,
     },
+    is_employee: {
+      type: DataTypes.INTEGER(1).UNSIGNED,
+      allowNull: true,
+    },
   }, {
     tableName: 'szj_users_login_logs',
   });

app/models/mysql/users.js

@@ -90,6 +90,10 @@ module.exports = app => {
       type: DataTypes.INTEGER(1).UNSIGNED,
       allowNull: true,
     },
+    is_employee: {
+      type: DataTypes.INTEGER(1).UNSIGNED,
+      allowNull: true,
+    },
     partner_id: {
       type: DataTypes.INTEGER(11),
       allowNull: true,

app/schedule/dayUsers.js

@@ -37,7 +37,7 @@ class dayUsers extends Subscription {
       const users = await that.app.model.Users.findAll({
         where: { update_ttime: { [seq.Op.between]: [ `${that.app.szjcomo.date('Y-m-d', tmpTime)} 00:00:00`, `${that.app.szjcomo.date('Y-m-d', tmpTime)} 23:59:59` ] } },
         order: [[ 'update_ttime', 'asc' ]],
-        attributes: [ 'user_id', 'nickname', 'headimgurl', 'login_time', 'update_ttime' ],
+        attributes: [ 'user_id', 'nickname', 'headimgurl', 'login_time', 'update_ttime', 'is_employee' ],
       });
       const result = JSON.parse(JSON.stringify(users));
       // 2023/8/27 批量创建用户登录记录