Merge remote-tracking branch 'origin/dev' into dev

app/command/WiwibaoProductSync.php

@@ -3,8 +3,10 @@ declare (strict_types=1);
 
 namespace app\command;
 
+use app\common\enum\CommonEnum;
 use app\common\enum\douhuomall\DouhuomallEnum;
 use app\common\enum\store\ProductEnum;
+use app\common\repositories\store\product\ProductRepository;
 use app\traits\GongApiRequest;
 use think\console\Command;
 use think\console\Input;
@@ -25,6 +27,7 @@ class WiwibaoProductSync extends Command
         'page_size' => 100,      // 每页拉取数量
         'max_pages' => 0,       // 最大页数限制
         'price_change_rate' => 0.0, // 价格变动比率阈值（10%）
+        'mer_id' => CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['code']
     ];
 
     protected function configure()
@@ -60,13 +63,22 @@ class WiwibaoProductSync extends Command
             }
 
             // 2. 获取本地所有SPU ID
-            $localSpuIds = Db::name('douhuomall')->column('spu_id');
+            $douhuomallDataMap = [];
+            $localSpuIds = [];
+            $douhuomallDataList = Db::name('douhuomall')
+                ->select()
+                ->toArray();
+            if (!empty($douhuomallDataList)) {
+                $douhuomallDataMap = array_column($douhuomallDataList, null, 'spu_id');
+                $localSpuIds = array_keys($douhuomallDataMap);
+            }
+
             $syncedSpuIds = [];
 
             // 3. 批量处理商品数据
             foreach ($allProducts as $product) {
                 try {
-                    $spuId = $this->processSingleProduct($product);
+                    $spuId = $this->processSingleProduct($product, $douhuomallDataMap[$product['goods_id']] ?? []);
                     if ($spuId) {
                         $syncedSpuIds[] = $spuId;
                     }
@@ -120,7 +132,7 @@ class WiwibaoProductSync extends Command
     /**
      * 处理单个商品
      */
-    protected function processSingleProduct($productData)
+    protected function processSingleProduct($productData, $douhuomallData)
     {
         $goodsId = $productData['goods_id'];
 
@@ -140,7 +152,7 @@ class WiwibaoProductSync extends Command
         $saveData = $this->buildSaveData($goodsInfo, $skuInfo, $imageData);
 
         // 5. 保存到本地（使用原有的add方法逻辑）
-        $spuId = $this->addToDouhuomall($saveData);
+        $spuId = $this->addToDouhuomall($saveData, $douhuomallData);
 
         // 6. 检查并处理已上架商品的价格变动
         $this->checkAndProcessOnlineProduct($spuId, $saveData);
@@ -244,13 +256,14 @@ class WiwibaoProductSync extends Command
     }
 
     /**
-     * 保存到douhuomall表（基于原有add方法）
+     * @param $data
+     * @param $findData
+     * @return mixed
+     * @throws DbException
      */
-    protected function addToDouhuomall($data)
+    protected function addToDouhuomall($data, $findData)
     {
         try {
-            $findData = Db::name('douhuomall')->where('spu_id', $data['spu_id'])->find();
-
             // 对SKU按成本价排序，获取最低成本价的SKU
             $skuInfo = $this->arrSort($data['skuId_info'], 'cost_price', SORT_ASC);
 
@@ -291,11 +304,11 @@ class WiwibaoProductSync extends Command
                 Db::name('douhuomall')->insert($insertData);
             } else {
                 // 更新
-                // 检查是否需要恢复已删除商品的上架状态
-                $shouldRestore = $this->shouldRestoreProduct($findData, $data);
-                if ($shouldRestore) {
-                    $this->restoreProduct($data['spu_id']);
-                }
+                //  无意义 // 检查是否需要恢复已删除商品的上架状态
+                // $shouldRestore = $this->shouldRestoreProduct($findData, $data);
+                // if ($shouldRestore) {
+                //     $this->restoreProduct($data['spu_id']);
+                // }
                 $updateData = [
                     'status' => $data['status'],
                     'update_time' => $now,
@@ -359,7 +372,7 @@ class WiwibaoProductSync extends Command
         Db::name('store_product')
             ->where('spu_id', $spuId)
             ->update([
-                'is_show' => ProductEnum::IS_SHOW['No']['code'],
+                'is_show' => ProductEnum::IS_SHOW['Yes']['code'],
                 'status' => ProductEnum::STATUS['Approved']['code']
             ]);
 
@@ -374,12 +387,14 @@ class WiwibaoProductSync extends Command
         // 检查商品是否已上架
         try {
             $productList = Db::name('store_product')
-                ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
+                // ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
                 ->where('spu_id', $spuId)
                 ->select()
                 ->toArray();
 
             if (empty($productList)) {
+                // 如果没有该商品则自动上架
+                $this->insert_product($spuId, $this->config['mer_id']);
                 return;
             }
 
@@ -395,6 +410,12 @@ class WiwibaoProductSync extends Command
             }
 
             foreach ($productList as $product) {
+
+                if ($product['is_show'] == ProductEnum::IS_SHOW['No']['code'] && $product['is_status'] == ProductEnum::IS_STATUS['Triggered']['code']) {
+                    // 如果商品 属于未上架商品（或是被员工下架了） 则不做任何处理
+                    continue;
+                }
+
                 // 获取本地商品价格信息
                 // 获取SKU价格
                 $skus = Db::name('store_product_attr_value')
@@ -412,9 +433,38 @@ class WiwibaoProductSync extends Command
                 // 比较价格，判断是否需要下架
                 $priceChanged = $this->checkPriceChange($localPrices, $syncPrices);
 
-                if ($priceChanged) {
+                if ($priceChanged['result'] ?? false) {
                     // 价格变动超过阈值，下架商品并记录
-                    $this->offlineProductWithRecord($product, $syncData, $localPrices, $syncPrices);
+                    // $this->offlineProductWithRecord($product, $syncData, $localPrices, $syncPrices);
+
+                    $changeSkuAttrDataList = [];
+                    foreach ($skus as $sku) {
+                        $edit_price = bcadd(
+                            $sku['price'],
+                            $priceChanged['sku_difference_map'][$sku['gong_sku_id']] ?? ($priceChanged['spu_difference'] ?? '0.00'),
+                            2
+                        );
+                        Log::info('商品价格变动：' . json_encode([
+                                'product_id' => $product['product_id'],
+                                'sku_id' => $sku['gong_sku_id'],
+                                'before_price' => $sku['price'],
+                                'edit_price' => $edit_price
+                            ])
+                        );
+                        $changeSkuAttrDataList[] = [
+                            'sku_id' => $sku['gong_sku_id'],
+                            'edit_price' => $edit_price
+                        ];
+                    }
+                    // 新规则 根据价格变动 增减商品售价
+                    /** @var ProductRepository $productRepository */
+                    $productRepository = app()->make(ProductRepository::class);
+                    $productRepository->editPrice($product['product_id'], $changeSkuAttrDataList);
+
+                    // 如果是系统下架的商品 则对商品重新上架
+                    if ($product['is_show'] == ProductEnum::IS_SHOW['No']['code'] && $product['is_status'] == ProductEnum::IS_STATUS['Automatic']['code']) {
+                        $this->restoreProduct($product['spu_id']);
+                    }
                 } else {
                     // 价格未变动或变动很小，只更新图片
                     $this->updateProductImages($spuId);
@@ -430,16 +480,23 @@ class WiwibaoProductSync extends Command
      */
     protected function checkPriceChange($localPrices, $syncPrices)
     {
+        $res = [
+            'result' => false,
+            'spu_difference' => 0.00,
+            'sku_difference_map' => []
+        ];
+        // 如果成本价不变 则没有必要更新商品信息
         // 如果没有SKU，比较商品主价格
         if (empty($localPrices['skus'])) {
-            $localPrice = $localPrices['product_price'];
-            $syncPrice = $syncPrices[0]['market_price'] ?? 0;
+            $localPrice = $localPrices['product_cost'];
+            $syncPrice = $syncPrices[0]['cost_price'] ?? 0;
 
             if ($localPrice > 0 && $syncPrice > 0) {
                 $changeRate = abs(($syncPrice - $localPrice) / $localPrice);
-                return $changeRate > $this->config['price_change_rate'];
+                $res['result'] = $changeRate > $this->config['price_change_rate'];
+                $res['spu_difference'] = bcsub((string)$syncPrice, $localPrice, 2);
             }
-            return false;
+            return $res;
         }
 
         // 如果有SKU，匹配SKU进行比较
@@ -447,20 +504,19 @@ class WiwibaoProductSync extends Command
             foreach ($syncPrices as $syncSku) {
                 // 尝试匹配SKU
                 if ($this->matchSku($localSku, $syncSku)) {
-                    $localPrice = $localSku['price'] ?? 0;
-                    $syncPrice = $syncSku['market_price'] ?? 0;
+                    $localPrice = $localSku['cost'] ?? 0;
+                    $syncPrice = $syncSku['cost_price'] ?? 0;
 
                     if ($localPrice > 0 && $syncPrice > 0) {
                         $changeRate = abs(($syncPrice - $localPrice) / $localPrice);
-                        if ($changeRate > $this->config['price_change_rate']) {
-                            return true;
-                        }
+                        $res['result'] = $changeRate > $this->config['price_change_rate'];
+                        $res['sku_difference_map'][$localSku['gong_sku_id']] = bcsub((string)$syncPrice, $localPrice, 2);
                     }
                 }
             }
         }
 
-        return false;
+        return $res;
     }
 
     /**
@@ -623,11 +679,9 @@ class WiwibaoProductSync extends Command
         $products = Db::name('store_product')
             ->where('spu_id', $spuId)
             ->select();
+        $douhuomallData = Db::name('douhuomall')->where('spu_id', $spuId)->select()->toArray();
 
         foreach ($products as $product) {
-            // 记录下架前数据
-            $beforeData = $product;
-
             // 下架商品
             Db::name('store_product')
                 ->where('product_id', $product['product_id'])
@@ -643,7 +697,7 @@ class WiwibaoProductSync extends Command
                 $spuId,
                 'third_party_offline',
                 $reason,
-                $beforeData,
+                ['product' => $product, 'douhuomallData' => $douhuomallData],
                 []
             );
         }
@@ -740,4 +794,171 @@ class WiwibaoProductSync extends Command
             'time' => date('Y-m-d H:i:s')
         ]);
     }
+
+    // 借用 app\controller\merchant\gong\Goods.php 控制器内方法
+
+    /**
+     * 将 微唯宝商品 选品（加入） 到系统内部商户商品表
+     * @param $spu_id
+     * @param $mer_id
+     * @return bool
+     */
+    public function insert_product($spu_id, $mer_id)
+    {
+        try {
+            // 1、获取商品信息
+            $data = Db::name('douhuomall')->where('spu_id', $spu_id)->find();
+
+            // 2、是否为多规格
+            $sku_data = json_decode($data['skuId_info'], true);
+            $spec_type = count($sku_data);
+            if ($spec_type > 1) {
+                $spec_type = 1;
+            } else {
+                $spec_type = 0;
+            }
+
+            // 3、商品主图
+            $spuId_info = json_decode($data['spuId_info'], true);
+            $slider_image = $spuId_info['detail_img_list'] ?? '';
+            $image = $spuId_info['cover_url'] ?? '';
+            if (empty($slider_image)) {
+                $slider_image = $image;
+            } else if (is_string($slider_image)) {
+                $slider_image = implode(',', json_decode($slider_image, true));
+            } else if (is_array($slider_image)) {
+                $slider_image = implode(',', $slider_image);
+            }
+            $yanglaojin_scale = (!empty($data['pension']) && !empty($data['market_price'])) ? bcdiv($data['pension'], $data['market_price'], 2) : 0;
+
+            // 4、商品入库数据
+            $product_insert_data = [
+                'mer_id' => $mer_id,
+                'image' => $image,
+                'slider_image' => $slider_image,
+                'store_name' => $data['title'],
+                'store_info' => 1,
+                'keyword' => mb_substr($data['title'], 0, 3),
+                'is_show' => 1,
+                'status' => 1,
+                'cate_id' => $data['cate_ids'],
+                'unit_name' => '个',
+                'price' => $data['market_price'],
+                'cost' => $data['cost_price'],
+                'ot_price' => $data['ot_price'],
+                'stock' => '1000',
+                'spec_type' => $spec_type,
+                'extension_type' => 1,
+                'mer_status' => 1,
+                'is_used' => 1,
+                'old_product_id' => $data['id'],
+                'volunteer' => 0,
+                'type' => 1,
+                'pension' => '0.00',
+                'commission' => 5,
+                'spu_id' => $data['spu_id'],
+                'temp_id' => 105,
+                'plate_mer_profit' => $data['mer_profit'],
+                'concession_pri' => $data['mer_profit'],
+                'yanglaojin_scale' => $yanglaojin_scale
+            ];
+            $insert_id = Db::name('store_product')->insertGetId($product_insert_data);
+
+            // 5、更新商品详情表
+            $detail = $spuId_info['detail'];
+            if (!is_null(json_decode($detail))) {
+                $detail_list = json_decode($detail);
+                $detail = '';
+                foreach ($detail_list as $value) {
+                    $detail .= '<img src="' . $value . '"></img>';
+                }
+            }
+            Db::name('store_product_content')->insert(['content' => $detail, 'product_id' => $insert_id]);
+
+            // 6、
+            $this->insert_sku($insert_id, $sku_data);
+            return true;
+        } catch (\Exception $e) {
+            Log::error($spu_id . "加入选品失败：" . $e->getMessage());
+            return false;
+        }
+    }
+
+    // 借用 app\controller\merchant\gong\Goods.php 控制器内方法
+    public function insert_sku($id, $data)
+    {
+        // 1、获取 所有SKU的 规格属性值
+        $sku_attr_data = array_column($data, 'attribute_json');
+        $name = '';
+
+        // 2、写入 商品属性表
+        /** @var ProductRepository $ProductRepository */
+        $ProductRepository = app()->make(ProductRepository::class);
+        if (empty($sku_attr_data[0][0])) {
+            // 写入商品属性表
+            Db::name('store_product_attr')->insert(['product_id' => $id, 'attr_name' => '规格', 'attr_values' => $name]);
+            $key = '';
+            $num = 1;
+            // 写入 SKU 商品属性值表
+            foreach ($data as $k => $v) {
+                Db::name('store_product_attr_value')->insert([
+                    'product_id' => $id,
+                    'detail' => json_encode(['规格' => $key]),
+                    'sku' => $key,
+                    'image' => $v['img_url'],
+                    'cost' => $v['cost_price'],
+                    'ot_price' => $v['retail_price'],
+                    'price' => $v['market_price'],
+                    'unique' => $ProductRepository->setUnique($id, $v['sku_id'], 0),
+                    'stock' => 100,
+                    'cost_price' => $v['cost_price'],
+                    'extension_one' => 5,
+                    'gong_sku_id' => $v['sku_id'],
+                    'gong_mer_profit' => $v['mer_profit'],
+                    'gong_pension' => $v['yanglaojin'],
+                    'gong_market_price' => $v['market_price'],
+                    'plate_mer_profit' => $v['mer_profit']
+                ]);
+                $key = '';
+                $num++;
+            }
+        } else {
+            foreach ($sku_attr_data as $kk => $vv) {
+                foreach ($vv as $k1 => $v1) {
+                    $name .= $v1['val'];
+                }
+                $name .= '-!-';
+            }
+            $name = rtrim($name, '-!-');
+            Db::name('store_product_attr')->insert(['product_id' => $id, 'attr_name' => '规格', 'attr_values' => $name]);
+            $key = '';
+            $num = 1;
+            foreach ($data as $k => $v) {
+                foreach ($v['attribute_json'] as $k2 => $v2) {
+                    $key .= $v2['val'];
+                }
+
+                Db::name('store_product_attr_value')->insert([
+                    'product_id' => $id,
+                    'detail' => json_encode(['规格' => $key]),
+                    'sku' => $key,
+                    'image' => $v['img_url'],
+                    'cost' => $v['cost_price'],
+                    'ot_price' => $v['retail_price'],
+                    'price' => $v['market_price'],
+                    'unique' => $ProductRepository->setUnique($id, $v['sku_id'], 0),
+                    'stock' => 100,
+                    'cost_price' => $v['cost_price'],
+                    'extension_one' => 5,
+                    'gong_sku_id' => $v['sku_id'],
+                    'gong_mer_profit' => $v['mer_profit'],
+                    'gong_pension' => $v['yanglaojin'],
+                    'gong_market_price' => $v['market_price'],
+                    'plate_mer_profit' => $v['mer_profit']
+                ]);
+                $key = '';
+                $num++;
+            }
+        }
+    }
 }

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

@@ -412,10 +412,10 @@ class TaoKe extends BaseController
             $uid=0;
         }
 
-        log::info("===doGetPinDetail==={$goodsId}+======{$uid}");
+        // log::info("===doGetPinDetail==={$goodsId}+======{$uid}");
         //获取商品详情
         $result = $this->doGetPinDetail($goodsId, $uid);
-        log::info("===doGetPinDetail=={$uid}");
+        // log::info("===doGetPinDetail=={$uid}");
 //        log::info($result);
         $log = [
             'flag' => '拼多多详情',
@@ -450,7 +450,7 @@ class TaoKe extends BaseController
 
         $apiName = 'pdd.ddk.goods.detail';
         $result = $this->getUrlResult($apiName, $params);
-        Log::info($result);
+        // Log::info($result);
         if(isset($result['error_response']['error_code']) && $result['error_response']['error_code']==50001)
             return ['code' => 2, 'data' => '该商品已下架或不存在~'];
         $response = $result['goods_detail_response']['goods_details'] ?? [];
@@ -462,14 +462,14 @@ class TaoKe extends BaseController
         // $detail['yanglao'] = app()->make(ProductRepository::class)
         //     ->thirdYanglaojin(0, sprintf('%.2f', $commission));
 
-        log::info("commission==={$commission}");
+        // log::info("commission==={$commission}");
         $systemvalueObj= $goods_obj = Db::name('system_config_value')
             -> where('config_key','sanfangfenpei')->find();;
         $sanfangfenpei=json_decode($systemvalueObj['value'],true);
         $ppv=$commission*$sanfangfenpei['pv'];
         $pv3=round($ppv,3);  //PV
         $pv=round($ppv,2);  //PV
-        log::info("pv==={$pv}===========ppv3={$pv3}");
+        // log::info("pv==={$pv}===========ppv3={$pv3}");
         $yanglaojin=round($commission*$sanfangfenpei['yanglaojin'],2); //新的养老金
 
 

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

@@ -545,7 +545,7 @@ class Vip extends BaseController
             'realCall' => 'true',
         ];
 
-        log::info($requestIn);
+        // log::info($requestIn);
         $params['request'] = $requestIn;
         $result = $this->getUrlResult($apiName, "getByGoodsIds", $params);
 //        log::info($result);

app/controller/api/user/User.php

@@ -200,14 +200,14 @@ class User extends BaseController
 
     // 红包
     public function  hongbao_info(){
-        log::info("============hongbao");
+        // log::info("============hongbao");
         $user = $this->request->userInfo();
         if($user->uid>0){
             // 已经入账红包
             $data['total_source']=$user->hongbao;
             // 为生效红包
             $data['no_total_source']=Db::name('user_sign_hongbao')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }
@@ -408,7 +408,7 @@ class User extends BaseController
 
             // 未生效贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
         }
 
@@ -481,7 +481,7 @@ class User extends BaseController
             $data['total_source'] = $user->jingdou;// 临时使用
             // 为生效京豆
             $data['no_total_source']=Db::name('user_sign_jingdou')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
 
             return app('json')->success($data);
 
@@ -530,7 +530,7 @@ class User extends BaseController
             $data['total_source']=$user->fugou;
             // 为生效京豆
             $data['no_total_source']=Db::name('user_sign_fugou')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }
@@ -577,7 +577,7 @@ class User extends BaseController
             // 为生效京豆
             $data['no_total_source']=0;
             //$data['no_total_source']=Db::name('user_sign_vr')->where('status', -1)->where('uid', $user->uid)->sum('number');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }
@@ -618,7 +618,7 @@ class User extends BaseController
             $data['total_source']=$user->score;
             // 为生效积分
             $data['no_total_source']=Db::name('user_sign_score')->where('status', -1)->where('uid', $user->uid)->sum('reward_socre');;
-            log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
+            // log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
 
         }