命令行-修复拉取微唯宝商品逻辑

app/command/WiwibaoProductSync.php

@@ -4,16 +4,15 @@ 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\douhuomall\DouhuomallChangeLogRepository;
 use app\common\repositories\store\product\ProductRepository;
+use app\entity\data\douhuomall\DouhuomallChangeLogEntity;
 use app\traits\GongApiRequest;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
-use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
-use think\db\exception\ModelNotFoundException;
 use think\facade\Db;
 use think\facade\Log;
 
@@ -64,15 +63,13 @@ class WiwibaoProductSync extends Command
 
             // 2. 获取本地所有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. 批量处理商品数据
@@ -89,7 +86,7 @@ class WiwibaoProductSync extends Command
             }
 
             // 4. 处理需要下架的商品（本地有但第三方已下架）
-            $this->handleOfflineProducts($localSpuIds, $syncedSpuIds);
+            $this->handleOfflineProducts($syncedSpuIds, $douhuomallDataMap);
 
             return 'success';
 
@@ -142,53 +139,15 @@ class WiwibaoProductSync extends Command
             return null;
         }
 
-        // 2. 处理图片信息
-        $imageData = $this->processProductImages($goodsId, $goodsInfo);
-
-        // 3. 处理SKU信息
-        $skuInfo = $this->processSkuInfo($goodsInfo['sku_list'] ?? [], $goodsId);
-
-        // 4. 构建保存数据
-        $saveData = $this->buildSaveData($goodsInfo, $skuInfo, $imageData);
-
-        // 5. 保存到本地（使用原有的add方法逻辑）
-        $spuId = $this->addToDouhuomall($saveData, $douhuomallData);
-
-        // 6. 检查并处理已上架商品的价格变动
-        $this->checkAndProcessOnlineProduct($spuId, $saveData);
-
-        return $spuId;
-    }
-
-    /**
-     * 处理商品图片信息
-     */
-    protected function processProductImages($goodsId, $goodsInfo)
-    {
-        // 如果你需要保存图片到本地，可以在这里实现
-        // 否则直接返回URL
-        return [
-            'cover_url' => $goodsInfo['main_img'] ?? '',
-            'detail_images' => $goodsInfo['detail_img'] ?? [],
-            'detail_img_list' => $goodsInfo['detail_img'] ?? [] // 为了兼容以前写的代码，建议保留这个数据项，之前用的是detail_img_list字段，但我感觉他们意义一样
-        ];
-    }
-
-    /**
-     * 处理SKU信息
-     */
-    protected function processSkuInfo($skuList, $goodsId)
-    {
-        if (empty($skuList)) {
-            return [];
+        // 2. 处理SKU信息
+        if (empty($goodsInfo['sku_list'])) {
+            return null;
         }
-
-        $processedSkus = [];
-        foreach ($skuList as $sku) {
+        $skuInfo = [];
+        foreach ($goodsInfo['sku_list'] as $sku) {
             if (empty($sku['plat_price'])) {
                 continue;
             }
-
             $processedSku = [
                 'sku_id' => $sku['sku_id'] ?? 0,
                 'plat_price' => $sku['plat_price'],
@@ -202,22 +161,20 @@ class WiwibaoProductSync extends Command
                 'main_img' => $sku['main_img'] ?? '',
                 'attribute_json' => !empty($sku['attr']) ? $sku['attr'] : [['val' => '默认', 'name' => '默认']]
             ];
-
-            $processedSkus[] = array_merge($sku, $processedSku);
+            $skuInfo[] = array_merge($sku, $processedSku);
         }
 
-        return $processedSkus;
-    }
+        // 4. 构建保存数据
+        $imageData = [
+            'cover_url' => $goodsInfo['main_img'] ?? '',
+            'detail_images' => $goodsInfo['detail_img'] ?? [],
+            'detail_img_list' => $goodsInfo['detail_img'] ?? [] // 为了兼容以前写的代码，建议保留这个数据项，之前用的是detail_img_list字段，但我感觉他们意义一样
+        ];
 
-    /**
-     * 构建保存数据
-     */
-    protected function buildSaveData($goodsInfo, $skuInfo, $imageData)
-    {
         // 构建详情HTML
         $detailHtml = $this->buildDetailHtml($imageData['detail_images']);
 
-        return [
+        $saveData = [
             'spu_id' => $goodsInfo['goods_id'],
             'skuId_info' => $skuInfo,
             'sys_id' => '112',
@@ -234,14 +191,24 @@ class WiwibaoProductSync extends Command
             'status' => $goodsInfo['status'] ?? 0,
             'cate_ids' => $goodsInfo['cate_ids'] ?? '',
             'title' => $goodsInfo['spu_name'] ?? '',
-            'cxb_cate_id' => 0
+            'cxb_cate_id' => 0,
+            'third_update_time' => $goodsInfo['update_time'] ?? ''
         ];
+
+        // 5. 保存到本地（使用原有的add方法逻辑）
+        try {
+            $spuId = $this->addToDouhuomall($saveData, $douhuomallData);
+        } catch (DbException $e) {
+            return 0;
+        }
+
+        return $spuId;
     }
 
     /**
      * 构建详情HTML
      */
-    protected function buildDetailHtml($detailImages)
+    protected function buildDetailHtml($detailImages): string
     {
         if (empty($detailImages)) {
             return '';
@@ -299,34 +266,70 @@ class WiwibaoProductSync extends Command
                     'profit' => $data['profit'],
                     'mer_profit' => $data['mer_profit'],
                     'pension' => $data['pension'],
-                    'cxb_cate_id' => $data['cxb_cate_id']
+                    'cxb_cate_id' => $data['cxb_cate_id'],
+                    'third_update_time' => $data['third_update_time']
                 ];
                 Db::name('douhuomall')->insert($insertData);
+
+                // 创建完商品后立马上架
+                $this->insert_product($data['spu_id'], $this->config['mer_id']);
+
             } else {
                 // 更新
-                //  无意义 // 检查是否需要恢复已删除商品的上架状态
-                // $shouldRestore = $this->shouldRestoreProduct($findData, $data);
-                // if ($shouldRestore) {
-                //     $this->restoreProduct($data['spu_id']);
-                // }
-                $updateData = [
-                    'status' => $data['status'],
-                    'update_time' => $now,
-                    'cost_price' => $data['cost_price'],
-                    'market_price' => $data['market_price'],
-                    'ot_price' => $data['ot_price'],
-                    'mer_profit' => $data['mer_profit'],
-                    'pension' => $data['pension'],
-                    'profit' => $data['profit'],
-                    'skuId_info' => json_encode($data['skuId_info'], JSON_UNESCAPED_UNICODE),
-                    'spuId_info' => json_encode($data['spuId_info'], JSON_UNESCAPED_UNICODE),
-                    'title' => $data['title'],
-                    'cate_ids' => $data['cate_ids'],
-                    'cxb_cate_id' => $data['cxb_cate_id']
-                ];
-                Db::name('douhuomall')
-                    ->where('spu_id', $findData['spu_id'])
-                    ->update($updateData);
+                if (empty($findData['third_update_time']) || strtotime($data['third_update_time']) > strtotime($findData['third_update_time'])) {
+                    $updateData = [
+                        'status' => $data['status'],
+                        'update_time' => $now,
+                        'cost_price' => $data['cost_price'],
+                        'market_price' => $data['market_price'],
+                        'ot_price' => $data['ot_price'],
+                        'mer_profit' => $data['mer_profit'],
+                        'pension' => $data['pension'],
+                        'profit' => $data['profit'],
+                        'skuId_info' => json_encode($data['skuId_info'], JSON_UNESCAPED_UNICODE),
+                        'spuId_info' => json_encode($data['spuId_info'], JSON_UNESCAPED_UNICODE),
+                        'title' => $data['title'],
+                        'cate_ids' => $data['cate_ids'],
+                        'cxb_cate_id' => $data['cxb_cate_id'],
+                        'third_update_time' => $data['third_update_time']
+                    ];
+                    Db::name('douhuomall')
+                        ->where('spu_id', $findData['spu_id'])
+                        ->update($updateData);
+
+                    $productList = Db::name('store_product')
+                        ->where('spu_id', $findData['spu_id'])
+                        ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
+                        ->where('is_del', ProductEnum::IS_DEL['No']['code'])
+                        ->where('status', '!=', ProductEnum::STATUS['Withdrawn']['code'])
+                        ->select()
+                        ->toArray();
+                    $productIdList = array_column($productList, 'product_id');
+
+                    // 将绑定的商品进行下架
+                    Db::name('store_product')
+                        ->whereIn('product_id', $productIdList)
+                        ->update([
+                            'is_show' => ProductEnum::IS_SHOW['No']['code'],
+                            'is_del' => ProductEnum::IS_DEL['Yes']['code'],
+                            'status' => ProductEnum::STATUS['Withdrawn']['code'],
+                            'is_status' => ProductEnum::IS_STATUS['Automatic']['code']
+                        ]);
+
+                    /** @var DouhuomallChangeLogEntity $douhuomallChangeLogEntity */
+                    $douhuomallChangeLogEntity = DouhuomallChangeLogEntity::newInstance();
+                    $douhuomallChangeLogEntity->setSpuId($findData['spu_id'])
+                        ->setDataJson($findData)
+                        ->setEffectProductJson($productIdList)
+                        ->setCreateTime(date('Y-m-d H:i:s'));
+                    /** @var DouhuomallChangeLogRepository $douhuomallChangeLogRepository */
+                    $douhuomallChangeLogRepository = app()->make(DouhuomallChangeLogRepository::class);
+                    $douhuomallChangeLogRepository->createByEntity($douhuomallChangeLogEntity);
+
+                    // 将商品重新上架
+                    // 创建完商品后立马上架
+                    $this->insert_product($data['spu_id'], $this->config['mer_id']);
+                }
             }
 
             return $data['spu_id'];
@@ -338,33 +341,6 @@ class WiwibaoProductSync extends Command
     }
 
     /**
-     * 检查是否需要恢复已删除商品的上架状态
-     */
-    protected function shouldRestoreProduct($findData, $newData)
-    {
-        // 原有逻辑：如果货物属于已被删除状态，并且新更新进来的状态非删除状态
-        // 并且成本价、零售价、市场价、利润率没有变动的话
-        if ($findData['status'] == DouhuomallEnum::STATUS['Delete']['code']
-            && $newData['status'] !== DouhuomallEnum::STATUS['Delete']['code']
-            && $newData['cost_price'] == $findData['cost_price']
-            && $newData['ot_price'] == $findData['ot_price']
-            && $newData['market_price'] == $findData['market_price']
-            && $newData['profit'] == $findData['profit']) {
-
-            // 检查是否有已下架的商品
-            $count = Db::name('store_product')
-                ->where('spu_id', $newData['spu_id'])
-                ->where('is_show', ProductEnum::IS_SHOW['No']['code'])
-                ->where('is_status', ProductEnum::IS_STATUS['Automatic']['code'])
-                ->count();
-
-            return $count > 0;
-        }
-
-        return false;
-    }
-
-    /**
      * 恢复商品上架状态
      */
     protected function restoreProduct($spuId)
@@ -380,352 +356,64 @@ class WiwibaoProductSync extends Command
     }
 
     /**
-     * 检查并处理已上架商品
+     * 处理需要下架的商品（第三方已下架）
      */
-    protected function checkAndProcessOnlineProduct($spuId, $syncData)
+    protected function handleOfflineProducts($syncedSpuIds, $douhuomallDataMap)
     {
-        // 检查商品是否已上架
-        try {
-            $productList = Db::name('store_product')
-                // ->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;
-            }
-
-            // 解析同步数据中的价格
-            $syncPrices = [];
-            foreach ($syncData['skuId_info'] as $sku) {
-                $syncPrices[] = [
-                    'sku_id' => $sku['sku_id'] ?? '',
-                    'market_price' => $sku['market_price'] ?? 0,
-                    'cost_price' => $sku['cost_price'] ?? 0,
-                    'retail_price' => $sku['retail_price'] ?? 0
-                ];
-            }
-
-            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')
-                    ->where('product_id', $product['product_id'])
-                    ->field('gong_sku_id, sku, price, cost')
-                    ->select()
-                    ->toArray();
-                $localPrices = [
-                    'product_price' => $product['price'] ?? 0,
-                    'product_cost' => $product['cost'] ?? 0,
-                    'product_ot_price' => $product['ot_price'] ?? 0,
-                    'skus' => $skus
-                ];
-
-                // 比较价格，判断是否需要下架
-                $priceChanged = $this->checkPriceChange($localPrices, $syncPrices);
-
-                if ($priceChanged['result'] ?? false) {
-                    // 价格变动超过阈值，下架商品并记录
-                    // $this->offlineProductWithRecord($product, $syncData, $localPrices, $syncPrices);
-
-                    $changeSkuAttrDataList = [];
-                    foreach ($skus as $sku) {
-                        $edit_price = bcadd(
-                            $sku['price'],
-                            (string)$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);
-                }
-            }
-        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
-
-        }
-    }
+        $localSpuIds = array_keys($douhuomallDataMap);
+        $offlineSpuIds = array_diff($localSpuIds, $syncedSpuIds);
 
