Merge branch 'dev' into dev-sxb

# Conflicts:
#	app/common/repositories/user/UserRepository.php

app/common/dao/store/product/ProductDao.php

@@ -124,20 +124,9 @@ class ProductDao extends BaseDao
         $query -> where("type != 7");
         $query->withSearch($keyArray, $whereArr);
 
-        if($mer_type==1 && $merId==324){
-            $merIds=Db::name('merchant')->where('mer_type',1)->column('mer_id');
-            //一壶茶会员专区
-            $query->when($merIds, function ($query) use ($merIds) {
-                $query->whereIn('mer_id', $merIds);
-            });
-        }else{
-            $query->when(($merId !== null), function ($query) use ($merId) {
-                $query->where('mer_id', $merId);
-            });
-        }
-
-
-        $query->when(isset($where['hot_type']) && $where['hot_type'] !== '', function ($query) use ($where) {
+        $query->when(!empty($merId), function ($query) use ($merId) {
+            $query->where('mer_id', $merId);
+        })->when(isset($where['hot_type']) && $where['hot_type'] !== '', function ($query) use ($where) {
             if ($where['hot_type'] == 'new')
                 $query->where('is_new', 1);
             else if ($where['hot_type'] == 'hot')
@@ -165,16 +154,7 @@ class ProductDao extends BaseDao
             unset($where['keyword']);
         })->when(isset($where['volunteer']),function ($query) use ($where){
             $query-> where('volunteer',$where['volunteer']);
-        });
-        $source = request()->header('source');
-        $merId= request()->header('merId');
-        if($source=='yhc' && $merId){
-//            $query->where('spu_id = "" || spu_id is null');
-//            $query->where('type',17);
-            $query->where('is_good',1);
-        }
-
-        $query->when(isset($where['order']),function($query)use($where){
+        })->when(isset($where['order']),function($query)use($where){
             $query->when(in_array($where['order'], ['is_new', 'price_asc', 'price_desc', 'rate', 'sales', 'create_time']), function ($query) use ($where) {
                 if ($where['order'] == 'price_asc') {
                     $where['order'] = 'price ASC';

app/common/middleware/UserTokenMiddleware.php

@@ -42,11 +42,11 @@ class UserTokenMiddleware extends BaseMiddleware
              * @var UserRepository $repository
              */
             $repository = app()->make(UserRepository::class);
+            $repository->checkToken($token);
             $service = new JwtTokenService();
             try {
                 $payload = $service->parseToken($token);
             } catch (ExpiredException $e) {
-                $repository->checkToken($token);
                 $payload = $service->decode($token);
             } catch (Throwable $e) {//Token 过期
                 throw new AuthException('token 已过期');

app/common/repositories/store/order/StoreOrderRepository.php

@@ -3852,7 +3852,7 @@ class StoreOrderRepository extends BaseRepository
 
         $order_sn = $order["order_sn"];
         log::info("进入添加养老金{$order['order_sn']}");
-        $tongji = Db::name("user_bill")->where("order_sn", $order_sn)->count();
+        $tongji = Db::name("user_bill")->where("order_sn", $order_sn)->where('type_shop', $type_shop)->count();
         if ($tongji) {
             //第三方订单状态修改
             log::info("tongji");

app/common/repositories/system/merchant/MerchantRepository.php

@@ -426,6 +426,7 @@ class MerchantRepository extends BaseRepository
         $arr=[];
         foreach ($list["list"] as $v){
             $k= app()->make(ProductRepository::class)->pvParm($v['product_id']);
+            $productMerId = $v['mer_id'] ?? 0;
 //            $v['special_merchant']= merchantConfig($v['mer_id'], 'special_merchant');
 
             log::info("==========yang= {$k['yanglao']} ");
@@ -454,7 +455,7 @@ class MerchantRepository extends BaseRepository
                 $num_yl = 8000;
             }
 
-            if($merId == 496){
+            if($productMerId == 496){
 
                 $v['yanglao'] = bcmul($num_yl, 0.035, 2);
                 $v['pv'] = bcmul($num_yl, 0.7, 2);
@@ -468,7 +469,7 @@ class MerchantRepository extends BaseRepository
                     ]
                 ];
 
-            }else if($merId == 439 || $is_commercetrade){
+            }else if($productMerId == 439 || $is_commercetrade){
                 //精彩生活和商贸区
                 $jf = $v['price'] - bcmul($v['concession_pri'],0.3, 2) . ' + ' . bcmul($v['concession_pri'],0.3, 2);
                 $jd = $v['price'] - bcmul($v['concession_pri'],0.35, 2) . ' + ' . bcmul($v['concession_pri'],0.35, 2);
@@ -480,7 +481,7 @@ class MerchantRepository extends BaseRepository
                     $v['jifen'] = bcmul($v['concession_pri'], 0.35, 2);
                     $v['gongxian'] = bcmul($v['concession_pri'], 0.35, 2);
                 }
-            }else if($merId == 491){
+            }else if($productMerId == 491){
                 // 获取商品sku
                 $productSku = Db::name('store_product_attr_value')->where('product_id', $v['product_id'])->order('price asc')->find();
                 $pv = $productSku['plate_mer_profit']??0.00;

app/common/repositories/user/UserRepository.php

@@ -1443,7 +1443,7 @@ class UserRepository extends BaseRepository
         if (!$has)
             throw new AuthException('无效的token');
         $lastTime = Cache::get('user_' . $token);
-        if (($lastTime + intval(Config::get('admin.token_valid_exp', 15)) * 60) > time())
+        if (($lastTime + intval(Config::get('admin.token_valid_exp', 15)) * 60) < time())
             throw new AuthException('token 已过期');
     }
 
@@ -4486,6 +4486,26 @@ class UserRepository extends BaseRepository
     }
 
     /**
+     * 添加用户操作记录
+     * @param $uid
+     * @param $model
+     * @param $type
+     * @param $mark
+     * @return void
+     */
+    public function createUserOperatingRecord($uid, $model, $type, $mark)
+    {
+        Db::name('user_operating_record')->insert([
+            'uid' => $uid,
+            'operation_model' => $model,
+            'operation_type' => $type,
+            'mark' => $mark,
+            'operation_time' => date('Y-m-d H:i:s')
+        ]);
+    }
+
+
+    /**
      * @param int $uid
      * @return UserEntity
      */

app/common/repositories/user/UserThirdRepository.php

@@ -232,6 +232,7 @@ class UserThirdRepository extends BaseRepository
                 "table"=>$table
             ];
 
+            /** @var StoreOrderRepository $StoreOrderRepository */
             $StoreOrderRepository = app()->make(StoreOrderRepository::class);
 //            $StoreOrderRepository->yugu_rebate($order);
             log::info("===待进入养老金22222222222");

app/controller/api/Auth.php

@@ -472,7 +472,10 @@ class Auth extends BaseController
         $tokenInfo = $repository->createToken($user);
 
         $repository->loginAfter($user);
-
+        $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_model', 1)->where('operation_type', 1)->find();
+        if (!$useragree){
+            $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+        }
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
@@ -502,6 +505,8 @@ class Auth extends BaseController
             return app('json')->fail('验证码不正确');
         }
 
+        cache()->set("sms_verified_" . $data['phone'], true, 60);
+
         $user = $repository->accountByUser($data['phone']);
         if ($user)
             return app('json')->fail('手机号已存在');
@@ -514,7 +519,7 @@ class Auth extends BaseController
             }
         }
         // Log::info($data);
-        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
+        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,0);
         // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);
@@ -538,26 +543,66 @@ class Auth extends BaseController
 //                }
 //            }
 //        }
-        if ($type == "marketing"){
-            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
-            $spread_list = explode(',',$spread['spread_list']);
-            if (!empty($spread_list)){
-                $spread_list[] = "[" . $spread['uid'] . "]";
-            }else{
-                array_push($spread_list,"[".$spread['uid']."]");
-            }
-            $spread_list = array_filter($spread_list);
-            $data = [
-                "uid" => $user->uid,
-                "spread_uid" => $spread['uid'],
-                "spread_list" => implode(",",$spread_list)
-            ];
-            Db::name("MarketingUser") -> insert($data);
+//        if ($type == "marketing"){
+//            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
+//            $spread_list = explode(',',$spread['spread_list']);
+//            if (!empty($spread_list)){
+//                $spread_list[] = "[" . $spread['uid'] . "]";
+//            }else{
+//                array_push($spread_list,"[".$spread['uid']."]");
+//            }
+//            $spread_list = array_filter($spread_list);
+//                    $data = [
+//                "uid" => $user->uid,
+//                "spread_uid" => $spread['uid'],
+//                "spread_list" => implode(",",$spread_list)
+//            ];
+//            Db::name("MarketingUser") -> insert($data);
+//        }
+
+        $result = $repository->returnToken($user, $tokenInfo);
+        $result['uid'] = $user->uid;
+        $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+        return app('json')->success($result);
+
+    }
+
+    /**
+     * 用户注册后绑定邀请人
+     */
+    public function registerBindSpread(UserRepository $repository)
+    {
+        $data = $this->request->params(['uid', 'spread_phone']);
+        $user = Db::name('user')->where('uid', $data['uid'])->field('uid,spread_uid')->find();
+        if (!$user) {
+            return app('json')->fail('注册失败,用户不存在');
+        }
+        if (empty($data['spread_phone'])) {
+            return app('json')->fail('推荐人手机号不能为空');
+        }
+        $spread_user = Db::name('user')->where('phone', $data['spread_phone'])->field('uid')->find();
+        if (!$spread_user) {
+            return app('json')->fail('推荐人手机号不存在');
+        }
+        if(empty($data['uid'])==$user['uid']){
+            return app('json')->fail('不能绑定自己为推荐人');
         }
 
-        return app('json')->success($repository->returnToken($user, $tokenInfo));
+        $spreadUid = $spread_user['uid'];//绑定推荐人
+        Db::name('user')->where('uid', $user['uid'])->update(['spread_uid'  => $spreadUid, 'spread_time' => date('Y-m-d H:i:s')]);
+
+        //给推荐人下级+1
+        Db::name('user')->where('uid', $spreadUid)->update(['spread_count' => Db::raw('spread_count + 1')]);
+        //积分表更新
+        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 2);
+
+        Cache::zincrby('s_top_' . date('Y-m'), 1, $spreadUid);
+        Cache::zincrby('s_top_' . monday(), 1, $spreadUid);
+        return app('json')->success('绑定成功');
+
     }
 
