后台会员和订单修改

app/api/controller/v1/Login.php

@@ -140,9 +140,9 @@ class Login extends BaseController
 
         $time = time();
         /*$tokenData = @json_decode(@crypto_decrypt(base64_decode($post['token']), 'xxlm'),true);
-        //注册token大于30分钟或者超过30分钟
+        //没有token或者超过30分钟
         if(empty($tokenData) || ($time - $tokenData['time']) > 30 * 60){
-            return app('json')->fail("验证过期,请重新注册");
+            return app('json')->fail("验证码过期，请重新获取");
         }*/
 
         //判断是否被注册了

app/api/controller/v1/Order.php

@@ -291,8 +291,8 @@ class Order extends BaseController
                 }else{
                     (new Member)->where('uid', $request->user['uid'])->save(['admin_id' => 100]);
                 }
-            }
-            (new Member)->where('uid', $request->user['uid'])->save(['last_con_time' => time()]);*/
+            }*/
+            (new Member)->where('uid', $request->user['uid'])->save(['last_con_time' => time()]);
 
             return app('json')->success(['msg' => '支付成功']);
         } else {

app/api/controller/v1/Weixin.php

@@ -64,6 +64,22 @@ class Weixin extends BaseController
         }
     }
 
+    /**
+     * 小程序获取手机号
+     */
+    public function getPhone(Request $request)
+    {
+        $post = UtilService::getMore([
+            ['code', '', 'empty', '参数错误'],
+            ['iv', ''],
+            ['encryptedData', '']
+        ]);
+        $mini = Factory::miniProgram(config('weixin')['mini_program']);
+        $new_mini = $mini->auth->session($post['code']);
+        $phone = $mini->encryptor->decryptData($new_mini['session_key'], $post['iv'], $post['encryptedData']);
+        dump($phone);
+    }
+
     /**
      * 小程序授权登录
      * @param Request $request
@@ -77,7 +93,7 @@ class Weixin extends BaseController
         $post = UtilService::getMore([
             ['code', '', 'empty', '参数错误'],
             ['iv', ''],
-            ['encryptedData', ''],
+            ['encryptedData', '']
         ]);
         try {
             $mini = Factory::miniProgram(config('weixin')['mini_program']);
@@ -300,6 +316,7 @@ class Weixin extends BaseController
                         ]);
                         //改子订单状态
                         OrderInfo::where('o_id', $order['id'])->save(['status' => 1,]);
+                        Member::where('uid', $order['uid'])->save(['last_con_time' => time()]);
                     }
                     if ($data2['type'] == 'recharge') {
                         $recharge = new Recharge();

app/api/route/weixin.php

@@ -13,6 +13,8 @@ use think\Response;
 Route::group('weixin',function () {
     //微信 sdk 配置
     Route::rule('config', 'v1.weixin/jssdk');
+    //小程序获取手机号
+    Route::rule('getPhone', 'v1.weixin/getPhone');
     //用户登录
     Route::rule('result', 'v1.weixin/result');
     //微信支付回调

app/model/api/MemberDetail.php

@@ -61,7 +61,7 @@ class MemberDetail extends BaseModel
      * @param $uid
      * @param $param
      */