-    /**
-     * 检查价格是否变动超过阈值
-     */
-    protected function checkPriceChange($localPrices, $syncPrices)
-    {
-        $res = [
-            'result' => false,
-            'spu_difference' => 0.00,
-            'sku_difference_map' => []
-        ];
-        // 如果成本价不变 则没有必要更新商品信息
-        // 如果没有SKU，比较商品主价格
-        if (empty($localPrices['skus'])) {
-            $localPrice = $localPrices['product_cost'];
-            $syncPrice = $syncPrices[0]['cost_price'] ?? 0;
-
-            if ($localPrice > 0 && $syncPrice > 0) {
-                $changeRate = abs(($syncPrice - $localPrice) / $localPrice);
-                $res['result'] = $changeRate > $this->config['price_change_rate'];
-                $res['spu_difference'] = bcsub((string)$syncPrice, $localPrice, 2);
-            }
-            return $res;
+        if (empty($offlineSpuIds)) {
+            return;
         }
 
-        // 如果有SKU，匹配SKU进行比较
-        foreach ($localPrices['skus'] as $localSku) {
-            foreach ($syncPrices as $syncSku) {
-                // 尝试匹配SKU
-                if ($this->matchSku($localSku, $syncSku)) {
-                    $localPrice = $localSku['cost'] ?? 0;
-                    $syncPrice = $syncSku['cost_price'] ?? 0;
-
-                    if ($localPrice > 0 && $syncPrice > 0) {
-                        $changeRate = abs(($syncPrice - $localPrice) / $localPrice);
-                        $res['result'] = $changeRate > $this->config['price_change_rate'];
-                        $res['sku_difference_map'][$localSku['gong_sku_id']] = bcsub((string)$syncPrice, $localPrice, 2);
-                    }
-                }
-            }
+        $productList = Db::name('store_product')
+            ->whereIn('spu_id', $offlineSpuIds)
+            ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
+            ->where('is_del', ProductEnum::IS_DEL['No']['code'])
+            ->where('status', '!=', ProductEnum::STATUS['Withdrawn']['code'])
+            ->field('product_id, spu_id, is_show, is_del, status')
+            ->select()
+            ->toArray();
+        if (empty($productList)) {
+            return;
         }
-
-        return $res;
-    }
-
-    /**
-     * 匹配SKU（根据业务逻辑实现）
-     */
-    protected function matchSku($localSku, $syncSku)
-    {
-        // 根据SKU ID匹配
-        if (!empty($localSku['gong_sku_id']) && !empty($syncSku['sku_id'])) {
-            return $localSku['gong_sku_id'] == $syncSku['sku_id'];
+        $productIdList = [];
+        $spuIdMap = [];
+        foreach ($productList as $item) {
+            $productIdList[] = $item['product_id'];
+            $spuIdMap[$item['spu_id']][] = $item['product_id'];
         }
 
-        // 可以根据其他属性匹配，如规格等
-        return false;
-    }
-
-    /**
-     * 下架商品并记录变动
-     */
-    protected function offlineProductWithRecord($product, $syncData, $localPrices, $syncPrices)
-    {
-        $productId = $product['product_id'];
-        $spuId = $product['spu_id'];
-
-        // 1. 收集变动前数据
-        $beforeData = [
-            'product_id' => $productId,
-            'spu_id' => $spuId,
-            'title' => $product['store_name'] ?? '',
-            'status' => $product['is_show'] ?? 0,
-            'price_info' => $localPrices,
-            'images' => [
-                'image' => $product['image'] ?? '',
-                'slider_image' => $product['slider_image'] ?? ''
-            ],
-            'record_time' => date('Y-m-d H:i:s')
-        ];
-
-        // 2. 下架商品
+        // 将绑定的商品进行下架
         Db::name('store_product')
-            ->where('product_id', $productId)
+            ->whereIn('product_id', $productIdList)
             ->update([
                 'is_show' => ProductEnum::IS_SHOW['No']['code'],
+                'is_del' => ProductEnum::IS_DEL['Yes']['code'],
                 'status' => ProductEnum::STATUS['Withdrawn']['code'],
                 'is_status' => ProductEnum::IS_STATUS['Automatic']['code']
             ]);
-
-        // 3. 收集变动后数据
-        $afterData = [
-            'spu_id' => $spuId,
-            'sync_price_info' => $syncPrices,
-            'sync_title' => $syncData['title'],
-            'sync_status' => $syncData['status'],
-            'sync_time' => date('Y-m-d H:i:s')
-        ];
-
-        // 4. 记录变动日志
-        $this->recordChangeLog(
-            $productId,
-            $spuId,
-            'price_change',
-            '第三方平台价格变动超过阈值',
-            $beforeData,
-            $afterData
-        );
-
-        Log::info("商品下架: product_id={$productId}, spu_id={$spuId}, 原因: 价格变动");
-    }
-
-    /**
-     * 更新商品图片（基于原有updata_product_img方法）
-     */
-    protected function updateProductImages($spuId)
-    {
-        // 1. 验证该SPU是否已上架
-        $productId = Db::name('store_product')
-            ->where('spu_id', $spuId)
-            ->value('product_id');
-
-        if (!$productId) {
-            return true;
-        }
-
-        // 2. 查找微唯宝商品
-        $data = Db::name('douhuomall')
-            ->where('spu_id', $spuId)
-            ->find();
-
-        if (!$data) {
-            return false;
-        }
-
-        // 3. 解析商品信息
-        $spuIdInfo = json_decode($data['spuId_info'], true);
-
-        // 4. 处理图片数据
-        $sliderImage = $spuIdInfo['detail_img_list'] ?: '[]';
-        $image = $spuIdInfo['cover_url'] ?? '';
-
-        if (is_string($sliderImage)) {
-            $sliderImage = implode(',', json_decode($sliderImage, true));
-        } else if (is_array($sliderImage)) {
-            $sliderImage = implode(',', $sliderImage);
-        } else {
-            $sliderImage = $image;
-        }
-
-        // 5. 更新产品图片数据
-        $updateData = [
-            'image' => $image,
-            'slider_image' => $sliderImage,
-        ];
-
-        Db::name('store_product')
-            ->where('product_id', $productId)
-            ->update($updateData);
-
-        // 6. 更新商品详情
-        $detail = $spuIdInfo['detail'] ?? '';
-        if (!is_null(json_decode($detail))) {
-            $detailList = json_decode($detail);
-            $newDetail = '';
-            foreach ($detailList as $value) {
-                $newDetail .= "<img src='{$value}' referrerpolicy='no-referrer' /></img>";
-            }
-            $detail = $newDetail;
+        foreach ($spuIdMap as $spuId => $productIdListGroupBySpuId) {
+            /** @var DouhuomallChangeLogEntity $douhuomallChangeLogEntity */
+            $douhuomallChangeLogEntity = DouhuomallChangeLogEntity::newInstance();
+            $douhuomallChangeLogEntity->setSpuId($spuId)
+                ->setDataJson($douhuomallDataMap[$spuId])
+                ->setEffectProductJson($productIdListGroupBySpuId)
+                ->setCreateTime(date('Y-m-d H:i:s'));
+            /** @var DouhuomallChangeLogRepository $douhuomallChangeLogRepository */
+            $douhuomallChangeLogRepository = app()->make(DouhuomallChangeLogRepository::class);
+            $douhuomallChangeLogRepository->createByEntity($douhuomallChangeLogEntity);
         }
 
-        Db::name('store_product_content')
-            ->where('product_id', $productId)
-            ->update(['content' => $detail]);
-
-        return true;
-    }
-
-    /**
-     * 处理需要下架的商品（第三方已下架）
-     */
-    protected function handleOfflineProducts($localSpuIds, $syncedSpuIds)
-    {
-        $offlineSpuIds = array_diff($localSpuIds, $syncedSpuIds);
-
-        if (empty($offlineSpuIds)) {
-            return;
-        }
-
-        foreach ($offlineSpuIds as $spuId) {
-            $this->offlineProductBySpuId($spuId, 'third_party_offline');
-        }
+        // foreach ($offlineSpuIds as $spuId) {
+        //     $this->offlineProductBySpuId($spuId, 'third_party_offline');
+        // }
 
         Log::info("下架第三方已下架商品" . json_encode(['count' => count($offlineSpuIds), 'spu_ids' => $offlineSpuIds]));
     }
 
     /**
-     * 根据SPU ID下架商品
-     */
-    protected function offlineProductBySpuId($spuId, $reason)
-    {
-        // 查找已上架的商品
-        $products = Db::name('store_product')
-            ->where('spu_id', $spuId)
-            ->select();
-        $douhuomallData = Db::name('douhuomall')->where('spu_id', $spuId)->select()->toArray();
-
-        foreach ($products as $product) {
-            // 下架商品
-            Db::name('store_product')
-                ->where('product_id', $product['product_id'])
-                ->update([
-                    'is_show' => ProductEnum::IS_SHOW['No']['code'],
-                    'status' => ProductEnum::STATUS['Withdrawn']['code'],
-                    'is_status' => ProductEnum::IS_STATUS['Automatic']['code']
-                ]);
-
-            // 记录日志
-            $this->recordChangeLog(
-                $product['product_id'],
-                $spuId,
-                'third_party_offline',
-                $reason,
-                ['product' => $product, 'douhuomallData' => $douhuomallData],
-                []
-            );
-        }
-
-        // 从douhuomall表中删除
-        Db::name('douhuomall')->where('spu_id', $spuId)->delete();
-    }
-
-    /**
-     * 记录变动日志
-     */
-    protected function recordChangeLog($productId, $spuId, $changeType, $reason, $beforeData, $afterData)
-    {
-        $logData = [
-            'product_id' => $productId,
-            'spu_id' => $spuId,
-            'change_type' => $changeType,
-            'change_reason' => $reason,
-            'before_data' => json_encode($beforeData, JSON_UNESCAPED_UNICODE),
-            'after_data' => json_encode($afterData, JSON_UNESCAPED_UNICODE),
-            'change_time' => time(),
-            'create_time' => time()
-        ];
-
-        Db::name('product_change_log')->insert($logData);
-    }
-
-    /**
      * 数组排序（从原有add方法中提取）
      */
     protected function arrSort($array, $keys, $sort = SORT_DESC)

app/common/dao/douhuomall/DouhuomallChangeLogDao.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\dao\douhuomall;
+
+use app\common\dao\BaseDao;
+use app\common\model\douhuomall\DouhuomallChangeLog;
+
+class DouhuomallChangeLogDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return DouhuomallChangeLog::class;
+    }
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\dao\store\product;
+
+use app\common\dao\BaseDao;
+use app\common\model\store\product\ProductAttrValueChangeLog as model;
+
+class ProductAttrValueChangeLogDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return model::class;
+    }
+}

app/common/enum/douhuomall/DouhuomallChangeLogEnum.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\enum\douhuomall;
+
+use app\common\enum\CommonEnum;
+
+class DouhuomallChangeLogEnum extends CommonEnum
+{
+    const TYPE = [
+        'Adjust' => ['code' => 1, 'name' => '调价'],
+        'Delete' => ['code' => 2, 'name' => '删除']
+    ];
+}

app/common/model/douhuomall/DouhuomallChangeLog.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\douhuomall;
+
+use app\common\model\BaseModel;
+
+class DouhuomallChangeLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return '';
+    }
+
+    public static function tableName(): string
+    {
+        return 'douhuomall_change_logs';
+    }
+}

