客户端-京东服务商从京推推换成官方

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

@@ -5,13 +5,13 @@ namespace app\controller\api\store\product;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserThirdRepository;
 use think\App;
-use crmeb\basic\BaseController;
+// use crmeb\basic\BaseController;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Log;
 
-class Jd extends BaseController
+class Jd
 {
     public $appid = '';
     public $key = '';
@@ -23,11 +23,15 @@ class Jd extends BaseController
     public function __construct(App $app)
     {
 
-        parent::__construct($app);
-        $this->appid = '4100076550';
-        $this->key = '5ce3da55dc739b6e7d9021d59618c5faa3b4030f41c5699658c7ca30cfd19f09b4046d606d196f1d';
-        $this->appKey = 'a2ad5078501e928b991cd8aaeb0446dc';
-        $this->secretKey = 'fd8aab59e9b94d9e889cb22838c03f2a';
+        // parent::__construct($app);
+        $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 +154,30 @@ 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();
+        [$page, $limit] = [1, 10];
+
+
+        $goods_obj = Db::name('third_party_goods')
+            ->where('type', 2);
+        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();
 
-        [$page, $limit] = $this->getPage();
-        $list = Db::name('third_party_goods')
-            ->where('type', 2)
-            ->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'];
-            $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);
@@ -278,22 +255,46 @@ class Jd extends BaseController
     /*京东商品详情*/
     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,11 +324,26 @@ 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);
+        }
+
+        $third_party_goods_detail = Db::name('third_party_goods')->whereLike('json', '%' . $skuId . '%')->find();
+        $third_party_goods_json_detail = json_decode($third_party_goods_detail['json'], true);
+
+        $url = $this->linkChange($third_party_goods_json_detail['materialUrl'], 1592, $third_party_goods_json_detail['coupon_money'][0]['link'] ?? '');
+
+        return app("json")->success(['url' => $url]);
+    }
+
     /*转链*/
     public function linkChange($url, $uid,$couponUrl)
     {
@@ -347,8 +363,9 @@ class Jd extends BaseController
             'promotionCodeReq' => [
                 'materialId' => $url,
                 'siteId'     => $this->appid,
-                'positionId' => pow(11, 5) + $uid, //自定义,和订单关联
-                'couponUrl'  => $couponUrl
+                'positionId' => pow(10, 5) + $uid, //自定义,和订单关联
+                'couponUrl'  => $couponUrl,
+                'sceneId' => 1
             ],
         ];
         $result = $this->getUrlResult($apiName, $params);
@@ -365,117 +382,138 @@ class Jd extends BaseController
         set_time_limit(0);
 
         $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', //超市卡
+            // '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', //超市卡
         ];
-        Log::info("===============get_jd_goods_list===================");
-//        $eliteIdList = [1];
         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']);
+            $page = 1;
+            $yema = 1; // 初始化为1确保至少执行一次
+            do {
+                $result = $this->jd_query($eliteId, $page);
+                // 首次请求时更新总页数
+                if ($page === 1 && isset($result['totalCount'])) {
+                    $yema = (int)ceil($result['totalCount'] / 50);
                 }
-            }
+                // 处理有效数据
+                if (isset($result['data']) && $result['data']) {
+                    $this->formatGoodsList($result['data'], $eliteId);
+                }
+                exit();
+                $page++;
+            } while ($page <= $yema);
         }
         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' => 50,
             ]
         ];
         $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) {
+            // 优惠券信息
+            if (empty($goods['couponInfo']['couponList'])) continue;
+            $maxCoupon = [];
+            foreach ($goods['couponInfo']['couponList'] as $coupon) {
+                if ($maxCoupon === [] || $coupon['discount'] > $maxCoupon['discount']) {
+                    $maxCoupon = $coupon;
+                }
+            }
+            $couponMoney = [
+                [
+                    'discount' => $maxCoupon['discount'],//优惠券金额
+                    'getStartTime' => date('Y-m-d', intval($maxCoupon['getStartTime'] / 1000)),
+                    'getEndTime' => date('Y-m-d', intval($maxCoupon['getEndTime'] / 1000)),
+                ]
+            ];
+
+            // 券后佣金，（促销价-优惠券面额）*佣金比例
             $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){
+            // $oldMoney = app()->make(ProductRepository::class)->yanglaojin(0, $commissionMoney);
+            $yongjin = bcmul($commissionMoney, bcsub(1, 0.0038, 5), 2);
 
-            }
-            $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));
             $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'] ?? [],
+                '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($yongjin, 0.3, 2),
+
+                'commission' => $commissionMoney,//佣金
+                'commission_rate' => $goods['commissionInfo']['commissionShare'] ?? '',//佣金比例
+                'coupon_money' => $couponMoney,
+                'coupon_link' => $maxCoupon['link'],
                 'lowestCouponPrice' => decimal2($goods['priceInfo']['lowestCouponPrice']), //券后价lowestCouponPrice
-                'price'             => $goods['priceInfo']['price'], //价格
-                'imageList'         => array_column($goods['imageInfo']['imageList'], 'url'), //图片合集
+                '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;
     }
 
     /*订单获取(时间段,时间不能超过一小时)*/

route/api.php

@@ -377,18 +377,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');
         //淘宝详情立即购买
@@ -1024,23 +1012,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');