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

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

@@ -336,11 +336,14 @@ class Jd extends BaseController
         if (empty($skuId)) {
             return app('json')->fail('商品下架不存在', null, 401);
         }
+        if (empty($this->request->uid())) {
+            return app('json')->fail('请重新登录', null, 401);
+        }
 
-        $third_party_goods_detail = Db::name('third_party_goods')->whereLike('json', '%' . $skuId . '%')->find();
+        $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);
 
-        $url = $this->linkChange($third_party_goods_json_detail['materialUrl'], 1592, $third_party_goods_json_detail['coupon_money'][0]['link'] ?? '');
+        $url = $this->linkChange($third_party_goods_json_detail['materialUrl'], $this->request->uid(), $third_party_goods_json_detail['coupon_money'][0]['link'] ?? '');
 
         return app("json")->success(['url' => $url]);
     }
@@ -364,8 +367,8 @@ class Jd extends BaseController
             'promotionCodeReq' => [
                 'materialId' => $url,
                 'siteId'     => $this->appid,
-                'positionId' => pow(10, 5) + $uid, //自定义,和订单关联
-                'couponUrl'  => $couponUrl,
+                'positionId' => $uid, //自定义,和订单关联
+                // 'couponUrl'  => $couponUrl,
                 'sceneId' => 1
             ],
         ];
@@ -596,7 +599,7 @@ class Jd extends BaseController
             }
             //通过订单关联
             $positionId = $order['positionId'];
-            $userId = $positionId - pow(10, 5);
+            $userId = $positionId;
             if ($userId <= 0) {//拉取的订单没有匹配到用户
                 continue;
             }