app/common/model/store/product/ProductAttrValueChangeLog.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\store\product;
+
+use app\common\model\BaseModel;
+
+class ProductAttrValueChangeLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return '';
+    }
+
+    public static function tableName(): string
+    {
+        return 'store_product_attr_value_change_logs';
+    }
+}

app/common/repositories/douhuomall/DouhuomallChangeLogRepository.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\common\repositories\douhuomall;
+
+use app\common\dao\douhuomall\DouhuomallChangeLogDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\douhuomall\DouhuomallChangeLogEntity;
+
+class DouhuomallChangeLogRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * DouhuomallChangeLogRepository constructor.
+     * @param DouhuomallChangeLogDao $dao
+     */
+    public function __construct(DouhuomallChangeLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param DouhuomallChangeLogEntity $douhuomallChangeLogEntity
+     * @return DouhuomallChangeLogEntity
+     */
+    public function createByEntity(DouhuomallChangeLogEntity $douhuomallChangeLogEntity): DouhuomallChangeLogEntity
+    {
+        $result = $this->create($douhuomallChangeLogEntity->toUnderlineArray())->toArray();
+        /** @var DouhuomallChangeLogEntity $entity */
+        $entity = DouhuomallChangeLogEntity::newInstance($result);
+        return $entity;
+    }
+}

