From 038d8ea4a51fae5767851e51500716c6e1fc6472 Mon Sep 17 00:00:00 2001
From: 李忠强 <1354905998@qq.com>
Date: Fri, 14 Jan 2022 19:24:40 +0800
Subject: [PATCH] 更新
---
application/admin/controller/litestore/Litestoregoods.php | 6 +++---
application/api/controller/Notify.php | 7 +++++++
application/api/controller/User.php | 6 ++++--
application/common/library/Auth.php | 8 ++++++--
public/assets/js/backend/litestore/litestoregoods.js | 8 ++++----
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/application/admin/controller/litestore/Litestoregoods.php b/application/admin/controller/litestore/Litestoregoods.php
index 1646e9d..08ad57f 100644
--- a/application/admin/controller/litestore/Litestoregoods.php
+++ b/application/admin/controller/litestore/Litestoregoods.php
@@ -63,13 +63,13 @@ class Litestoregoods extends Backend
}
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$total = $this->model
- ->with(['category','freight'])
+ ->with(['category'])
->where($where)
->order($sort, $order)
->count();
$list = $this->model
- ->with(['category','freight'])
+ ->with(['category'])
->where($where)
->order($sort, $order)
->limit($offset, $limit)
@@ -78,7 +78,7 @@ class Litestoregoods extends Backend
foreach ($list as $row) {
$row->getRelation('category')->visible(['name']);
- $row->getRelation('freight')->visible(['name']);
+// $row->getRelation('freight')->visible(['name']);
}
$list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
diff --git a/application/api/controller/Notify.php b/application/api/controller/Notify.php
index 1cd608a..bd8786b 100644
--- a/application/api/controller/Notify.php
+++ b/application/api/controller/Notify.php
@@ -50,6 +50,13 @@ class Notify extends Api
$skumodel->where('goods_spec_id',$value['goods_spec_id'])->setDec('stock_num',$value['total_num']);
}
}
+
+ // 判断是否邀请成功
+ $user = \app\api\model\User::get($order['user_id']);
+ if ($user['invite_user_id'] > 0 && $user['invite_status'] != 1) {
+ $user->invite_status = '1';
+ $user->isUpdate()->save();
+ }
//你可以在此编写订单逻辑
} catch (Exception $e) {
}
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 9593a13..abd2551 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -91,12 +91,14 @@ class User extends Api
* @param string $code Code码
* @param string $nickname 微信昵称
* @param string $avatar 微信头像
+ * @param string $invite_id 邀请人id。默认传0
*/
public function third()
{
$code = $this->request->post('code');
$nickname = $this->request->post('nickname');
$avatar = $this->request->post('avatar');
+ $invite_id = $this->request->post('invite_id');
if (!$code || !$nickname || !$avatar){
$this->error('后台所需参数缺失请完善参数');
}
@@ -113,10 +115,10 @@ class User extends Api
$third = new \app\api\model\Third();
$userid = $third->where('openid',$wxapi['openid'])->value('user_id');
if ($userid){
- $this->auth->direct($userid);
+ $this->auth->direct($userid,$invite_id);
$this->success('登录成功',['token'=>$this->auth->getToken(),'user_type'=>$this->auth->user_type]);
}else{
- $userid = $this->auth->register($nickname,'','','',['avatar'=>$avatar]);
+ $userid = $this->auth->register($nickname,'','','',['avatar'=>$avatar,'invite_user_id'=>$invite_id,'invite_time'=>time()]);
if ($userid){
$third->isUpdate(false)->save(['openid'=>$wxapi['openid'],'user_id'=>$userid,'session_key'=>$wxapi['session_key']]);
$this->success('登录成功',['token'=>$this->auth->getToken(),'user_type'=>$this->auth->user_type]);
diff --git a/application/common/library/Auth.php b/application/common/library/Auth.php
index 2eca343..649b427 100644
--- a/application/common/library/Auth.php
+++ b/application/common/library/Auth.php
@@ -292,9 +292,10 @@ class Auth
/**
* 直接登录账号
* @param int $user_id
+ * @param int $invite_id 邀请人id
* @return boolean
*/
- public function direct($user_id)
+ public function direct($user_id,$invite_id=0)
{
$user = User::get($user_id);
if ($user) {
@@ -308,7 +309,10 @@ class Auth
$user->successions = $user->logintime < \fast\Date::unixtime('day', -1) ? 1 : $user->successions + 1;
$user->maxsuccessions = max($user->successions, $user->maxsuccessions);
}
-
+ if ($user['invite_status'] !=1 && $invite_id != 0) {
+ $user->invite_user_id = $invite_id;
+ $user->invite_time = time();
+ }
$user->prevtime = $user->logintime;
//记录本次登录的IP和时间
$user->loginip = $ip;
diff --git a/public/assets/js/backend/litestore/litestoregoods.js b/public/assets/js/backend/litestore/litestoregoods.js
index 486beac..f24871c 100644
--- a/public/assets/js/backend/litestore/litestoregoods.js
+++ b/public/assets/js/backend/litestore/litestoregoods.js
@@ -34,11 +34,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','template','litestoreg
{field: 'images', title: __('Images'), formatter: Table.api.formatter.images},
{field: 'spec_type', title: __('Spec_type'), searchList: {"10":__('Spec_type 10'),"20":__('Spec_type 20')}, formatter: Table.api.formatter.normal},
{field: 'deduct_stock_type', title: __('Deduct_stock_type'), searchList: {"10":__('Deduct_stock_type 10'),"20":__('Deduct_stock_type 20')}, formatter: Table.api.formatter.normal},
- {field: 'freight.name', title: __('Freight.name')},
- {field: 'sales_initial', title: __('Sales_initial')},
+ // {field: 'freight.name', title: __('Freight.name')},
+ // {field: 'sales_initial', title: __('Sales_initial')},
{field: 'sales_actual', title: __('Sales_actual')},
- {field: 'goods_sort', title: __('Goods_sort')},
- {field: 'delivery_id', title: __('Delivery_id')},
+ // {field: 'goods_sort', title: __('Goods_sort')},
+ // {field: 'delivery_id', title: __('Delivery_id')},
{field: 'goods_status', title: __('Goods_status'), searchList: {"10":__('Goods_status 10'),"20":__('Goods_status 20')}, formatter: Table.api.formatter.status},
{field: 'is_delete', title: __('Is_delete'), searchList: {"0":__('Is_delete 0'),"1":__('Is_delete 1')}, formatter: Table.api.formatter.normal},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
--
libgit2 0.24.0