-    public function recharge($money,$uid,$param = [],$sassid){
+    public function recharge($money,$uid,$param = []){
         try {
             self::beginTrans();
             $param['time'] = date('Y-m-d H:i:s');
@@ -73,7 +73,6 @@ class MemberDetail extends BaseModel
             $post['title']   = $this->config['recharge']['code'];
             $post['content'] = $content;
             $post['type']    = 1;
-            $post['sassid']  = $sassid;
             $post['time']    = time();
             $post['money']   = (new Member)->where('uid', $uid)->value('money') + $money;
             $this->insert($post);
@@ -98,7 +97,7 @@ class MemberDetail extends BaseModel
      * @param $uid
      * @param $param
      */
-    public function refund($money,$uid,$param = [],$sassid){
+    public function refund($money,$uid,$param = []){
         try {
             self::beginTrans();
             $param['time'] = date('Y-m-d H:i:s');
@@ -110,7 +109,6 @@ class MemberDetail extends BaseModel
             $post['title']   = $this->config['refund']['code'];
             $post['content'] = $content;
             $post['type']    = 1;
-            $post['sassid']  = $sassid;
             $post['time']    = time();
             $post['money']   = (new Member)->where('uid', $uid)->value('money') + $money;
             $this->insert($post);
@@ -172,7 +170,7 @@ class MemberDetail extends BaseModel
      * @param $sassid
      * @return bool
      */
-    public function adminInc($money,$uid,$param,$sassid,$type){
+    public function adminInc($money,$uid,$param,$type){
         try {
             self::beginTrans();
             $param['time'] = date('Y-m-d H:i:s');
@@ -184,7 +182,6 @@ class MemberDetail extends BaseModel
             $post['title']   =  $this->config[ $type == 'add' ? 'admin_add' : 'admin_jdd' ]['code'];
             $post['content'] = $content;
             $post['type']    = $type == 'add' ? 1 : 2;
-            $post['sassid']  = $sassid;
             $post['time']    = time();
             if($type == 'add')
                 $post['money']   = (new Member)->where('uid', $uid)->value('money') + $money;

app/model/api/Recharge.php

@@ -23,14 +23,13 @@ class Recharge extends BaseModel
             return false;
         }
         //bool
-        $bool = (new MemberDetail)->recharge($data['v'],$data['uid'],[],$data['sassid']);
+        $bool = (new MemberDetail)->recharge($data['v'],$data['uid'],[]);
         if(!$bool) {
             return false;
         }
         //是否升级
         $mData = (new Member)->where('uid',$data['uid'])->find();
         $siteLevel = Db::name("site_level")
-                    ->where('sass_id',$data['sassid'])
                     ->where('level_id','>',$mData['levelid'])
                     ->where('update_money','<=',$data['v'])
                     ->where('update_money','>',0)

app/model/system/Member.php

@@ -27,15 +27,14 @@ class Member extends BaseModel
      */
     public function getList($page,$where = [],$pageCount = 20,$filed = '*',$desc = ''){
         $data =  $this
-            ->field("m.*,s.name as site_name,l.name as level_name,
-            (select count(*) from table_order where uid = m.uid and status > 0) as order_count,
-            (select sum(v) from table_recharge where status = 1 and uid = m.uid ) as recharge_count,
-            (select count(*) from table_order_info where status > 0 and uid = m.uid ) as order_info_count,
-            (select nickname from table_member where uid = m.i_uid) as i_nickname
-            "
+            ->field(
+                "m.*,l.name as level_name,
+                (select count(*) from table_order where uid = m.uid and status > 0) as order_count,
+                (select sum(v) from table_recharge where status = 1 and uid = m.uid ) as recharge_count,
+                (select count(*) from table_order_info where status > 0 and uid = m.uid ) as order_info_count,
+                (select nickname from table_member where uid = m.i_uid) as i_nickname"
             )
             ->alias("m")
-            ->join('site s','s.sassid=m.sassid')
             ->leftJoin("member_level l","l.id=m.levelid")
             ->when(!empty($where),function ($query) use($where){
                 //keyword
@@ -105,16 +104,6 @@ class Member extends BaseModel
                     $query->where('m.follow_type',$where['follow_type']);
                 }
 
-
-                if(!empty($where['sassid'])) {
-                    //判断是否多个
-                    $sassIds = explode(',',(string)$where['sassid']);
-                    if(count($sassIds) > 1)
-                        $query->whereIn('m.sassid',$sassIds);
-                    else
-                        $query->where('m.sassid',$where['sassid']);
-                }
-
                 if(!empty($where['i_uid'])) {
                     $query->where('m.i_uid',$where['i_uid']);
                 }
@@ -158,7 +147,7 @@ class Member extends BaseModel
             ->order($desc)
             ->paginate(['list_rows'=>$pageCount,'page'=>$page])
             ->toArray();
-       //  echo $this->getLastSql();
+        //echo $this->getLastSql();
         return [$data['total'],$data['data']];
     }
 

app/model/system/Order.php

@@ -19,23 +19,19 @@ class Order extends BaseModel
      * @param $desc
      */
     public function getList($page,$where = [],$pageCount = 20,$filed = '*',$desc = 'id desc'){
-        $data =  $this
-            ->field("o.*,pf.name as platfrom_name,st.name as site_name,p.title as pro_title,p.img as pro_img,
-                m.mobile,m.avatar,
+        $data = $this
+            ->field(
+                "o.*,p.store_name as pro_title,p.image as pro_img,m.mobile,m.avatar,
                 (select count(*) from table_order_info where o_id = o.id) as order_count,
                 (select count(*) from table_order_info where o_id = o.id and status = 2) as send_count,
                 (SELECT title from table_express where id = o.express_id) as exp_name,
-                (SELECT name from table_warehouse where id = o.warehouse_id) as  ck_name
-                "
+                (SELECT name from table_warehouse where id = o.warehouse_id) as ck_name"
             )
             ->alias("o")
-            ->join('platform pf',"pf.id=o.platform_id")
+            //->join('platform pf',"pf.id=o.platform_id")
             ->join('member m','m.uid=o.uid')
+            ->leftJoin('product p',"p.id = o.pro_id")
             ->when(!empty($where),function ($query) use($where){
-                //分站
-                if(!empty($where['sassid'])) {
-                    $query->where('o.sassid',$where['sassid']);
-                }
                 //用户
                 if(!empty($where['uid'])) {
                     $query->where('o.uid',$where['uid']);
@@ -83,12 +79,10 @@ class Order extends BaseModel
                     }
                 }
             })
-            ->leftJoin('product p',"p.id = o.pro_id")
-            ->leftJoin('site st',"st.sassid=o.sassid")
             ->order($desc)
             ->paginate(['list_rows'=>$pageCount,'page'=>$page])
             ->toArray();
-//        echo $this->getLastSql();exit;
+        //echo $this->getLastSql();exit;
         return [$data['total'],$data['data']];
     }
 
@@ -104,22 +98,18 @@ class Order extends BaseModel
      */
     public function getPushList($page,$where = [],$pageCount = 20,$filed = '*',$desc = 'id desc'){
         $data =  $this
-            ->field("o.*,pf.name as platfrom_name,st.name as site_name,p.title as pro_title,p.img as pro_img,
-                m.mobile,m.avatar,
+            ->field(
+                "o.*,p.store_name as pro_title,p.image as pro_img,m.mobile,m.avatar,
                 (select count(*) from table_order_info where o_id = o.id) as order_count,
                 (select count(*) from table_order_info where o_id = o.id and is_push = 1) as push_count,
                 (SELECT title from table_express where id = o.express_id) as exp_name,
-                (SELECT name from table_warehouse where id = o.warehouse_id) as  ck_name
-                "
+                (SELECT name from table_warehouse where id = o.warehouse_id) as  ck_name"
             )
             ->alias("o")
-            ->join('platform pf',"pf.id=o.platform_id")
+            //->join('platform pf',"pf.id=o.platform_id")
             ->join('member m','m.uid=o.uid')
+            ->leftJoin('product p',"p.id = o.pro_id")
             ->when(!empty($where),function ($query) use($where){
-                //分站
-                if(!empty($where['sassid'])) {
-                    $query->where('o.sassid',$where['sassid']);
-                }
                 //用户
                 if(!empty($where['uid'])) {
                     $query->where('o.uid',$where['uid']);
@@ -147,12 +137,10 @@ class Order extends BaseModel
                     $query->where('o.status','>',0);
                 }
             })
-            ->leftJoin('product p',"p.id = o.pro_id")
-            ->leftJoin('site st',"st.sassid=o.sassid")
             ->order($desc)
             ->paginate(['list_rows'=>$pageCount,'page'=>$page])
             ->toArray();
-//        echo $this->getLastSql();exit;
+        //echo $this->getLastSql();exit;
         return [$data['total'],$data['data']];
     }
 

app/model/system/OrderInfo.php

@@ -46,7 +46,7 @@ class OrderInfo extends BaseModel
         $data =  $this
             ->field("of.*,(SELECT title from table_express where id = of.exp_id) as exp_name,".
                 "(select order_id from table_order where id = of.o_id) as order_id,".
-                "(select title from table_product where id = of.pro_id) as pro_title")
+                "(select store_name from table_product where id = of.pro_id) as pro_title")
             ->alias("of")
             ->when(!empty($where),function ($query) use($where){
                 if(!empty($where['sassid'])) {

app/system/controller/v1/Member.php

@@ -1,17 +1,7 @@
 <?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | Author: TABLE ME
-// +----------------------------------------------------------------------
-// | Date: 2020-08-31 20:43
-// +----------------------------------------------------------------------
 
 namespace app\system\controller\v1;
 
-
 use app\BaseController;
 use app\model\api\MemberDetail;
 use app\model\system\Member as MemberModel;
@@ -21,7 +11,7 @@ use library\services\UtilService;
 use library\utils\IpLocation;
 use app\Request;
 
-class Member extends  BaseController
+class Member extends BaseController
 {
     /**
      *
@@ -35,7 +25,6 @@ class Member extends  BaseController
             ['page',1],
             ['keyword',''],
             ['i_uid',''],
-            ['sassid',''],
             ['mobile',''],
             ['level',''],
             ['uid',''],
@@ -48,22 +37,19 @@ class Member extends  BaseController
             ['lately_login',''],
             ['type','']
         ]);
-        list($pageCount,$data) = (new MemberModel())
-            ->getList($post['page'],$post,$pageSize,'*','uid desc');
+        list($pageCount,$data) = (new MemberModel)->getList($post['page'],$post,$pageSize,'*','uid desc');
         $result = UtilService::getParam([
             'uid',
             'mobile',
             'label',
-            'weixin_name',
+            'wechat',
             'nickname',
             'sex',
             'avatar',
-            'address',
             'money',
             'name',
             "tx_money",
             "level_name",
-            "site_name",
             'status',
             'follow_type',
             'levelid',
@@ -71,10 +57,8 @@ class Member extends  BaseController
             'recharge_count',
             'order_info_count',
             ['last_con_time','last_con_time','getLastTime($1)'],
-          //  'i_mobile',
             'i_nickname',
             'i_uid',
-            'sassid',
             'regip',
             ['regtime','regtime','date("Y-m-d H:i:s",$1)'],
             ['lasttime','lasttime','date("Y-m-d H:i:s",$1)'],
@@ -91,14 +75,11 @@ class Member extends  BaseController
         ]);
     }
 
-
-
     public function down(Request $request) {
         $where = UtilService::getMore([
             ['page',1],
             ['keyword',''],
             ['i_uid',''],
-            ['sassid',''],
             ['mobile',''],
             ['level',''],
             ['uid',''],
@@ -112,16 +93,14 @@ class Member extends  BaseController
             ['type','']
         ]);
         $data = (new MemberModel())
-
-            ->field("m.*,s.name as site_name,l.name as level_name,
-            (select count(*) from table_order where uid = m.uid and status > 0) as order_count,
-            (select sum(v) from table_recharge where status = 1 and uid = m.uid ) as recharge_count,
-            (select count(*) from table_order_info where status > 0 and uid = m.uid ) as order_info_count,
-            (select nickname from table_member where uid = m.i_uid) as i_nickname
-            "
+            ->field(
+                "m.*,l.name as level_name,
+                (select count(*) from table_order where uid = m.uid and status > 0) as order_count,
+                (select sum(v) from table_recharge where status = 1 and uid = m.uid ) as recharge_count,
+                (select count(*) from table_order_info where status > 0 and uid = m.uid ) as order_info_count,
+                (select nickname from table_member where uid = m.i_uid) as i_nickname"
             )
             ->alias("m")
-            ->join('site s','s.sassid=m.sassid')
             ->leftJoin("member_level l","l.id=m.levelid")
             ->when(!empty($where),function ($query) use($where){
                 //keyword
@@ -179,7 +158,6 @@ class Member extends  BaseController
                     }
                 }
 
-
                 if(!empty($where['mobile'])) {
                     $query->whereLike('m.mobile',"%{$where['mobile']}%");
                 }
@@ -192,16 +170,6 @@ class Member extends  BaseController
                     $query->where('m.follow_type',$where['follow_type']);
                 }
 
-
-                if(!empty($where['sassid'])) {
-                    //判断是否多个
-                    $sassIds = explode(',',(string)$where['sassid']);
-                    if(count($sassIds) > 1)
-                        $query->whereIn('m.sassid',$sassIds);
-                    else
-                        $query->where('m.sassid',$where['sassid']);
-                }
-
                 if(!empty($where['i_uid'])) {
                     $query->where('m.i_uid',$where['i_uid']);
                 }
@@ -249,26 +217,22 @@ class Member extends  BaseController
         $result = UtilService::getParam([
             'uid',
             'mobile',
-            'weixin_name',
+            'wechat',
             'nickname',
             'sex',
             'avatar',
-            'address',
             'money',
             'name',
             "tx_money",
             "level_name",
-            "site_name",
             'status',
             'follow_type',
             'levelid',
             'order_count',
             'recharge_count',
             'order_info_count',
-            //  'i_mobile',
             'i_nickname',
             'i_uid',
-            'sassid',
             'regip',
             ['regtime','regtime','date("Y-m-d H:i:s",$1)'],
             ['lasttime','lasttime','date("Y-m-d H:i:s",$1)'],
@@ -329,7 +293,7 @@ class Member extends  BaseController
         ]);
         list($pageCount,$data) = (new MemberLevel())
             ->getList($post['page'],[function($query) use($post){
-                
+
         }
         ],$pageSize,'*','id desc');
         $result = UtilService::getParam([
@@ -475,7 +439,6 @@ class Member extends  BaseController
                 $post['money'],
                 $post['uid'],
                 ['time'=>date('Y-m-d'),'money'=>$post['money'],'mono'=>empty($post['mono']) ? '无': $post['mono']],
-                $member['sassid'],
                 $post['type']
             );
         }
@@ -485,7 +448,6 @@ class Member extends  BaseController
                 $post['money'],
                 $post['uid'],
                 ['time'=>date('Y-m-d'),'money'=>$post['money'],'mono'=>empty($post['mono']) ? '无': $post['mono']],
-                $member['sassid'],
                 $post['type']
             );
         }
@@ -544,7 +506,7 @@ class Member extends  BaseController
                 ['type','0'],
             ],$request
         );
-        $user = (new \app\model\system\Member)->where('uid',$post['uid'])->find();
+        $user = MemberModel::where('uid',$post['uid'])->find();
         if(empty($user))
             return app('json')->fail('参数错误');
         $memberFollow = new MemberFollow;
@@ -554,13 +516,12 @@ class Member extends  BaseController
             'content' => $post['content'],
             'admin_id' => $this->request->adminInfo['id'],
             'time' => time(),
-            'sassid' =>$user['sassid'],
             'type' => $post['type']
         ]);
-        (new \app\model\system\Member)->where('uid',$post['uid'])->save(['follow_type'=>$post['type'],'last_follow_time'=>time()]);
+        MemberModel::where('uid',$post['uid'])->save(['follow_type'=>$post['type'],'last_follow_time'=>time()]);
 
         return app("json")->success('操作成功');
 
     }
 
-}
+}

app/system/controller/v1/Order.php

@@ -16,17 +16,7 @@ use think\db\exception\DbException;
 use think\Exception;
 use think\facade\Db;
 
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | Author: TABLE ME
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:53
-// +----------------------------------------------------------------------
-
-class Order extends  BaseController
+class Order extends BaseController
 {
     /**
      * 获取订单数据
@@ -59,10 +49,8 @@ class Order extends  BaseController
             "order_count",
             "all_price",
             "status",
-            "platfrom_name",
             "ck_name",
             "exp_name",
-            "site_name",
             "pro_title",
             "send_count",
             "uid",
@@ -105,10 +93,8 @@ class Order extends  BaseController
             "order_count",
             "all_price",
             "status",
-            "platfrom_name",
             "ck_name",
             "exp_name",
-            "site_name",
             "pro_title",
             "push_count",
             "pro_img",
@@ -373,7 +359,7 @@ class Order extends  BaseController
                 'order_id'  =>  $order['order_id'],
                 'count'     =>  $count,
                 'money'     =>  $order['all_price']
-                ],$order['sassid']);
+                ]);
             //改订单状态
             (new OrderModel)->where('id',$order['id'])->save(['status' => -2]);
             (new OrderInfo)->where('o_id', $order['id'])->save(['status'=> -2]);
@@ -417,7 +403,7 @@ class Order extends  BaseController
                 'order_id'  =>  $order['in_order_id'],
                 'count'     =>  1,
                 'money'     =>  $order['money']
-            ],$order['sassid']);
+            ]);
             $res2 = (new OrderInfo)->where('id', $order['id'])->save(['status'=>-2]);
             //生成操作记录
             $res3 = (new OrderMono)->insert([

config/sms.php

@@ -10,8 +10,8 @@
 // +----------------------------------------------------------------------
 return [
 
-    'Sign'       => '飞播礼品',
+    'Sign'       => '星选联盟',
     'SmsAppId'   => '1400424312',
     'SecretId'   =>  'AKIDDUV6MBoZN61g864FQLzqITN1XaPyPbx2',
     'SecretKey'  => 'PbWAYATVuEMDoyttdC57vRo75mBIPHbo'
-];
+];