app/common/repositories/store/product/ProductAttrValueChangeLogRepository.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\common\repositories\store\product;
+
+use app\common\repositories\BaseRepository;
+use app\common\dao\store\product\ProductAttrValueChangeLogDao;
+use app\entity\data\store\StoreProductAttrValueChangeLogEntity;
+
+class ProductAttrValueChangeLogRepository extends BaseRepository
+{
+
+    protected $dao;
+
+    /**
+     * ProductAttrValueChangeLogRepository constructor.
+     * @param ProductAttrValueChangeLogDao $dao
+     */
+    public function __construct(ProductAttrValueChangeLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param StoreProductAttrValueChangeLogEntity $storeProductAttrValueChangeLogEntity
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function createByEntity(StoreProductAttrValueChangeLogEntity $storeProductAttrValueChangeLogEntity): StoreProductAttrValueChangeLogEntity
+    {
+        $result = $this->create($storeProductAttrValueChangeLogEntity->toUnderlineArray())->toArray();
+        /** @var StoreProductAttrValueChangeLogEntity $entity */
+        $entity = StoreProductAttrValueChangeLogEntity::newInstance($result);
+        return $entity;
+    }
+}

app/common/repositories/store/product/ProductRepository.php

@@ -23,6 +23,7 @@ use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatQrcodeRepository;
 use app\controller\merchant\gong\Goods;
+use app\entity\data\store\StoreProductAttrValueChangeLogEntity;
 use app\entity\data\store\StoreProductEntity;
 use app\traits\ShouxinyiApiRequest;
 use crmeb\exceptions\ApiException;
@@ -1965,7 +1966,7 @@ class ProductRepository extends BaseRepository
         return set_price_rtrim($yanglao);
     }
 