+
     /**
      * 手机号找回密码
      * @param UserRepository $repository
@@ -1361,28 +1406,48 @@ class Auth extends BaseController
 
     public function verify(UserAuthValidate $validate)
     {
-        $data = $this->request->params(['phone', 'code', 'key',"type", 'areaCode']);
+        $data = $this->request->params(['phone', 'code', 'key',"type"]);
         $validate->sceneVerify()->check($data);
         log::info("发送短信方法");
+        if ($data['type']=="login"){
+            $count=Db::name("user")->where("phone", $data["phone"])->count();
+            if (!$count){
+                return app('json')->make(405, '该手机号未注册,请去注册');
+            }
+            $sms_num_key = 'api.auth.num.' . $data['phone'];
+            $num = Cache::get($sms_num_key) ?: 0;
+            log::info("num{$num}");
+
+            if ($num > 9) {
+                if (!$data['code'])
+                    return app('json')->make(402, '操作过于频繁，请稍后重试~');
+                if (!$this->smslogin($data['phone'], $data['code'])) {
+                    return app('json')->fail('登录验证码输入有误');
+                }
+            }
+        }
+
         if ($data['type']=="register"){
             $count=Db::name("user")->where("phone", $data["phone"])->count();
             if ($count){
-                return app('json')->make(405, '该手机号已注册');
+                return app('json')->make(405, '该手机号已注册,请直接登录');
+            }
+            $sms_num_key = 'api.auth.num.' . $data['phone'];
+            $num = Cache::get($sms_num_key) ?: 0;
+            log::info("num{$num}");
+
+            if ($num > 9) {
+                if (!$data['code'])
+                    return app('json')->make(402, '操作过于频繁，请稍后重试~');
+                if (!$this->registersmscode($data['phone'], $data['code'])) {
+                    return app('json')->fail('注册验证码输入有误');
+                }
             }
         }
-        $sms_num_key = 'api.auth.num.' . $data['phone'];
         $sms_key = 'api.auth.sms.' . $data['phone'];
-        $num = Cache::get($sms_num_key) ? Cache::get($sms_num_key) : 0;
-        log::info("num{$num}" );
-        if ($num > 9) {
-            if (!$data['code'])
-                return app('json')->make(402, '操作过于频繁，请稍后重试~');
-            if (!$this->checkCaptcha($data['key'], $data['code']))
-                return app('json')->fail('验证码输入有误');
-        }
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
-        $res = app()->make(AliYunSmsService::class)->send(($data['areaCode'] ?? '') . $data['phone'],  $sms_code);
+        $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
         if($res['Code']!='OK'){
             Db::name('log')->insert(['data'=>'幸福保短信发送失败：'.json_encode($res,256)]);
             return app('json')->fail('操作过于频繁，请稍后重试~');
@@ -1533,14 +1598,8 @@ class Auth extends BaseController
 
         $user = $repository->accountByUser($data['phone']);
         if (!$user){
-            $data['spread_uid'] = 0;
-            if (intval($data['share_id'])) {
-                $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                $data['spread_uid'] = $spread_uid;
-            }
-            $user = $repository->registr($data['phone'], null, 'h5', '','',1, $data['spread_uid']);
+            return app('json')->fail('手机号未注册，请先注册');
         }
-        $user = $repository->mainUser($user);
 
         // if($this->source=='yhc' && $this->merId){
         //     $where=['mer_id'=>$this->merId,'uid'=>$user->uid];
@@ -1566,9 +1625,36 @@ class Auth extends BaseController
         // $repository->bindSpread($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
+        $useragree = Db::name('user_operating_record')->where('uid', $user->uid)->where('operation_model', 1)->where('operation_type', 1)->find();
+        if (!$useragree){
+            $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+        }
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
+    public function registerSmscode(UserAuthValidate $validate, UserRepository $repository)
+    {
+        $data = $this->request->params(['phone', 'sms_code', 'spread_uid']);
+        $validate->sceneSmslogin()->check($data);
+
+        $count = Db::name('user')->where('phone', $data['phone'])->count();
+        if ($count > 0) {
+            return app('json')->fail('手机号已注册，请直接登录');
+        }
+
+        if (!$this->checkSmsCode($data['phone'], $data['sms_code'])) {
+            return app('json')->fail('验证码不正确');
+        }
+
+        cache()->set("sms_verified_" . $data['phone'], true, 60);
+        return app('json')->success([
+            'msg' => '验证码验证通过，请填写推荐人手机号完成注册',
+            'phone' => $data['phone']
+        ]);
+
+    }
+
+
     public function merJavaRegister(UserRepository $repository){
         $data = $this->request->params(['phone', 'spread','token','sign']);
         Log::channel("gong")->info("供应链取消商品数据：" . json_encode($data));
@@ -1605,7 +1691,7 @@ class Auth extends BaseController
         //log::info("页面传值==={$code}");
         if (!$cache_code = Cache::get($sms_key)) return false;
         if ($code != $cache_code) return false;
-        Cache::delete($sms_key);
+        //Cache::delete($sms_key);
         return true;
     }
     //批量生产100个账号
@@ -1684,31 +1770,37 @@ class Auth extends BaseController
     }
 
 
-    /**
-     * 微信授权登录 一键登录
-     * @return mixed
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     */
-    public function wechatCheck()
-    {
-        $data = $this->request->params(['openid']);
+    /*微信授权登录*/
+    public function wechatCheck(){
+        $data =  $this->request->params(['openid']);
+        // , 'nickname', 'avatar'
         $data['nickname'] = $this->request->param('nickname', null);
         $data['avatar'] = $this->request->param('avatar', null);
 
-        if (!$data['openid'] || $data['openid'] == '' || $data['openid'] == 'undefined') {
+        if(!$data['openid'] || $data['openid'] == '' || $data['openid'] =='undefined'){
             return app('json')->fail("openid参数缺失");
         }
 
-        /** @var UserRepository $repository */
         $repository = app()->make(UserRepository::class);
-        $result = $repository->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
-
-        if (isset($result['code']) && $result['code'] == 200) {
+        if($this->source=='yhc'){
+            $result =  $repository ->wechatCheckYhc($data['openid']);
+        }else{
+            $result =  $repository ->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
+        }
+        if(isset($result['code']) && $result['code'] == 200){
             $user = $repository->accountByUser($result['user']['account']);
+            $useragree = Db::name('user_operating_record')->where('uid', $user->uid)->where('operation_model', 1)->where('operation_type', 1)->find();
+            if (!$useragree){
+                $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+            }
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
+            if($this->source=='yhc'){
+//                $user=$user->toArray();
+                $user->avatar=Db::name('enterprise_user')->where('mer_id',$this->merId)->where('uid',$user['uid'])->value('avatar');
+            }
+
+
             return app('json')->success($repository->returnToken($user, $tokenInfo));
         }
         return app("json")->fail($result['msg']);
@@ -1832,7 +1924,10 @@ class Auth extends BaseController
 
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
-
+            $useragree = Db::name('user_operating_record')->where('uid', $user->uid)->where('operation_type', 1)->where('operation_model', 1)->find();
+            if (!$useragree){
+                $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+            }
             return app('json')->success($repository->returnToken($user, $tokenInfo));
         }else{
             return app('json')->fail("绑定失败");
@@ -1902,7 +1997,7 @@ class Auth extends BaseController
         $ins_data['addtime'] = time();
         $ins_data['status'] = $status;
         $ins_data['mark'] = $mark;
-        $ins_data['type'] = $type;
+        $ins_data['source_type'] = $type;
         $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
         $ins_data['order_id'] = $order_id;
         $ins_data['pm'] = $pm;
@@ -2015,47 +2110,50 @@ class Auth extends BaseController
             }
             $user_res=Db::name('user')->where('account',$phone)->find();
 
+            $isnew = false;
+
             if(!$user_res){
                 $spread_uid=Db::name('product_share')->where('id',$share_id['share_id'])->value('uid');
                 if (!intval($spread_uid)) {
                     $spread_uid = 0;
                 }
                 $repository->registr($phone, 123456,'APP','','','',$spread_uid);
+
+                $isnew = true;
             }
             $user = $repository->accountByUser($phone);
-            // if($this->source=='yhc' && $this->merId){
-            //     $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-            //     $count=Db::name('enterprise_user')->where($where)->count();
-            //     if($count<1){
-            //         $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-            //         $data = $this->request->params(['spread', 'share_id']);
-            //
-            //         if(isset($data['spread']) && $data['spread']){
-            //             $insert['puid']= $data['spread'];
-            //             $insert['node_uid']= $data['spread'];
-            //         }else if(isset($data['share_id']) && $data['share_id']){
-            //             $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-            //             $insert['puid']= $spread_uid;
-            //             $insert['node_uid']= $spread_uid;
-            //         }
-            //         if(!isset($insert['node_uid']) || !$insert['node_uid']){
-            //             return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
-            //         }
-            //
-            //         if(isset($data['spread']) && isset($zhuce)){
-            //             $insert['puid']= $data['spread'];
-            //             $insert['node_uid']= $data['spread'];
-            //         }
-            //         Db::name('enterprise_user')->insert($insert);
-            //     }
-            // }
-            if (!empty($user) && $user instanceof User) {
-                $user = $repository->mainUser($user);
-                $tokenInfo = $repository->createToken($user);
-                return app('json')->success($repository->returnToken($user, $tokenInfo));
-            } else {
-                return app('json')->fail('未查询到用户信息');
+            if($this->source=='yhc' && $this->merId){
+                $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+                $count=Db::name('enterprise_user')->where($where)->count();
+                if($count<1){
+                    $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+                    $data = $this->request->params(['spread', 'share_id']);
+
+                    if(isset($data['spread']) && $data['spread']){
+                        $insert['puid']= $data['spread'];
+                        $insert['node_uid']= $data['spread'];
+                    }else if(isset($data['share_id']) && $data['share_id']){
+                        $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
+                        $insert['puid']= $spread_uid;
+                        $insert['node_uid']= $spread_uid;
+                    }
+                    if(!isset($insert['node_uid']) || !$insert['node_uid']){
+                        return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
+                    }
+
+                    if(isset($data['spread']) && isset($zhuce)){
+                        $insert['puid']= $data['spread'];
+                        $insert['node_uid']= $data['spread'];
+                    }
+                    Db::name('enterprise_user')->insert($insert);
+                }
             }
+            $user = $repository->mainUser($user);
+
+            $tokenInfo = $repository->createToken($user);
+
+            return app('json')->success(array_merge($repository->returnToken($user, $tokenInfo), ['is_new' => $isnew ? 1 : 0]));//如果是注册用户,isnew=1
+
         }catch (Exception $exception){
             Db::name('log')->insert(['data'=>'获取手机号失败--'.$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】']);
         }
@@ -2802,5 +2900,24 @@ class Auth extends BaseController
     
     }
 
+    /**
+     * 将 所有用户 令牌设置为失效
+     * @return \think\response\Json
+     */
+    public function invalidateAllTokens(): \think\response\Json
+    {
+        // 获取所有用户token键（可能需要使用Redis的keys命令或scan）
+        $userTokens = Cache::store('redis')->keys('user_*');
+        $javaTokens = Cache::store('redis')->keys('java_*');
 
+        // 批量删除所有token
+        foreach ($userTokens as $token) {
+            Cache::delete($token);
+        }
+        foreach ($javaTokens as $token) {
+            Cache::delete($token);
+        }
+
+        return app('json')->success($userTokens);
+    }
 }

app/controller/api/store/merchant/Merchant.php

@@ -142,6 +142,50 @@ class Merchant extends BaseController
     }
 
     /**
+     * 获取商户上架的商品列表
+     * @return mixed
+     */
+    public function getProductList()
+    {
+        $params = request()->only(['pageNum', 'pageSize', 'mer_id']);
+        $merId = $params['mer_id'] ?? 0;
+
+        [$page, $limit] = $this->getPage();
+        $where = request()->only(['keyword']);
+        $where['is_gift_bag'] = 0;
+        $where['is_used'] = 1;
+        $where['product_type'] = 0;
+        $where['is_hide'] = 0;
+        $result = $this->repository->productList($merId, $where, $page, $limit, $this->userInfo);
+        $formatList = [];
+        foreach ($result['list'] as $productInfo) {
+            $formatList[] = [
+                'type' => 0,//京东商品
+                'skuId' => '',//itemId 京东官方 已不返回skuId , 使用 联盟商品ID 代替skuId
+                'id' => $productInfo['product_id'] ?? '', //id
+                'name' => $productInfo['store_name'],//名称
+                'thumb' => $productInfo['image'] ?? '',//商品缩略图
+
+                'pv' => $productInfo['pv'],//PV金额
+                'gongxian' => $productInfo['gongxian'],
+                'jifen' => $productInfo['jifen'],
+                'yanglaojin' => $productInfo['yanglao'],
+
+                'commission' => $productInfo['concession_pri'],//佣金
+                'commission_rate' => null,//佣金比例
+                'coupon_money' => [],
+                'coupon_link' => '',
+                'lowestCouponPrice' => $productInfo['price'],
+                'price' => $productInfo['ot_price'], //价格
+                'imageList' => $productInfo['slider_image'], //图片合集
+                'materialUrl' => ''
+            ];
+        }
+        return app('json')->success($formatList);
+    }
+
+
+    /**
      * 商贸区店铺商品列表
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException

app/controller/api/store/merchant/Taskorderguquan.php

@@ -19,58 +19,62 @@ class Taskorderguquan
 
         /**
         补贴下面人员
-        13231658486周行体1000
-        13333069689魏惠新1000
-        13959100621周金花500
-        13701061395李素红500
+        13231658486周行体800
+        13333069689魏   新800
+        13959100621周金花400
+        13701061395李素红300
         17501006833邢艳丽300
         15631982690魏震洪300
-        18603401312黄金花400
+        18603401312黄金花200
         13521438652徐立苹400
         15832971815孟晓玮300
         18600200909陈冠霖300
-        15810064711 王   玲 400
-        13932925303会强400
-        13901074090陈玉刚400
-        13381085923王建军50
+        15810064711 王   玲 300
+        13932925303会强300
+        13901074090陈玉刚300
+        13381085923王建军100
         13601071082隋彩云300
         18001316701闫旭300
         13601179856陈瑞元50
         13161909228刘银霞100
-        18760167163刘春梅50
-        13215917919李小秋50
-        15321221558李伟50
+        18760167163刘春梅100
+        13215917919李小秋100
+        13801358713金波50
+        15321221558李伟 200
         15332507711张传莲50
         15960349667吕丽娣50
-        18612051372李金俭50
+        13231658486周军市场补贴500
+        18612051372李金俭 50
+        15803242611王志敏50
         18715313601大饼400
-        其余部分做分红
         */
         $data = [
-            '13231658486' => 1000,
-            '13333069689' => 1000,
-            '13959100621' => 500,
-            '13701061395' => 500,
+            '13231658486' => 1300,
+            '13333069689' => 800,
+            '13959100621' => 400,
+            '13701061395' => 300,
             '17501006833' => 300,
             '15631982690' => 300,
-            '18603401312' => 400,
+            '18603401312' => 200,
             '13521438652' => 400,
             '15832971815' => 300,
             '18600200909' => 300,
-            '15810064711' => 400,
-            '13932925303' => 400,
-            '13901074090' => 400,
-            '13381085923' => 50,
+            '15810064711' => 300,
+            '13932925303' => 300,
+            '13901074090' => 300,
+            '13381085923' => 100,
             '13601071082' => 300,
             '18001316701' => 300,
             '13601179856' => 50,
             '13161909228' => 100,
-            '18760167163' => 50,
-            '13215917919' => 50,
-            '15321221558' => 50,
+            '18760167163' => 100,
+            '13215917919' => 100,
+            '13801358713' => 50,
+            '15321221558' => 200,
             '15332507711' => 50,
             '15960349667' => 50,
             '18612051372' => 50,
+            '15803242611' => 50,
             '18715313601' => 400
         ];
 

app/controller/api/store/product/Jd.php

@@ -4,8 +4,11 @@ namespace app\controller\api\store\product;
 
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserThirdRepository;
+use app\model\common\JdOrderModel;
+use DateTime;
 use think\App;
 use crmeb\basic\BaseController;
+use think\db\exception\DbException;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
@@ -24,10 +27,14 @@ class Jd extends BaseController
     {
 
         parent::__construct($app);
-        $this->appid = '4100076550';
-        $this->key = '5ce3da55dc739b6e7d9021d59618c5faa3b4030f41c5699658c7ca30cfd19f09b4046d606d196f1d';
-        $this->appKey = 'a2ad5078501e928b991cd8aaeb0446dc';
-        $this->secretKey = 'fd8aab59e9b94d9e889cb22838c03f2a';
+        $this->appid = '4101490811';
+        $this->key = 'a7c43c21f3e156d2fd41dfbe884b9f62592ceb03b9f199c0811c82e35be53c0580a2638a7af39e74';
+        $this->appKey = 'e99703d01cbb6a2e48a8a34f19af9d87';
+        $this->secretKey = 'cea7578d5a314ef88086daa4ee3a5b4d';
+        // $this->appid = '4100076550';
+        // $this->key = '5ce3da55dc739b6e7d9021d59618c5faa3b4030f41c5699658c7ca30cfd19f09b4046d606d196f1d';
+        // $this->appKey = 'a2ad5078501e928b991cd8aaeb0446dc';
+        // $this->secretKey = 'fd8aab59e9b94d9e889cb22838c03f2a';
         $this->userThird = app()->make(UserThirdRepository::class);
         $this->url = 'https://api.jd.com/routerjson';
     }
@@ -150,57 +157,73 @@ class Jd extends BaseController
     /*京粉精选商品查询接口*/
     public function jdList()
     {
-//         [$page, $limit] = $this->getPage();
-//         $apiName = 'jd.union.open.goods.jingfen.query';
-//         $params = [
-//             'goodsReq'=>[
-//                 'eliteId'=>2,
-//                 'pageIndex'=>$page??1,
-//                 'pageSize' =>20,
-//             ]
-//         ];
-//         $result = $this->getUrlResult($apiName,$params);
-//         $result =  json_decode($result,true);
-//         $result =  json_decode($result['jd_union_open_goods_jingfen_query_responce']['result'],true);
-//         $result =$result['data']??[];
-//         $goodsList = [];
-//
-//         foreach ($result as $k=> $goods) {
-//             $goodsList[] = [
-//                 'type' => 6,//京东商品
-//                 'skuId' =>$goods['skuId'],//skuid
-//                 'id' => $goods['brandCode']??'', //id
-//                 'thumb' => $goods['imageInfo']['imageList'][0]['url']??'',//商品缩略图
-//                 'name' => $goods['skuName'],//名称
-//                 'commission' =>app()->make(ProductRepository::class)->yanglaojin(0,$goods['commissionInfo']['commission']??''),//佣金
-//                 'commission_rate' => $goods['commissionInfo']['commissionShare']??'',//佣金比例
-//                 'sales' => "",
-//                 'coupon_money' => $goods['couponInfo']['couponList'] ?? [],
-//                 'lowestCouponPrice' => $goods['priceInfo']['price']??'', //券后价lowestCouponPrice
-//                 'price' => $goods['priceInfo']['price']??'', //价格
-//             ];
-//         }
+        $keyword = request()->param('keyword', '');
+        $_cid = request()->param('cid', '');
 
         [$page, $limit] = $this->getPage();
-        $list = Db::name('third_party_goods')
-            ->where('type', 2)
-            ->page($page, $limit)
-            ->field('json')
-            ->select()
-            ->toArray();
+
+
+        $goods_obj = Db::name('third_party_goods')
+            ->where('type', 2);
+        if ($keyword) {
+            $goods_obj = $goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if ($_cid) {
+            /**
+             * 旧品类标识到新品类eliteId的映射关系
+             *
+             * 映射规则：
+             * 1. 精品(0) -> 精选卖场(2) + 自营热卖榜(41)
+             * 2. 其他品类按最接近的京东新分类映射
+             * 3. 未明确对应的品类映射到通用分类（好券商品+京东好物）
+             */
+            $oldToNewMapping = [
+                // 精品 -> 精选卖场 + 自营热卖榜
+                0 => [2, 41],
+                // 居家日用 -> 家具日用
+                1 => [27],
+                // 食品 -> 超市
+                2 => [25],
+                // 生鲜 -> 超市
+                3 => [25],
+                // 图书 -> 图书文具
+                4 => [30],
+                // 美妆个护 -> 美妆穿搭
+                5 => [28],
+                // 母婴 -> 母婴玩具
+                6 => [26],
+                // 数码家电 -> 数码家电 + 3C新品 + 3C长尾商品
+                7 => [24, 341, 343],
+                // 内衣 -> 京东好物（通用分类）
+                8 => [32],
+                // 配饰 -> 京东好物（通用分类）
+                9 => [32],
+                // 女装 -> 美妆穿搭（服装相关）
+                10 => [28],
+                // 男装 -> 京东好物（通用分类）
+                11 => [32],
+                // 鞋品 -> 京东好物（通用分类）
+                12 => [32],
+                // 家装家纺 -> 家具日用
+                13 => [27],
+                // 文娱车品 -> 图书文具 + 京东好物
+                14 => [30, 32],
+                // 箱包 -> 京东好物（通用分类）
+                15 => [32],
+                // 户外运动 -> 京东好物（通用分类）
+                16 => [32],
+            ];
+            $goods_obj = $goods_obj->whereIn('cid', $oldToNewMapping[$_cid]);
+        }
+        $list = $goods_obj->page($page, $limit)
+            ->select()->toArray();
+
         $formatList = [];
         foreach ($list as $value) {
             $json = json_decode($value['json'], true);
-            $json['pension'] = $json['pension']??'0';
-            $json['pv'] = $json['pension'];
-            $json['yanglaojin'] = $json['pension'];
-
-            // $json['shopName'] = "";
-            // $json['monthSales'] = "0";
-            // $json['cid'] = "0";
-            $json['shopName'] = isset($json['shopName'])?$json['shopName']:"";
-            $json['monthSales'] = isset($json['monthSales'])?$json['monthSales']:0;
-            $json['cid'] = isset($value['cid'])?$json['cid']:0;
+            $json['commission_'] = $json['lowestCouponPrice'];
+            $json['monthSales'] = 0;
+            $json['cid'] = $value['cid'] ?? 0;
             $formatList[] = $json;
         }
         shuffle($formatList);
@@ -210,7 +233,44 @@ class Jd extends BaseController
     /*京粉精选商品查询接口*/
     public function search()
     {
-//        [$page, $limit] = $this->getPage();
+        $keyword = request()->param('keyword', '');
+        $_cid = request()->param('cid', '');
+
+        [$page, $limit] = $this->getPage();
+        try {
+            $uid = $this->request->uid();
+            TaoKe::set_third_history($uid, $keyword);
+        } catch (\Exception $exception) {
+
+        }
+
+        $goods_obj = Db::name('third_party_goods')
+            -> where('type',2);
+        // -> when(!empty($keyword),function($query) use ($keyword) {
+        //     $query -> where('json',"like",'%'.$keyword.'%');
+        // })
+        // -> page($page,$limit)
+        // -> field('json')
+        // -> select()
+        // -> toArray();
+
+        if($keyword){
+            $goods_obj=$goods_obj->where('json', 'like', '%' . $keyword . '%');
+        }
+        if($_cid){
+            $goods_obj=$goods_obj->where('cid', $_cid);
+        }
+        $list=$goods_obj->page($page, $limit)
+            ->select()->toArray();
+
+        $formatList = [];
+        foreach ($list as $value){
+            $formatList[] = json_decode($value['json'],true);
+        }
+        return app("json")->success($formatList);
+
+
+        //        [$page, $limit] = $this->getPage();
 //        $apiName = 'jd.union.open.goods.query';
 //        $keyword = $this->request->param(['keyword']);
 //        $params = [
@@ -245,55 +305,79 @@ class Jd extends BaseController
 //            ];
 //        }
 
-        $keyword = request()->param('keyword', '');
-        [$page, $limit] = $this->getPage();
-        $uid = $this->request->uid();
-        TaoKe::set_third_history($uid, $keyword);
-
-        $list = Db::name('third_party_goods')
-            ->where('type', 2)
-            ->when(!empty($keyword), function ($query) use ($keyword) {
-                $query->where('json', "like", '%' . $keyword . '%');
-            })
-            ->page($page, $limit)
-            ->field('json')
-            ->select()
-            ->toArray();
-        $formatList = [];
-        foreach ($list as $value) {
-	    $json = json_decode($value['json'], true);
-            $json['pension'] = $json['pension']??'0';
-            $json['pv'] = $json['pension']*0.5;
-            $json['yanglaojin'] = $json['pv']*0.05;
-
-            $json['shopName'] = "";
-            $json['monthSales'] = "0";
-            $json['cid'] = "0";
-            $formatList[] = $json;
-        }
-        return app("json")->success($formatList);
+        // $keyword = request()->param('keyword', '');
+        // [$page, $limit] = $this->getPage();
+        // $uid = $this->request->uid();
+        // TaoKe::set_third_history($uid, $keyword);
+        //
+        // $list = Db::name('third_party_goods')
+        //     ->where('type', 2)
+        //     ->when(!empty($keyword), function ($query) use ($keyword) {
+        //         $query->where('json', "like", '%' . $keyword . '%');
+        //     })
+        //     ->page($page, $limit)
+        //     ->field('json')
+        //     ->select()
+        //     ->toArray();
+        // $formatList = [];
+        // foreach ($list as $value) {
+	    // $json = json_decode($value['json'], true);
+        //     $json['pension'] = $json['pension']??'0';
+        //     $json['pv'] = $json['pension']*0.5;
+        //     $json['yanglaojin'] = $json['pv']*0.05;
+        //
+        //     $json['shopName'] = "";
+        //     $json['monthSales'] = "0";
+        //     $json['cid'] = "0";
+        //     $formatList[] = $json;
+        // }
+        // return app("json")->success($formatList);
     }
 
 
     /*京东商品详情*/
     public function jdDetail()
     {
-
         try {
-            $sku = $this->request->param(['skuId']);
-            $apiName = 'jd.union.open.goods.promotiongoodsinfo.query';
-            $params = [
-                'skuIds' => $sku['skuId'],
+            $sku = request()->param('skuId', '');
+            if (empty($sku)) {
+                return app('json')->fail('商品下架不存在', null, 401);
+            }
+            // 老版本
+            // $apiName = 'jd.union.open.goods.promotiongoodsinfo.query';
+            // $params = [
+            //     'skuIds' => $sku['skuId'],
+            // ];
+            // $result = $this->getUrlResult($apiName, $params);
+            // $result = json_decode($result, true);
+            // $result = json_decode($result['jd_union_open_goods_promotiongoodsinfo_query_responce']['queryResult'], true);
+            // $result = $result['data'][0] ?? [];
+            // $goodsDetail = $this->doGetJtDetail($result);
+
+            $third_party_goods_detail = Db::name('third_party_goods')
+                ->whereLike('json', '%' . $sku . '%')
+                ->find();
+            $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
+            $formatData = [
+                'goodsName' => $third_party_goods_json_detail['name'],
+                'imgUrl' => $third_party_goods_json_detail['imageList'][0],
+                'unitPrice' => $third_party_goods_json_detail['price'],//原价
+                'wlUnitPrice' => $third_party_goods_json_detail['lowestCouponPrice'],
+                'couMoney' => $third_party_goods_json_detail['coupon_money'][0]['discount'],
+                'nowPrice' => $third_party_goods_json_detail['lowestCouponPrice'],//现价
+                'detail' => $third_party_goods_json_detail['imageList'],
+
+                'commission' => $third_party_goods_json_detail['commission'],
+                'pv' => $third_party_goods_json_detail['pv'],
+                'yanglaojin' => $third_party_goods_json_detail['yanglaojin'],
+                'gongxian' => $third_party_goods_json_detail['gongxian'],
+                'jifen' => $third_party_goods_json_detail['jifen'],
+                'discount_link' => $third_party_goods_json_detail['coupon_link'],
+                'materialUrl' => ''
             ];
-            $result = $this->getUrlResult($apiName, $params);
-            $result = json_decode($result, true);
-            $result = json_decode($result['jd_union_open_goods_promotiongoodsinfo_query_responce']['queryResult'], true);
-            $result = $result['data'][0] ?? [];
-            $goodsDetail = $this->doGetJtDetail($result);
-            return app("json")->success($goodsDetail);
-        } catch (\Exception $e) {
-            Db::name('log')->insert(['data'=>'微信审核------'.$e->getMessage().$e->getFile().$e->getLine()]);
 
+            return app("json")->success([$formatData]);
+        } catch (\Exception $e) {
             return app('json')->fail('商品下架不存在', null, 401);
         }
     }
@@ -323,13 +407,32 @@ class Jd extends BaseController
         ];
 //        var_dump($third_party_goods_json_detail['coupon_money'][0]['link']);
         //加入转链地址
-        $formatData['materialUrl'] = $this->linkChange($goodsDetail['materialUrl'], $this->request->uid(), $third_party_goods_json_detail['coupon_money'][0]['link'] ?? '');;
+        $formatData['materialUrl'] = $this->linkChange($goodsDetail['materialUrl'], $this->request->uid(), $third_party_goods_json_detail['coupon_money'][0]['link'] ?? '');
         $return[] = $formatData;
         return $return;
     }
 
+    public function changLinkApi()
+    {
+        $skuId = request()->param('skuId', '');
+        if (empty($skuId)) {
+            return app('json')->fail('商品下架不存在', null, 401);
+        }
+        $uid = $this->request->uid();
+        if (empty($uid)) {
+            return app('json')->fail('请重新登录', null, 401);
+        }
+        $third_party_goods_detail = Db::name('third_party_goods')->where('type', '=', 2)->whereLike('json', '%' . $skuId . '%')->find();
+        $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
+
+        $subUnionId = (int)($third_party_goods_json_detail['commission'] * 1000) . '_' . (int)($third_party_goods_json_detail['yanglaojin'] * 1000);
+        $url = $this->linkChange($third_party_goods_json_detail['materialUrl'], $uid, $third_party_goods_json_detail['coupon_link'] ?? '', $subUnionId);
+
+        return app("json")->success(['url' => $url]);
+    }
+
     /*转链*/
-    public function linkChange($url, $uid,$couponUrl)
+    public function linkChange($url, $uid,$couponUrl, $subUnionId)
     {
 
         if (!$uid) {
@@ -347,8 +450,10 @@ class Jd extends BaseController
             'promotionCodeReq' => [
                 'materialId' => $url,
                 'siteId'     => $this->appid,
-                'positionId' => pow(11, 5) + $uid, //自定义,和订单关联
-                'couponUrl'  => $couponUrl
+                'positionId' => $uid, //自定义,和订单关联
+                'couponUrl'  => $couponUrl,
+                'sceneId' => 1,
+                'subUnionId' => $subUnionId
             ],
         ];
         $result = $this->getUrlResult($apiName, $params);
@@ -366,169 +471,255 @@ class Jd extends BaseController
 
         $eliteIdList = [
             '1', //好券商品
-            '2', //精选卖场
-            '10', //9.9包邮
-            '15', //京东配送
-            '22', //实时热销榜
-//            '23', //为你推荐
-            '24', //数码家电
-            '25', //超市
-            '26', //母婴玩具
-            '27', //家具日用
-            '28', //美妆穿搭
-            '30', //图书文具
-            '31', //今日必推
-            '32', //京东好物
-            '33', //京东秒杀
-            '34', //拼购商品
-            '40', //高收益榜
-            '41', //自营热卖榜
-//            '108', //秒杀进行中
-            '109', //新品首发
-            '110', //自营
-            '112', //京东爆品
-            '125', //首购商品
-            '129', //高佣榜单
-//            '130', //视频商品
-//            '153', //历史最低价商品榜
-//            '238', //新人价商品
-//            '315', //秒杀未开始
-            '341', //3C新品
-            '342', //智能新品
-            '343', //3C长尾商品
-            '345', //时尚新品
-            '346', //时尚爆品
-//            '1001', //选品库
-//            '515', //订单接龙商品
-//            '519', //官方活动
-            '12254', //超级补贴
-            '12318', //便宜包邮
-            '12339', //超市卡
+            // '2', //精选卖场
+            // '10', //9.9包邮
+            // '15', //京东配送
+            // '22', //实时热销榜
+            // //            '23', //为你推荐
+            // '24', //数码家电
+            // '25', //超市
+            // '26', //母婴玩具
+            // '27', //家具日用
+            // '28', //美妆穿搭
+            // '30', //图书文具
+            // '31', //今日必推
+            // '32', //京东好物
+            // '33', //京东秒杀
+            // '34', //拼购商品
+            // '40', //高收益榜
+            // '41', //自营热卖榜
+            // //            '108', //秒杀进行中
+            // '109', //新品首发
+            // '110', //自营
+            // '112', //京东爆品
+            // // '125', //首购商品
+            // '129', //高佣榜单
+            // //            '130', //视频商品
+            // //            '153', //历史最低价商品榜
+            // //            '238', //新人价商品
+            // //            '315', //秒杀未开始
+            // '341', //3C新品
+            // // '342', //智能新品
+            // '343', //3C长尾商品
+            // // '345', //时尚新品
+            // // '346', //时尚爆品
+            // //            '1001', //选品库
+            // //            '515', //订单接龙商品
+            // //            '519', //官方活动
+            // '12254', //超级补贴
+            // // '12318', //便宜包邮
+            // '12339', //超市卡
         ];
-        Log::info("===============get_jd_goods_list===================");
-//        $eliteIdList = [1];
+        $maxExecutionTime = 1800; // 最大执行时间5分钟
+        $startTime = time();
+
         foreach ($eliteIdList as $eliteId) {
-            $jq_query=$this->jd_query($eliteId,1);
-            $yema=(int)ceil($jq_query['totalCount']/50);
-            for ($page = 1; $page <= $yema; $page++) {
-                $result=$this->jd_query($eliteId,$page);
-                if(isset($result['data']) && $result['data']){
-                    $this->formatGoodsList($result['data']);
-                }
+            // 检查是否超时
+            if (time() - $startTime > $maxExecutionTime) {
+                log::info("JD API error (eliteId:{$eliteId}): timeout");
+                break; // 或记录日志
+            }
+
+            $page = 1;
+            $maxPage = 1; // 默认值
+
+            Db::startTrans();
+            try {
+                // 清除数据
+                Db::name("third_party_goods")->where('type', '=', 2)->where('cid', '=', $eliteId)->delete();
+                do {
+                    try {
+                        $result = $this->jd_query($eliteId, $page);
+                        // 安全退出条件
+                        if (empty($result) || !is_array($result)) {
+                            break;
+                        }
+                        // 首次请求获取总页数
+                        if ($page === 1 && isset($result['totalCount'])) {
+                            // $maxPage = max(1, (int)ceil($result['totalCount'] / 50));
+                        }
+                        // 处理数据
+                        if (!empty($result['data'])) {
+                            // 写入数据
+                            $this->formatGoodsList($result['data'], $eliteId);
+                        }
+                        $page++;
+                    } catch (\Exception $e) {
+                        // 记录错误并继续下一个分类
+                        log::info("JD API error (eliteId:{$eliteId}, page:{$page}): " . $e->getMessage());
+                        break;
+                    }
+                } while ($page <= $maxPage);
+                Db::commit();
+            } catch (DbException $e) {
+                Db::startTrans();
             }
         }
+
         return 'ok';
     }
     //请求京东联盟接口描述：京东联盟精选优质商品，每日更新，可通过频道ID查询各个频道下的精选商品。用获取的优惠券链接调用转链接口时，需传入搜索接口link字段返回的原始优惠券链接，切勿对链接进行任何encode、decode操作，否则将导致转链二合一推广链接时校验失败。
-    public function jd_query($eliteId,$page){
+    public function jd_query($eliteId, $page)
+    {
         $apiName = 'jd.union.open.goods.jingfen.query';
         $params = [
             'goodsReq' => [
-                'eliteId'   => $eliteId,
+                'eliteId' => $eliteId,
                 'pageIndex' => $page ?? 1,
-                'pageSize'  => 50,
+                'pageSize' => 10,
             ]
         ];
         $result = $this->getUrlResult($apiName, $params);
         $result = json_decode($result, true);
 
         $result = json_decode($result['jd_union_open_goods_jingfen_query_responce']['queryResult'], true);
-//        $result = $result['data'] ?? [];
+        //        $result = $result['data'] ?? [];
         return $result;
     }
 
     //格式化从京东联盟获取到的商品列表
-    public function formatGoodsList($goodsList)
+    public function formatGoodsList($goodsList, $eliteId)
     {
         $install = [];
         foreach ($goodsList as $goods) {
-            $commissionMoney = $goods['commissionInfo']['couponCommission'] ?? 0;
-            //养老金
-            $oldMoney = app()->make(ProductRepository::class)->yanglaojin(0, $commissionMoney);
-//            var_dump($goods);
-//            return;
-            if ($oldMoney < 0.1) continue;
-            if (!isset($goods['couponInfo']['couponList'][0])) continue;
-            foreach ($goods['couponInfo']['couponList'] as $coupon){
+            // 售价
+            if (!isset($goods['priceInfo']['price'])) {
+                continue;
+            }
 
+            // 获取最优优惠券信息
+            // 优惠券信息
+            $maxCoupon = [];
+            if (!empty($goods['couponInfo']['couponList'])) {
+                foreach ($goods['couponInfo']['couponList'] as $coupon) {
+                    // isBest 最优 优惠券
+                    if ($coupon['isBest'] == 1) {
+                        $maxCoupon = [
+                            'discount' => $coupon['discount'],//优惠券金额
+                            'getStartTime' => date('Y-m-d', intval($coupon['getStartTime'] / 1000)),
+                            'getEndTime' => date('Y-m-d', intval($coupon['getEndTime'] / 1000)),
+                            'link' => $coupon['link'],
+                            'useStartTime' => date('Y-m-d', intval($coupon['useStartTime'] / 1000)),
+                            'useEndTime' => date('Y-m-d', intval($coupon['useEndTime'] / 1000)),
+                        ];
+                        break;
+                    }
+                }
+            }
+
+            // 最低到手价
+            $purchasePrice = $goods['priceInfo']['price'];
+            // 券后价
+            if (!empty($maxCoupon['discount'])) {
+                // 拥有优惠券
+                $purchasePrice = bcsub($goods['priceInfo']['price'], $maxCoupon['discount'], 2);
+            }
+            // 到手价
+            if (!empty($goods['purchasePriceInfo']['purchasePrice']) && $goods['purchasePriceInfo']['purchasePrice'] < $purchasePrice) {
+                $purchasePrice = $goods['purchasePriceInfo']['purchasePrice'];
             }
-            $goods['couponInfo']['couponList'][0]['getStartTime'] = date('Y-m-d', intval($goods['couponInfo']['couponList'][0]['getStartTime'] / 1000));
-            $goods['couponInfo']['couponList'][0]['getEndTime'] = date('Y-m-d', intval($goods['couponInfo']['couponList'][0]['getEndTime'] / 1000));
+
+            // 券后佣金，（促销价-优惠券面额）*佣金比例
+            $commissionMoney = bcmul($purchasePrice, bcdiv($goods['commissionInfo']['commissionShare'] ?? 0.00, 100, 5), 2);
+            $commissionMoney = bcmul($commissionMoney, 0.8, 2);
+
             $formatList = [
-                'type'              => 6,//京东商品
-                'skuId'             => $goods['skuId'],//skuid
-                'id'                => $goods['brandCode'] ?? '', //id
-                'thumb'             => $goods['imageInfo']['imageList'][0]['url'] ?? '',//商品缩略图
-                'name'              => $goods['skuName'],//名称
-                'commission'        => $oldMoney,//佣金
-                'commission_rate'   => $goods['commissionInfo']['commissionShare'] ?? '',//佣金比例
-                'sales'             => "",
-                'coupon_money'      => $goods['couponInfo']['couponList'] ?? [],
-                'lowestCouponPrice' => decimal2($goods['priceInfo']['lowestCouponPrice']), //券后价lowestCouponPrice
-                'price'             => $goods['priceInfo']['price'], //价格
-                'imageList'         => array_column($goods['imageInfo']['imageList'], 'url'), //图片合集
+                'type' => 6,//京东商品
+                'skuId' => $goods['itemId'] ?? '',//itemId 京东官方 已不返回skuId , 使用 联盟商品ID 代替skuId
+                'id' => $goods['brandCode'] ?? '', //id
+                'name' => $goods['skuName'],//名称
+                'thumb' => $goods['imageInfo']['imageList'][0]['url'] ?? '',//商品缩略图
+
+                'pv' => bcmul($commissionMoney, 0.7, 2),//PV金额
+                'gongxian' => bcmul($commissionMoney, 0.7, 2),
+                'jifen' => bcmul($commissionMoney, 0.7, 2),
+                'yanglaojin' => bcmul($commissionMoney, 0.3, 2),
+
+                'commission' => $commissionMoney,//佣金
+                'commission_rate' => $goods['commissionInfo']['commissionShare'] ?? 0.00,//佣金比例
+                'coupon_money' => empty($maxCoupon) ? [] : [$maxCoupon],
+                'coupon_link' => $maxCoupon['link'] ?? '',
+                'lowestCouponPrice' => $purchasePrice,
+                'price' => $goods['priceInfo']['price'], //价格
+                'imageList' => array_column($goods['imageInfo']['imageList'], 'url'), //图片合集
+                'materialUrl' => $goods['materialUrl']
             ];
-            $install[]=['json' => json_encode($formatList, JSON_UNESCAPED_UNICODE), 'pension' => $oldMoney, 'type' => 2];
-//            Db::name("third_party_goods")->insert(['json' => json_encode($formatList, JSON_UNESCAPED_UNICODE), 'pension' => $oldMoney, 'type' => 2]);
+            $install[] = ['json' => json_encode($formatList, JSON_UNESCAPED_UNICODE), 'pension' => $commissionMoney, 'type' => 2, 'cid' => $eliteId];
         }
-        if($install){
+        if ($install) {
             Db::name("third_party_goods")->insertAll($install);
         }
-
-//        return $formatList;
     }
 
     /*订单获取(时间段,时间不能超过一小时)*/
     public function orderList()
     {
-        $time = $this->request->params([
-            'startTime',
-            'endTime'
-        ]);
-        //自定义时间  每20分钟执行一次查询前半小时的数据
+        // $time = $this->request->params([
+        //     'startTime',
+        //     'endTime'
+        // ]);
+        $time['startTime'] = request()->param('startTime', '');
+        $time['endTime'] = request()->param('endTime', '');
         if (!$time['startTime'] && !$time['endTime']) {
-            $time['startTime'] = date("Y-m-d H:i:s", strtotime("-200 minute"));
-            $time['endTime'] = date('Y-m-d H:i:s');
+            // $time['startTime'] = date("Y-m-d H:i:s", strtotime("-1 hour"));
+            // $time['endTime'] = date('Y-m-d H:i:s');
+            // 获取当前时间
+            $currentTime = new DateTime();
+
+            // 生成时间范围数组
+            $timeRanges = [];
+            for ($i = 0; $i < 30 * 24; $i++) {
+                $endTime = clone $currentTime;
+                $endTime->modify("-$i hour");
+
+                $startTime = clone $endTime;
+                $startTime->modify("-1 hour");
+                $startTime->modify("+1 second");
+
+                $timeRanges[] = [
+                    'startTime' => $startTime->format('Y-m-d H:i:s'),
+                    'endTime' => $endTime->format('Y-m-d H:i:s')
+                ];
+            }
+        } else {
+            $timeRanges[] = $time;
         }
-//        var_dump($time);
         try {
-            $orderLists = [];
-            $page = 1;
-            $pageSize = 40;
-            $apiName = 'jd.union.open.order.row.query';
-            do {
-                $params = [
-                    'orderReq' => [
-                        'pageNo'    => $page,
-                        'pageSize'  => $pageSize,
-                        'type'      => 3,//(1：下单时间，2：完成时间（购买用户确认收货时间），3：更新时间
-                        'startTime' => $time['startTime'],//格式2020-01-02 21:23:00
-                        'endTime'   => $time['endTime'] //格式2020-01-02 21:24:00
-                    ],
-                ];
-                $result = $this->getUrlResult($apiName, $params);
-//                var_dump($result);
-                $result = json_decode($result, true);
-                $result = json_decode($result['jd_union_open_order_row_query_responce']['queryResult'], true);
-                $lists = $result['data'];
-                $countList = count($lists);
-                if (!empty($countList)) {
-                    $orderLists = array_merge($orderLists, $lists);
-                }
+            foreach ($timeRanges as $time) {
+                $orderLists = [];
+                $page = 1;
+                $pageSize = 200;
+                $apiName = 'jd.union.open.order.row.query';
+                do {
+                    $params = [
+                        'orderReq' => [
+                            'pageIndex' => $page,
+                            'pageSize' => $pageSize,
+                            'type' => 3,//(1：下单时间，2：完成时间（购买用户确认收货时间），3：更新时间
+                            'startTime' => $time['startTime'],//格式2020-01-02 21:23:00
+                            'endTime' => $time['endTime'], //格式2020-01-02 21:24:00
+                            'fields' => 'goodsInfo'
+                        ],
+                    ];
+                    $result = $this->getUrlResult($apiName, $params);
+                    $result = json_decode($result, true);
+                    $result = json_decode($result['jd_union_open_order_row_query_responce']['queryResult'], true);
+                    $lists = $result['data'] ?? [];
+                    $countList = count($lists);
+                    if (!empty($countList)) {
+                        $orderLists = array_merge($orderLists, $lists);
+                    }
 
-//                var_dump($result);
-                $page++;
-            } while ($countList == $pageSize);
-            if (!empty($orderLists)) {
-                //格式化从京东拉取的订单列表
-                $formatLists = $this->formatOrderList($orderLists);
-//                var_dump($formatLists);
-                //将京东订单列表中的订单进行处理
-                $this->operatePinOrder($formatLists);
-                return app("json")->success("京东订单写入成功");
-            } else {
-                return app("json")->success("暂无最新数据");
+                    $page++;
+                } while ($countList == $pageSize && $result['hasMore'] ?? false);
+                if (!empty($orderLists)) {
+                    //格式化从京东拉取的订单列表
+                    $formatLists = $this->formatOrderList($orderLists);
+                    //将京东订单列表中的订单进行处理
+                    $this->operatePinOrder($formatLists);
+                }
             }
+            return app("json")->success("京东订单写入成功");
         } catch (\Exception $e) {
             return app("json")->fail($e->getMessage());
         }
@@ -538,8 +729,7 @@ class Jd extends BaseController
     //格式化从京东拉取的订单列表
     public function formatOrderList($orderLists)
     {
-//        $user = app()->make(UserThirdRepository::class);
-        $formatLists = [];
+        $formatList = [];
         foreach ($orderLists as $order) {
             switch ($order['validCode']) {
                 case 15://待付款订单
@@ -554,92 +744,136 @@ class Jd extends BaseController
                 default://失效订单
                     $billStatus = 2;
             }
-            if($order['validCode']==15){ //未支付的不处理
+            if ($order['validCode'] == 15) { //未支付的不处理
                 continue;
             }
             //通过订单关联
             $positionId = $order['positionId'];
-            $userId = $positionId - pow(11, 5);
-            //订单关联推广位ID
-//            $pid = $order['subUnionId'] ?: '';
-            // if (empty($pid)) continue;
-            //订单关联推广位ID
-//            $chanTag = $user->getDetail(['pid' => $order['subUnionId'], 'type' => 6], 'uid,pid');
-            //if(!$chanTag){continue;}
-            $formatLists[] = [
-                'uid'              => $userId,
-                'sku_id'           => $order['skuId'],
-                'jd_id'            => $order['id'],
-                'order_sn'         => $order['orderId'],                              //订单编号
-                'sku_num'          => $order['skuNum'],                               //购买商品的数量
-                'image_url'        => $order['goodsInfo']['imageUrl'] ?? '',
-                'sku_name'         => $order['skuName'],
-                //订单中sku的单件价格，单位为分
-                'price'            => $order['price'],
-                //未知,2.无效-拆单,3.无效-取消,4.无效-京东帮帮主订单,5.无效-账号异常,6.无效-赠品类目不返佣,7.无效-校园订单,
-                //8.无效-企业订单,9.无效-团购订单,11.无效-乡村推广员下单,13.无效-违规订单,14.无效-来源与备案网址不符,
-                //15.待付款,16.已付款,17.已完成（购买用户确认收货）,20.无效-此复购订单对应的首购订单无效,21.无效-云店订单',
-                'status'           => $order['validCode'],
-                //商家信息
-                'shop_id'          => $order['goodsInfo']['shopId'],
-                //订单生成时间
-                'create_time'      => $order['orderTime'] ? $order['orderTime'] : 0,  //下单时间
-                'finish_time'      => $order['finishTime'] ? $order['finishTime'] : 0,//完成时间
-                'modify_time'      => $order['modifyTime'] ? $order['modifyTime'] : 0,//更新时间
-                'sub_union_id'     => $order['subUnionId'],                           //订单关联推广位ID
-                //佣金比例
-                'commission_share' => $order['finalRate'],                            //最终分佣比例
-                //实际佣金
-                'commission'       => $order['estimateFee'],
-                'bill_status'      => $billStatus,        //平台是否结算
-                'type'             => 2
+            $userId = $positionId;
+            if ($userId <= 0) {//拉取的订单没有匹配到用户
+                continue;
+            }
+
+            //订单实际计算佣金的金额（订单完成时，会将误扣除的运费券金额更正，如订单完成后发生退款，此金额会更新）
+            $goodsInfo = $order['goodsInfo'] ?? [];
+            $createTime = strtotime($order['orderTime']);
+            //平台可以进行结算的时间戳=订单创建时间+系统设置的间隔时间
+            $billEndTime = $this->userThird->getSettleTime($createTime);
+
+            $address = Db::name('user_address')->field('code_list,village_id')->where('uid', $userId)->where('is_default', 1)->find();
+
+            $commission = $order['actualFee'] ?: $order['estimateFee'];
+            // 生成推广链接时自定义放里边的参数（佣金_养老金）
+            if (!empty($order['subUnionId'])) {
+                $subUnionIdList = explode('_', $order['subUnionId']);
+                if (!empty($subUnionIdList[0])) {
+                    $commission = bcdiv($subUnionIdList[0], 1000, 2);
+                }
+            }
+            $formatList[] = [
+                'uid' => $userId,
+                'commission' => $commission,//佣金
+                'commission_share' => $order['finalRate'],
+                'order_sn' => $order['orderId'],
+                'pay_money' => $order['actualCosPrice'] ?: $order['estimateCosPrice'],
+                'jd_id' => $order['id'],
+                'create_time' => $order['orderTime'],
+                'finish_time' => $order['finishTime'],//用户确认收货时间
+                'modify_time' => $order['modifyTime'],//更新时间
+                'sku_num' => $order['skuNum'],
+                'sku_id' => $order['itemId'] ?? '', // 目前京东官方不返回 skuId
+                'sku_name' => $order['skuName'],
+                'price' => $order['price'],//原价
+                'sub_union_id' => $order['positionId'],
+                'image_url' => $goodsInfo['imageUrl'] ?? '',
+                'shop_name' => $goodsInfo['shopName'] ?? '京东',
+                'shop_id' => $goodsInfo['shopId'] ?? 0,
+                'status' => $order['validCode'],//订单状态
+                'bill_status' => $billStatus,        //平台是否结算
+                'bill_end_time' => $billEndTime,
+                'user_address_ids' => !empty($address) ? $address['code_list'] . ',' . $address['village_id'] : '',
+                'type' => 1
             ];
         }
-        return $formatLists;
+        return $formatList;
     }
 
     //将拼多多订单列表中的订单写入第三方平台订单表
     public function operatePinOrder($orderLists)
     {
+        /** @var UserThirdRepository $orderThird */
         $orderThird = app()->make(UserThirdRepository::class);
+        $type_shop = 6;
         foreach ($orderLists as $k => $order) {
             if (empty($order)) continue;
             //判断数据库有无此订单
-            $orderVip = $orderThird->getOrderDetail("order_jd", ['order_sn' => $order['order_sn'], 'sub_union_id' => $order['sub_union_id']]);
-            if (!$orderVip) {
-                // 读取商品详情 拿到商品图
-                $third_party_goods_detail = Db::name('third_party_goods')->whereLike('json', '%' . $order['sku_id'] . '%')->find();
-                $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
-                $order['image_url'] =  $third_party_goods_json_detail['thumb']??'';
-
-                $orderThird->createOrder('order_jd', $order, strtotime($order['create_time'])); //订单写入数据库
+            $localOrder = JdOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
+            if (empty($localOrder)) {
+                //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
+                $localOrder = JdOrderModel::create($order);
                 //预估养老金
                 $orderThird->yuguOrder(
-                    $order['jd_id'],
-                    $order['commission'],
-                    $order['uid'],
-                    $order['order_sn'],
-                    6,
+                    $localOrder['order_jd_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop,
                     'order_jd');
                 //预估积分
                 $orderThird->yuguJifen(
-                    $order['jd_id'],
-                    $order['commission'],
-                    $order['uid'],
-                    $order['order_sn'],
-                    6
+                    $localOrder['order_jd_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    $type_shop
                 );
             } else {
-                //更新
-                if ($orderVip['status'] != $order['status']) {
-                    $saveOrderPdd['status'] = $order['status'];
-                    if(isset($order['bill_status'])){
-                        $saveOrderPdd['bill_status'] = $order['bill_status'];
+                if($localOrder['status']!=$order['status']) {
+                    $localOrder->save($order);//更新订单信息
+                    if(!in_array($order['status'],[15,16,17])){
+                        //修改积分和贡献,yanglaojin值记录
+                        $orderThird->updateJilu(
+                            $localOrder['uid'],
+                            $localOrder['order_jd_id'],
+                            $type_shop);
                     }
-                    $orderThird->saveOrder("order_jd", ['order_jd_id' => $orderVip['order_jd_id']], $saveOrderPdd); //修改订单
                 }
             }
 
+            // $orderVip = $orderThird->getOrderDetail("order_jd", ['order_sn' => $order['order_sn'], 'sub_union_id' => $order['sub_union_id']]);
+            // if (!$orderVip) {
+            //     // 读取商品详情 拿到商品图
+            //     $third_party_goods_detail = Db::name('third_party_goods')->whereLike('json', '%' . $order['sku_id'] . '%')->find();
+            //     $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
+            //     $order['image_url'] =  $third_party_goods_json_detail['thumb']??'';
+            //
+            //     $orderThird->createOrder('order_jd', $order, strtotime($order['create_time'])); //订单写入数据库
+            //     //预估养老金
+            //     $orderThird->yuguOrder(
+            //         $order['jd_id'],
+            //         $order['commission'],
+            //         $order['uid'],
+            //         $order['order_sn'],
+            //         6,
+            //         'order_jd');
+            //     //预估积分
+            //     $orderThird->yuguJifen(
+            //         $order['jd_id'],
+            //         $order['commission'],
+            //         $order['uid'],
+            //         $order['order_sn'],
+            //         6
+            //     );
+            // } else {
+            //     //更新
+            //     if ($orderVip['status'] != $order['status']) {
+            //         $saveOrderPdd['status'] = $order['status'];
+            //         if(isset($order['bill_status'])){
+            //             $saveOrderPdd['bill_status'] = $order['bill_status'];
+            //         }
+            //         $orderThird->saveOrder("order_jd", ['order_jd_id' => $orderVip['order_jd_id']], $saveOrderPdd); //修改订单
+            //     }
+            // }
         }
     }
 

app/controller/api/store/product/TaoKe.php

@@ -178,7 +178,7 @@ class TaoKe extends BaseController
         if($keyword && !isset($params['pid'])){
             $params['keyword']=$keyword;
             $params['custom_parameters']="{'new':1}";
-            return app('json')->success('未查询到商品', []);
+            // return app('json')->success('未查询到商品', []);
         }
 
         $params['cat_id'] = $cat_id;

app/controller/api/user/User.php

@@ -857,6 +857,28 @@ class User extends BaseController
     }
 
     /**
+     * 查询商品浏览记录以及删除
+     */
+    public function productHistory(){
+        $uid = $this->request->uid();
+        $list = Db::name('third_history')->where('uid', $uid)->order('create_time', 'desc')->limit(20)->column('keyword','id');
+        return app('json')->success(['count' => count($list), 'list'  => $list]);
+    }
+    public function deleteProductHistory(){
+        $uid = $this->request->uid();
+        $id = $this->request->post('id');
+        $deleted = Db::name('third_history')
+            ->where('id', $id)
+            ->where('uid', $uid)
+            ->delete();
+        if ($deleted) {
+            return app('json')->success('删除成功');
+        } else {
+            return app('json')->fail('删除失败');
+        }
+    }
+
+    /**
      * 签到  获取积分
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException
@@ -2996,9 +3018,19 @@ class User extends BaseController
             'yanglao_a' => round($this->num($dy, 'yanglao_a'), 2),
         );
 
+        // 扣减
+
+        $kouchu = \think\facade\Db::name('user_bill')
+            ->where('pm', '=', 0)
+            ->where('status', '<>', '-1')
+            ->where(['uid' => $uid, 'commission_type' => '5', 'source' => 0])
+            ->sum('number');
+
         $data['all_num'] = $data['offLine']['num'] +$data['onLine_take_no']['num'] + $data['onLine']['num'] + $data['tb']['num'] + $data['jd']['num'] + $data['su']['num'] + $data['pdd']['num'] + $data['vip']['num'] + $data['dy']['num'];
         $data['all_yanglao'] = round($data['offLine']['yanglao']+$data['onLine']['yanglao'] + $data['onLine_take_no']['yanglao'] + $data['tb']['yanglao'] + $data['jd']['yanglao'] + $data['su']['yanglao'] + $data['pdd']['yanglao'] + $data['vip']['yanglao'] + $data['dy']['yanglao'], 2);
+        $data['all_yanglao'] -= $kouchu;
         $data['all_yanglao_a'] = round($data['offLine']['yanglao'] + $data['onLine']['yanglao'] + $data['tb']['yanglao_a'] + $data['jd']['yanglao_a'] + $data['su']['yanglao_a'] + $data['pdd']['yanglao_a'] + $data['vip']['yanglao_a'] + $data['dy']['yanglao_a'], 2);
+        $data['all_yanglao_a'] -= $kouchu;
         $data['third_party_num']=['all_num'=>$data['tb']['num']+$data['jd']['num']+$data['su']['num']+ $data['pdd']['num'] + $data['vip']['num']+ $data['dy']['num']];
         $data['third_party_num_a']=['all_num_a'=>$data['tb']['num_a']+$data['jd']['num_a']+$data['su']['num_a']+ $data['pdd']['num_a'] + $data['vip']['num_a']+ $data['dy']['num_a']];
         $data['third_party_num_n']=['all_num_n'=>$data['third_party_num']['all_num']-$data['third_party_num_a']['all_num_a']];

config/admin.php

@@ -8,7 +8,7 @@
 
 return [
     //token 有效期
-    'token_exp' => 30000, //三小时
+    'token_exp' => 720, //三小时
     //token超时多久可自动续期
     'token_valid_exp' => 15, //15分钟
     //登录验证码有效期

crmeb/services/JwtTokenService.php

@@ -33,7 +33,7 @@ class JwtTokenService
     {
         $time = time();
         $host = app('request')->host();
-        $exp = intval(Config::get('admin.token_ext', 3000));
+        $exp = intval(Config::get('admin.token_exp', 720));
         $params += [
             'iss' => $host,
             'aud' => $host,
@@ -44,7 +44,7 @@ class JwtTokenService
         $params['jti'] = [$id, $type];
         $token = JWT::encode($params, Config::get('app.app_key', 'default'));
         $params['token'] = $token;
-        $params['out'] = 3000 * 60 * 60;
+        $params['out'] = $time + (720 * 60 * 60);
         return $params;
     }
 

route/api.php

@@ -227,6 +227,9 @@ Route::group('api/', function () {
             //浏览记录
             Route::get('history', 'User/history');
             Route::post('history/delete/:id', 'User/deleteHistory');
+            //商品浏览记录以及删除
+            Route::post('productHistory', 'User/productHistory');
+            Route::post('deleteProductHistory', 'User/deleteProductHistory');
             //获取用户签到记录
             Route::get('get_signin', 'User/get_signin');
             //签到
@@ -378,18 +381,6 @@ Route::group('api/', function () {
         //筛选
         Route::get('pdd/search', 'api.store.product.TaoKe/search');
 
-        // 京东
-        if(false){
-            // 京东联盟
-            Route::get('jd/detail', 'api.store.product.Jd/jdDetail');
-            Route::get('jd/search', 'api.store.product.Jd/search');
-        }else{
-            /*京东商品详情*/
-            Route::get('jd/detail', 'api.store.product.Jt/goodsDetail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
-            Route::get('jd/chang_link', 'api.store.product.Jt/changLinkApi')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
-            Route::get('jd/search', 'api.store.product.Jt/search');//京推推
-        }
-
         /*淘宝详情*/
         Route::get('tb/detail/:id', 'api.store.product.TaoBao/goodsDetail');
         //淘宝详情立即购买
@@ -644,6 +635,8 @@ Route::group('api/', function () {
 
     //非强制登录
     Route::group(function () {
+        // 将 所有用户 令牌设置为失效
+        Route::get('invalidateAllTokens', 'api.Auth/invalidateAllTokens');
 
         //商学院管理
         Route::group('business_school', function () {
@@ -736,6 +729,7 @@ Route::group('api/', function () {
             //店铺列表
             Route::get('listindex', 'Merchant/listindex');
             Route::get('/product/lst/:id', 'Merchant/productList');
+            Route::get('/product/getProductList', 'Merchant/getProductList');
             Route::get('/product/type_lst', 'Merchant/productTypeList');//特殊-根据商户查询商品
             Route::get('/product/commerce_list', 'Merchant/commerceProductList');//特殊-根据商户查询商品
             Route::get('/areaProduct/lst', 'Merchant/areaProductList');
@@ -944,6 +938,8 @@ Route::group('api/', function () {
     Route::post('auth/yijianlogin', 'api.Auth/yijianlogin');
     //短信注册
     Route::post('auth/register', 'api.Auth/register');
+    //注册后绑定邀请人
+    Route::post('auth/registerBindSpread', 'api.Auth/registerBindSpread');
     //测试账号
     Route::post('auth/register_all', 'api.Auth/register_all');
     //java商户端调用用户注册
@@ -1025,23 +1021,30 @@ Route::group('api/', function () {
     Route::any('vip/order_update', 'api.store.product.Vip/updateVipOrder');
 
     // 京东
-    if(false){
+    // if(true){
         // 京东联盟
         Route::any('get_jd_goods_list','api.store.product.Jd/get_jd_goods_list');//获取京东联盟商品入库，定时任务
         /*京东列表*/
         Route::get('jd/list', 'api.store.product.Jd/jdList'); // 京东联盟
         Route::get('jd/orderlist', 'api.store.product.Jd/orderList');// 京东联盟
         Route::get('jd/JdMoney', 'api.store.product.JD/JdMoney');
-    }else{
-        /*京东商品详情*/
-        Route::any('get_jd_goods_list','api.store.product.Jt/get_jd_goods_list');//获取京东商品入库，定时任务
-        Route::get('jd/list', 'api.store.product.Jt/goodsList');//京推推
-        Route::get('jd/orderlist', 'api.store.product.Jt/orderRowList');//京推推
-        Route::get('jd/old_jd_order', 'api.store.product.Jt/old_jd_order');//京推推旧订单
-        //京东返利
-        Route::get('jd/JdMoney', 'api.store.product.Jt/JdMoney');
-    }
-
+        // 京东联盟
+        Route::get('jd/detail', 'api.store.product.Jd/jdDetail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);;
+        Route::get('jd/search', 'api.store.product.Jd/search');
+        Route::get('jd/chang_link', 'api.store.product.Jd/changLinkApi')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
+    // }else{
+    //     /*京东商品详情*/
+    //     Route::any('get_jd_goods_list','api.store.product.Jt/get_jd_goods_list');//获取京东商品入库，定时任务
+    //     Route::get('jd/list', 'api.store.product.Jt/goodsList');//京推推
+    //     Route::get('jd/orderlist', 'api.store.product.Jt/orderRowList');//京推推
+    //     Route::get('jd/old_jd_order', 'api.store.product.Jt/old_jd_order');//京推推旧订单
+    //     //京东返利
+    //     Route::get('jd/JdMoney', 'api.store.product.Jt/JdMoney');
+    //     /*京东商品详情*/
+    //     Route::get('jd/detail', 'api.store.product.Jt/goodsDetail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
+    //     Route::get('jd/chang_link', 'api.store.product.Jt/changLinkApi')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);//京推推
+    //     Route::get('jd/search', 'api.store.product.Jt/search');//京推推
+    // }
 
 
     Route::get('tb/material', 'api.store.product.TaoBao/getMaterial');