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

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

@@ -7,6 +7,7 @@ use app\common\repositories\user\UserThirdRepository;
 use app\model\common\JdOrderModel;
 use think\App;
 use crmeb\basic\BaseController;
+use think\db\exception\DbException;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
@@ -483,28 +484,37 @@ class Jd extends BaseController
             $page = 1;
             $maxPage = 1; // 默认值
 
-            do {
-                try {
-                    $result = $this->jd_query($eliteId, $page);
-                    // 安全退出条件
-                    if (empty($result) || !is_array($result)) {
+            Db::startTrans();
+            try {
+                // 清除数据
+                Db::name("third_party_goods")->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;
                     }
-                    // 首次请求获取总页数
-                    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);
+                } while ($page <= $maxPage);
+                Db::commit();
+            } catch (DbException $e) {
+                Db::startTrans();
+            }
         }
 
         return 'ok';
@@ -533,22 +543,43 @@ class Jd extends BaseController
     {
         $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;
+            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;
+                    }
                 }
             }
-            $couponMoney = [
-                [
-                    'discount' => $maxCoupon['discount'],//优惠券金额
-                    'getStartTime' => date('Y-m-d', intval($maxCoupon['getStartTime'] / 1000)),
-                    'getEndTime' => date('Y-m-d', intval($maxCoupon['getEndTime'] / 1000)),
-                    'link' => $maxCoupon['link'],
-                ]
-            ];
+
+            // 最低到手价
+            $purchasePrice = 0.00;
+
+            // 售价
+            if (!isset($goods['priceInfo']['price'])) {
+                continue;
+            }
+            $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'];
+            }
 
             // 券后佣金，（促销价-优惠券面额）*佣金比例
             $commissionMoney = $goods['commissionInfo']['couponCommission'] ?? 0;
@@ -571,10 +602,9 @@ class Jd extends BaseController
 
                 'commission' => $commissionMoney,//佣金
                 'commission_rate' => $goods['commissionInfo']['commissionShare'] ?? '',//佣金比例
-                'coupon_money' => $couponMoney,
-                'coupon_link' => $maxCoupon['link'],
-                'lowestCouponPrice' => decimal2($goods['priceInfo']['lowestCouponPrice']?? $goods['priceInfo']['price']), //券后价lowestCouponPrice
-                'purchasePrice' => decimal2($goods['purchasePriceInfo']['purchasePrice']?? 0.00), //到手价purchasePrice
+                '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']