-    public function editPrice($product_id, $skuArr, $type = 1)
+    public function editPrice($product_id, $skuArr, $type = 1, $operatorId = 0)
     {
         if (empty($skuArr))
             throw new ApiException('参数错误');
@@ -1977,6 +1978,8 @@ class ProductRepository extends BaseRepository
                 ->select()->toArray();
             $attrInfo = array_column($attrInfo, null, 'gong_sku_id');
             $updateData = [];
+            /** @var ProductAttrValueChangeLogRepository $productAttrValueChangeLogRepository */
+            $productAttrValueChangeLogRepository = app()->make(ProductAttrValueChangeLogRepository::class);
             // 组装数据
             foreach ($skuArr as $key => $value) {
                 if (isset($attrInfo[$value['sku_id']])) {
@@ -1995,7 +1998,17 @@ class ProductRepository extends BaseRepository
                             throw new ApiException('销售价格填写不正确');
                         }
                     }
-
+                    /** @var StoreProductAttrValueChangeLogEntity $storeProductAttrValueChangeLogEntity */
+                    $storeProductAttrValueChangeLogEntity = StoreProductAttrValueChangeLogEntity::newInstance();
+                    $storeProductAttrValueChangeLogEntity->setProductId($product_id)
+                        ->setSkuId($value['sku_id'])
+                        ->setCost($attrInfo[$value['sku_id']]['cost'])
+                        ->setOtPrice($attrInfo[$value['sku_id']]['ot_price'])
+                        ->setPrice($attrInfo[$value['sku_id']]['price'])
+                        ->setPlateMerProfit($attrInfo[$value['sku_id']]['plate_mer_profit'])
+                        ->setOperatorId($operatorId)
+                        ->setCreateTime(date('Y-m-d H:i:s'));
+                    $productAttrValueChangeLogRepository->createByEntity($storeProductAttrValueChangeLogEntity);
                     $updateData[] = [
                         'gong_sku_id'      => $value['sku_id'],
                         'price'            => $value['edit_price'],

app/controller/merchant/store/product/Product.php

@@ -78,11 +78,12 @@ class Product extends BaseController
     {
         $skuArr = $this->request->param('skuArr', []);
         $type = $this->request->param('type');
+        $merchant_admin_id = $this->request->adminInfo()?$this->request->adminInfo()->merchant_admin_id:0;
 
         if (empty($skuArr) ||  !is_array($skuArr)) {
             return app('json')->fail('参数错误');
         }
-        $this->repository->editPrice($id, $skuArr, $type);
+        $this->repository->editPrice($id, $skuArr, $type, $merchant_admin_id);
         return app('json')->success("修改成功");
     }
 
@@ -90,7 +91,7 @@ class Product extends BaseController
     // 供应链商品删除
     public function deleteXp($id) {
         if (empty($id)) return app('json')->fail('请选择商品');
-        $this->repository->changeDelete($id,);
+        $this->repository->changeDelete($id);
         return app('json')->success('删除成功');
     }
 

app/entity/data/douhuomall/DouhuomallChangeLogEntity.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace app\entity\data\douhuomall;
+
+use app\entity\data\DataEntity;
+
+class DouhuomallChangeLogEntity extends DataEntity
+{
+    public $id = null;  // 主键ID
+    public $spuId = null;  // spuID
+    public $dataJson = null;  // 历史数据信息
+    public $effectProductJson = null;  // 供应链sku_id
+    public $createTime = null;  // 记录时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setId($id): DouhuomallChangeLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSpuId()
+    {
+        return $this->spuId;
+    }
+
+    /**
+     * @param mixed $spuId
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setSpuId($spuId): DouhuomallChangeLogEntity
+    {
+        $this->spuId = $spuId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDataJson()
+    {
+        return $this->dataJson;
+    }
+
+    /**
+     * @param mixed $dataJson
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setDataJson($dataJson): DouhuomallChangeLogEntity
+    {
+        if (is_array($dataJson)) {
+            $dataJson = json_encode($dataJson, JSON_UNESCAPED_UNICODE);
+        }
+        $this->dataJson = $dataJson;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEffectProductJson()
+    {
+        return $this->effectProductJson;
+    }
+
+    /**
+     * @param mixed $effectProductJson
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setEffectProductJson($effectProductJson): DouhuomallChangeLogEntity
+    {
+        if (is_array($effectProductJson)) {
+            $effectProductJson = json_encode($effectProductJson, JSON_UNESCAPED_UNICODE);
+        }
+        $this->effectProductJson = $effectProductJson;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return DouhuomallChangeLogEntity
+     */
+    public function setCreateTime($createTime): DouhuomallChangeLogEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}

app/entity/data/store/StoreProductAttrValueChangeLogEntity.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class StoreProductAttrValueChangeLogEntity extends DataEntity
+{
+    public $id = null;  // 主键ID
+    public $productId = null;  // 商品ID
+    public $skuId = null;  // 供应链sku_id
+    public $cost = null;  // 成本价
+    public $otPrice = null;  // 原价
+    public $price = null;  // 价格
+    public $plateMerProfit = null;  // 商户创客利润
+    public $operatorId = null;  // 操作人ID
+    public $createTime = null;  // 记录时间
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setId($id): StoreProductAttrValueChangeLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getProductId()
+    {
+        return $this->productId;
+    }
+
+    /**
+     * @param mixed $productId
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setProductId($productId): StoreProductAttrValueChangeLogEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSkuId()
+    {
+        return $this->skuId;
+    }
+
+    /**
+     * @param mixed $skuId
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setSkuId($skuId): StoreProductAttrValueChangeLogEntity
+    {
+        $this->skuId = $skuId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCost()
+    {
+        return $this->cost;
+    }
+
+    /**
+     * @param mixed $cost
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setCost($cost): StoreProductAttrValueChangeLogEntity
+    {
+        $this->cost = $cost;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOtPrice()
+    {
+        return $this->otPrice;
+    }
+
+    /**
+     * @param mixed $otPrice
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setOtPrice($otPrice): StoreProductAttrValueChangeLogEntity
+    {
+        $this->otPrice = $otPrice;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPrice()
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param mixed $price
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setPrice($price): StoreProductAttrValueChangeLogEntity
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPlateMerProfit()
+    {
+        return $this->plateMerProfit;
+    }
+
+    /**
+     * @param mixed $plateMerProfit
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setPlateMerProfit($plateMerProfit): StoreProductAttrValueChangeLogEntity
+    {
+        $this->plateMerProfit = $plateMerProfit;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOperatorId()
+    {
+        return $this->operatorId;
+    }
+
+    /**
+     * @param mixed $operatorId
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setOperatorId($operatorId): StoreProductAttrValueChangeLogEntity
+    {
+        $this->operatorId = $operatorId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return StoreProductAttrValueChangeLogEntity
+     */
+    public function setCreateTime($createTime): StoreProductAttrValueChangeLogEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}