Merge branch 'dev'

app/command/WiwibaoProductSync.php

@@ -0,0 +1,743 @@
+<?php
+declare (strict_types=1);
+
+namespace app\command;
+
+use app\common\enum\douhuomall\DouhuomallEnum;
+use app\common\enum\store\ProductEnum;
+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;
+
+class WiwibaoProductSync extends Command
+{
+
+    use GongApiRequest;
+
+    // 配置参数
+    protected $config = [
+        'page_size' => 100,      // 每页拉取数量
+        'max_pages' => 0,       // 最大页数限制
+        'price_change_rate' => 0.0, // 价格变动比率阈值（10%）
+    ];
+
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('wiwibaoproductsync')
+            ->setDescription('the wiwibaoproductsync command');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $output->writeln('定时任务执行中...');
+
+        $this->syncGoodsFromGong();
+
+        $output->writeln('定时任务执行完成');
+    }
+
+    /**
+     * 同步微唯宝商品数据（主方法）
+     */
+    public function syncGoodsFromGong()
+    {
+        try {
+            set_time_limit(0);
+
+            // 1. 批量拉取所有商品数据
+            $allProducts = $this->fetchAllProducts();
+
+            if (empty($allProducts)) {
+                Log::info('未拉取到任何商品数据');
+                return 'success';
+            }
+
+            // 2. 获取本地所有SPU ID
+            $localSpuIds = Db::name('douhuomall')->column('spu_id');
+            $syncedSpuIds = [];
+
+            // 3. 批量处理商品数据
+            foreach ($allProducts as $product) {
+                try {
+                    $spuId = $this->processSingleProduct($product);
+                    if ($spuId) {
+                        $syncedSpuIds[] = $spuId;
+                    }
+                } catch (\Exception $e) {
+                    Log::error("处理商品 {$product['goods_id']} 失败: " . $e->getMessage());
+                    continue;
+                }
+            }
+
+            // 4. 处理需要下架的商品（本地有但第三方已下架）
+            $this->handleOfflineProducts($localSpuIds, $syncedSpuIds);
+
+            return 'success';
+
+        } catch (\Exception $e) {
+            $this->logError('商品同步失败', $e);
+            return 'error';
+        }
+    }
+
+    /**
+     * 批量拉取所有商品数据
+     */
+    protected function fetchAllProducts()
+    {
+        $allData = [];
+
+        // 第一页
+        $firstPageData = GongApiRequest::get_goods_list(1, $this->config['page_size']);
+        if (empty($firstPageData['list'])) {
+            return [];
+        }
+
+        $allData = $firstPageData['list'];
+        $totalPages = $firstPageData['pages'] ?? 1;
+        if (!empty($this->config['max_pages'])) {
+            $totalPages = min($totalPages, $this->config['max_pages']);
+        }
+
+        // 并行获取剩余页面
+        for ($page = 2; $page <= $totalPages; $page++) {
+            $pageData = GongApiRequest::get_goods_list($page, $this->config['page_size']);
+            if (!empty($pageData['list'])) {
+                $allData = array_merge($allData, $pageData['list']);
+            }
+        }
+
+        return $allData;
+    }
+
+    /**
+     * 处理单个商品
+     */
+    protected function processSingleProduct($productData)
+    {
+        $goodsId = $productData['goods_id'];
+
+        // 1. 获取商品详情
+        $goodsInfo = GongApiRequest::get_goods_info($goodsId);
+        if (!$goodsInfo) {
+            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);
+
+        // 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 [];
+        }
+
+        $processedSkus = [];
+        foreach ($skuList as $sku) {
+            if (empty($sku['plat_price'])) {
+                continue;
+            }
+
+            $processedSku = [
+                'sku_id' => $sku['sku_id'] ?? 0,
+                'plat_price' => $sku['plat_price'],
+                'img_url' => $sku['main_img'],
+                'retail_price' => $sku['retail_price'] ?? 0,
+                'cost_price' => $this->calculateCostPrice($sku['plat_price']),
+                'market_price' => $this->calculateMarketPrice($sku['plat_price']),
+                'profit' => $this->calculateProfit($sku['plat_price']),
+                'mer_profit' => $this->calculateMerProfit($sku['plat_price']),
+                'yanglaojin' => '0.00',
+                'main_img' => $sku['main_img'] ?? '',
+                'attribute_json' => !empty($sku['attr']) ? $sku['attr'] : [['val' => '默认', 'name' => '默认']]
+            ];
+
+            $processedSkus[] = array_merge($sku, $processedSku);
+        }
+
+        return $processedSkus;
+    }
+
+    /**
+     * 构建保存数据
+     */
+    protected function buildSaveData($goodsInfo, $skuInfo, $imageData)
+    {
+        // 构建详情HTML
+        $detailHtml = $this->buildDetailHtml($imageData['detail_images']);
+
+        return [
+            'spu_id' => $goodsInfo['goods_id'],
+            'skuId_info' => $skuInfo,
+            'sys_id' => '112',
+            'goods_id' => $goodsInfo['goods_id'],
+            'spuId_info' => array_merge(
+                $goodsInfo,
+                [
+                    'cover_url' => $imageData['cover_url'],
+                    'detail' => $detailHtml,
+                    'detail_img_list' => $imageData['detail_img_list']
+                ]
+            ),
+            'sku_id' => $skuInfo[0]['sku_id'] ?? 0,
+            'status' => $goodsInfo['status'] ?? 0,
+            'cate_ids' => $goodsInfo['cate_ids'] ?? '',
+            'title' => $goodsInfo['spu_name'] ?? '',
+            'cxb_cate_id' => 0
+        ];
+    }
+
+    /**
+     * 构建详情HTML
+     */
+    protected function buildDetailHtml($detailImages)
+    {
+        if (empty($detailImages)) {
+            return '';
+        }
+
+        $detailHtml = '';
+        foreach ((array)$detailImages as $imgUrl) {
+            $detailHtml .= "<img src='{$imgUrl}' referrerpolicy='no-referrer' />";
+        }
+
+        return $detailHtml;
+    }
+
+    /**
+     * 保存到douhuomall表（基于原有add方法）
+     */
+    protected function addToDouhuomall($data)
+    {
+        try {
+            $findData = Db::name('douhuomall')->where('spu_id', $data['spu_id'])->find();
+
+            // 对SKU按成本价排序，获取最低成本价的SKU
+            $skuInfo = $this->arrSort($data['skuId_info'], 'cost_price', SORT_ASC);
+
+            // 计算价格字段
+            $data['cost_price'] = $skuInfo[0]['cost_price'] ?? 0;
+            $data['market_price'] = $skuInfo[0]['market_price'] ?? 0;
+            $data['ot_price'] = $skuInfo[0]['retail_price'] ?? 0;
+            $data['mer_profit'] = $skuInfo[0]['mer_profit'] ?? 0;
+            $data['pension'] = $skuInfo[0]['yanglaojin'] ?? 0;
+            $data['profit'] = (empty($data['cost_price']) || empty($data['market_price']))
+                ? 0
+                : bcdiv((string)$data['market_price'], (string)$data['cost_price'], 2);
+
+            $now = date('Y-m-d H:i:s');
+
+            if (empty($findData)) {
+                // 新增
+                $insertData = [
+                    'spu_id' => $data['spu_id'],
+                    'skuId_info' => json_encode($data['skuId_info'], JSON_UNESCAPED_UNICODE),
+                    'sys_id' => $data['sys_id'],
+                    'goods_id' => $data['goods_id'],
+                    'spuId_info' => json_encode($data['spuId_info'], JSON_UNESCAPED_UNICODE),
+                    'create_time' => $now,
+                    'update_time' => $now,
+                    'sku_id' => $data['sku_id'],
+                    'status' => $data['status'],
+                    'cate_ids' => $data['cate_ids'],
+                    'title' => $data['title'],
+                    'cost_price' => $data['cost_price'],
+                    'market_price' => $data['market_price'],
+                    'ot_price' => $data['ot_price'],
+                    'profit' => $data['profit'],
+                    'mer_profit' => $data['mer_profit'],
+                    'pension' => $data['pension'],
+                    'cxb_cate_id' => $data['cxb_cate_id']
+                ];
+                Db::name('douhuomall')->insert($insertData);
+            } 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);
+            }
+
+            return $data['spu_id'];
+
+        } catch (\Exception $e) {
+            Log::error("保存商品到douhuomall失败: " . $e->getMessage());
+            throw $e;
+        }
+    }
+
+    /**
+     * 检查是否需要恢复已删除商品的上架状态
+     */
+    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)
+    {
+        Db::name('store_product')
+            ->where('spu_id', $spuId)
+            ->update([
+                'is_show' => ProductEnum::IS_SHOW['No']['code'],
+                'status' => ProductEnum::STATUS['Approved']['code']
+            ]);
+
+        Log::info("恢复商品上架（恢复到仓库中）状态: spu_id={$spuId}");
+    }
+
+    /**
+     * 检查并处理已上架商品
+     */
+    protected function checkAndProcessOnlineProduct($spuId, $syncData)
+    {
+        // 检查商品是否已上架
+        try {
+            $productList = Db::name('store_product')
+                ->where('is_show', ProductEnum::IS_SHOW['Yes']['code'])
+                ->where('spu_id', $spuId)
+                ->select()
+                ->toArray();
+
+            if (empty($productList)) {
+                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) {
+                // 获取本地商品价格信息
+                // 获取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) {
+                    // 价格变动超过阈值，下架商品并记录
+                    $this->offlineProductWithRecord($product, $syncData, $localPrices, $syncPrices);
+                } else {
+                    // 价格未变动或变动很小，只更新图片
+                    $this->updateProductImages($spuId);
+                }
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+    }
+
+    /**
+     * 检查价格是否变动超过阈值
+     */
+    protected function checkPriceChange($localPrices, $syncPrices)
+    {
+        // 如果没有SKU，比较商品主价格
+        if (empty($localPrices['skus'])) {
+            $localPrice = $localPrices['product_price'];
+            $syncPrice = $syncPrices[0]['market_price'] ?? 0;
+
+            if ($localPrice > 0 && $syncPrice > 0) {
+                $changeRate = abs(($syncPrice - $localPrice) / $localPrice);
+                return $changeRate > $this->config['price_change_rate'];
+            }
+            return false;
+        }
+
+        // 如果有SKU，匹配SKU进行比较
+        foreach ($localPrices['skus'] as $localSku) {
+            foreach ($syncPrices as $syncSku) {
+                // 尝试匹配SKU
+                if ($this->matchSku($localSku, $syncSku)) {
+                    $localPrice = $localSku['price'] ?? 0;
+                    $syncPrice = $syncSku['market_price'] ?? 0;
+
+                    if ($localPrice > 0 && $syncPrice > 0) {
+                        $changeRate = abs(($syncPrice - $localPrice) / $localPrice);
+                        if ($changeRate > $this->config['price_change_rate']) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 匹配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'];
+        }
+
+        // 可以根据其他属性匹配，如规格等
+        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)
+            ->update([
+                'is_show' => ProductEnum::IS_SHOW['No']['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;
+        }
+
+        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');
+        }
+
+        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();
+
+        foreach ($products as $product) {
+            // 记录下架前数据
+            $beforeData = $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,
+                $beforeData,
+                []
+            );
+        }
+
+        // 从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)
+    {
+        $keysValue = [];
+        foreach ($array as $k => $v) {
+            $keysValue[$k] = $v[$keys] ?? 0;
+        }
+        array_multisort($keysValue, $sort, $array);
+        return $array;
+    }
+
+    /**
+     * 计算成本价
+     */
+    protected function calculateCostPrice($platPrice)
+    {
+        return bcadd((string)$platPrice, bcmul((string)$platPrice, '0.03', 4), 2);
+    }
+
+    /**
+     * 计算市场价
+     */
+    protected function calculateMarketPrice($platPrice)
+    {
+        $costPrice = $this->calculateCostPrice($platPrice);
+        return bcadd($costPrice, bcmul($costPrice, '0.2', 4), 2);
+    }
+
+    /**
+     * 计算利润率
+     */
+    protected function calculateProfit($platPrice)
+    {
+        $costPrice = $this->calculateCostPrice($platPrice);
+        $marketPrice = $this->calculateMarketPrice($platPrice);
+        return bcdiv($marketPrice, $costPrice, 2);
+    }
+
+    /**
+     * 计算毛利
+     */
+    protected function calculateMerProfit($platPrice)
+    {
+        $costPrice = $this->calculateCostPrice($platPrice);
+        $marketPrice = $this->calculateMarketPrice($platPrice);
+        return bcsub($marketPrice, $costPrice, 2);
+    }
+
+    /**
+     * 记录错误
+     */
+    protected function logError($message, \Exception $e)
+    {
+        $errorInfo = [
+            'message' => $message,
+            'file' => $e->getFile(),
+            'line' => $e->getLine(),
+            'error' => $e->getMessage()
+        ];
+
+        Log::error('商品同步错误' . json_encode($errorInfo, JSON_UNESCAPED_UNICODE));
+
+        Db::name('log')->insert([
+            'data' => json_encode($errorInfo, JSON_UNESCAPED_UNICODE),
+            'time' => date('Y-m-d H:i:s')
+        ]);
+    }
+}

app/common/enum/douhuomall/DouhuomallEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\enum\douhuomall;
+
+use app\common\enum\CommonEnum;
+
+class DouhuomallEnum extends CommonEnum
+{
+    // 微唯宝文档中说明："status": 1,//商品状态（0=下架，1=上架，3=删除）
+    const STATUS = [
+        'Down' => ['code' => 0, 'name' => '下架'],
+        'Up' => ['code' => 1, 'name' => '上架'],
+        'Delete' => ['code' => 3, 'name' => '删除'],
+    ];
+}

app/common/enum/store/ProductEnum.php

@@ -36,4 +36,9 @@ class ProductEnum extends CommonEnum
         'No' => ['code' => 0, 'name' => '否'],
         'Yes' => ['code' => 1, 'name' => '是']
     ];
+
+    const IS_STATUS = [
+        'Automatic' => ['code' => 0, 'name' => '系统自动操作'],
+        'Triggered' => ['code' => 1, 'name' => '人为触发操作']
+    ];
 }

app/common/middleware/AdminTokenMiddleware.php

@@ -32,7 +32,7 @@ class AdminTokenMiddleware extends BaseMiddleware
      */
     public function before(Request $request)
     {
-        \think\facade\Log::info('Midd_ko=>'.\GuzzleHttp\json_encode($request));
+        // \think\facade\Log::info('Midd_ko=>'.\GuzzleHttp\json_encode($request));
         $force = $this->getArg(0, true);
         try {
             $token = trim($request->header('X-Token'));

app/common/repositories/finance/FinanceRepository.php

@@ -1076,6 +1076,8 @@ class FinanceRepository extends BaseRepository
         //导出数据
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
+            ini_set('memory_limit', '-1');
+            set_time_limit(0);
             $date['list'] = $this->date_where($query, $where['date'], 'ub.create_time')
             ->field('ub.bill_id,ub.title,ub.number,ub.mark,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
             ->order('ub.bill_id', 'desc')

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -163,6 +163,49 @@ class OrderMerchantRepository extends BaseRepository
             ->whereNull('refund_time')
             ->find();
 
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel){
+            ini_set('memory_limit', '-1');
+            set_time_limit(0);
+            $list = clone $query;
+            $list = $list->with(['merchant' => function ($query) {
+                return $query->field('mer_id,mer_name,mer_avatar');
+            }])->order('id desc')->select()->each(function ($item) {
+                $item->actual = bcsub($item->money, ($item->available + $item->swipe_fee), 2);
+                return $item;
+            });
+
+            $arr = [];
+            foreach ($list as $item){
+                $status = $item['paid'] == 1 ? '已支付' : '未支付';
+                if($item['refund_time']) $status = '已退款';
+
+                $arr[] = [
+                    $item['id'],
+                    $item['mer_id'],
+                    $item['merchant']['mer_name'] ?? '',
+                    $item['uid'],
+                    $item['money'],
+                    $item['available'],
+                    $item['service_money'],
+                    $item['pension'],
+                    $item['swipe_fee'],
+                    $item['mer_money'],
+                    $item['mer_fanyong'],
+                    $item['actual'],
+                    $status,
+                    $item['create_time'],
+                    $item['out_trade_no']
+                ];
+            }
+            $header = [
+                'ID', '商户ID', '商户名称', '用户ID',
+                '充值金额', '可分佣总额', '服务商返利', '养老金', '刷卡手续费', '商户金额', '商户返佣', '实到金额',
+                '状态', '时间', '订单号'
+            ];
+            return app()->make(\crmeb\services\SpreadsheetExcelService::class)->setExcelContent($header, $arr, '线下订单');
+        }
+
         $count = $query->count();
         $list = $query->with(['merchant', 'merchant' => function ($query) {
             return $query->field('mer_id,mer_name,mer_avatar');

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -165,7 +165,9 @@ class StoreGroupOrderRepository extends BaseRepository
             $groupOrder->save();
 
             //取消订单，返还京豆和积分
-            $orderId = $order->order_id;
+            if (!empty($order)) {
+                $orderId = $order->order_id;
+
             $userSignScoreInfo = Db::name('user_sign_score')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
             if($userSignScoreInfo){
                 $userDecScore = $userSignScoreInfo['reward_socre'];
@@ -219,7 +221,7 @@ class StoreGroupOrderRepository extends BaseRepository
                     ->insertGetId($ins_data);
                 Db::name('user')->where('uid', $uid)->inc('jingdou', $userDecJingScore)->update();
             }
-
+            }
 
 
             app()->make(StoreOrderStatusRepository::class)->insertAll($orderStatus);

app/common/repositories/store/order/StoreOrderRepository.php

@@ -6887,7 +6887,7 @@ class StoreOrderRepository extends BaseRepository
         try {
             $order = Db::name('store_order')->where('status', 0)->where('pay_type', '>', 0)->where('douhuomall', 1)->where('douhuomall_status', 9)->select();
             if ($order) {
-                log::info("传参数据333========");
+                // log::info("传参数据333========");
                 $gong = app()->make(ProductAttrValueRepository::class);
                 $order = $order->toArray();
                 foreach ($order as $key => $value) {

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

@@ -112,7 +112,7 @@ class ProductAttrValueRepository extends BaseRepository
         $address_id = '809';
         if($address_code_list){
             $address_id = explode(',',$address_code_list);
-            log::info($address_id);
+            // log::info($address_id);
             $address_id = end($address_id);
         }
         $sku = [[

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

@@ -859,7 +859,7 @@ class ProductRepository extends BaseRepository
 
         //搜索记录
         if ($userInfo && isset($where['keyword']) && !empty($where['keyword'])){
-            log::info("======sousuojilu====");
+            // log::info("======sousuojilu====");
             app()->make(UserVisitRepository::class)->searchProduct($userInfo['uid'], $where['keyword']);
         }
 
@@ -1949,18 +1949,18 @@ class ProductRepository extends BaseRepository
                 $base_commission= floatval(systemConfig('extension_tao_rate'));
                 $logs['extension_tao_rate'] = $base_commission;
                 //返佣总额 返利总额=（交易金额-手续费）*返利比例
-                log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
+                // log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
                 $yanglao=bcmul($yanglao-$souxufees,$base_commission/100,3);
-                log::info("计算养老金 good_id： {$good_id},yanglao-$souxufees 保留三位$yanglao");
+                // log::info("计算养老金 good_id： {$good_id},yanglao-$souxufees 保留三位$yanglao");
             }
             $yanglao = $yanglao * $yanglaojin_admin /100  ;//养老金比例
-            log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
+            // log::info("计算养老金 good_id： {$good_id},yanglao ： $yanglao");
 
             $yanglao= decimal2($yanglao);// 取两位小数 后面舍去
         }
 
-        log::info(json_encode($logs));
-        log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
+        // log::info(json_encode($logs));
+        // log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
 
         return set_price_rtrim($yanglao);
     }

app/common/repositories/system/merchant/MerchantRepository.php

@@ -416,11 +416,11 @@ class MerchantRepository extends BaseRepository
      */
     public function productList($merId, $where, $page, $limit, $userInfo,$type439=false,$is_commercetrade = 0)
     {
-        log::info("========j进入prodctList");
-        log::info($merId);
-        log::info( $where);
-        log::info($userInfo);
-        log::info($type439);
+        // log::info("========j进入prodctList");
+        // log::info($merId);
+        // log::info( $where);
+        // log::info($userInfo);
+        // log::info($type439);
         $list=app()->make(ProductRepository::class)->getApiSearch($merId, $where, $page, $limit, $userInfo,$type439);
 
         $arr=[];
@@ -429,7 +429,7 @@ class MerchantRepository extends BaseRepository
             $productMerId = $v['mer_id'] ?? 0;
 //            $v['special_merchant']= merchantConfig($v['mer_id'], 'special_merchant');
 
-            log::info("==========yang= {$k['yanglao']} ");
+            // log::info("==========yang= {$k['yanglao']} ");
 
             $v['yanglao']='';
             $v['pv']='';

app/common/repositories/user/UserRepository.php

@@ -4623,11 +4623,13 @@ class UserRepository extends BaseRepository
      * @return void
      */
     public function sproductkeywordHistory($uid, $keyword, $type){
-        Db::name('third_history')->insert([
-            'uid' => $uid,
-            'keyword' => $keyword,
-            'type' => $type,
-        ]);
+        if (!empty($keyword)) {
+            Db::name('third_history')->insert([
+                'uid' => $uid,
+                'keyword' => $keyword,
+                'type' => $type,
+            ]);
+        }
     }
 
 

app/controller/admin/order/MerchantOfflineOrder.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\controller\admin\order;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
+use crmeb\basic\BaseController;
+use think\App;
+
+class MerchantOfflineOrder extends BaseController
+{
+    /**
+     * @var OrderMerchantRepository
+     */
+    protected $repository;
+
+    /**
+     * @var int
+     */
+    protected $merId;
+
+    /**
+     * MerchantIntention constructor.
+     * @param App $app
+     * @param OrderMerchantRepository $repository
+     */
+    public function __construct(App $app, OrderMerchantRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+        $this->merId = 0;
+    }
+    /**
+     * @return mixed
+     * 展示线下订单
+     */
+    public function lst()
+    {
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params(['keyword', 'date', 'status', 'mer_id']);
+        return app('json')->success($this->repository->getMerchantListAdmin($this->merId, $where, $page, $limit));
+    }
+
+}

app/controller/api/Auth.php

@@ -1462,6 +1462,7 @@ class Auth extends BaseController
                 if (!$data['code'])
                     return app('json')->make(402, '操作过于频繁，请稍后重试~');
             }
+            Cache::set($sms_num_key, $num + 1, 300);
         }
         $sms_key = 'api.auth.sms.' . $data['phone'];
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
@@ -1474,11 +1475,10 @@ class Auth extends BaseController
             return app('json')->fail('操作过于频繁，请稍后重试~');
         }
 
-        log::info("sms_key==={$sms_key}" );
-        log::info("sms_code==={$sms_code}" );
-        log::info("sms_time==={$sms_time}" );
+        // log::info("sms_key==={$sms_key}" );
+        // log::info("sms_code==={$sms_code}" );
+        // log::info("sms_time==={$sms_time}" );
         Cache::set($sms_key, $sms_code,$sms_time * 60);
-        Cache::set($sms_num_key, $num + 1, 300);
         //'短信发送成功'
         return app('json')->success('短信发送成功');
     }

app/controller/api/store/merchant/Merchant.php

@@ -133,7 +133,7 @@ class Merchant extends BaseController
         $where['is_used'] = 1;
         $where['product_type'] = 0;
         $where['is_hide'] = 0;
-        log::info("====={$params['mer_cate_id']}===");
+        // log::info("====={$params['mer_cate_id']}===");
         if($params['mer_cate_id']){
             $where['cate_id'] = $params['mer_cate_id'];
         }

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

@@ -115,7 +115,7 @@ class Jd extends BaseController
         if (empty($apiName)) {
             return false;
         }
-        log::info("url京东111");
+        // log::info("url京东111");
         //公共请求参数
         $requestParams = [
             'method'            => $apiName,
@@ -130,8 +130,8 @@ class Jd extends BaseController
         $sign = $this->paramSign($orderData);
         $requestParams['sign'] = $sign;
         $res = $this->apiSign($requestParams);
-        log::info("url京东end");
-        log::info($res);
+        // log::info("url京东end");
+        // log::info($res);
         return $res;
     }
 

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

@@ -184,7 +184,7 @@ class TaoKe extends BaseController
 
         $params['cat_id'] = $cat_id;
 
-        Log::info($params);
+        // Log::info($params);
 
         $apiName = 'pdd.ddk.goods.search';
         $result = $this->getUrlResult($apiName, $params);
@@ -204,7 +204,7 @@ class TaoKe extends BaseController
 
         foreach ($goodsResult as $goods) {
 
-            log::info("=======min_normal_price====={$goods['min_normal_price']}==============");
+            // log::info("=======min_normal_price====={$goods['min_normal_price']}==============");
             //var_dump($goods);
             $min_normal_price = sprintf('%.2f', $goods['min_normal_price'] / 100);
             $groupPrice = sprintf('%.2f', $goods['min_group_price'] / 100);
@@ -213,7 +213,7 @@ class TaoKe extends BaseController
             //佣金比例,千分比
             $commissionRate = $goods['promotion_rate'];
 
-            log::info("=======min_normal_price====={$groupPrice}==========={$commissionRate}===");
+            // log::info("=======min_normal_price====={$groupPrice}==========={$commissionRate}===");
             $commission = sprintf('%.2f', (($groupPrice * $commissionRate) /1000));  //佣金
             //将佣金根据用户等级转成积分
             //$userCommissionIntegral = getCommission($userLevel, $commission);
@@ -229,7 +229,7 @@ class TaoKe extends BaseController
 
 //            $pv=sprintf('%.2f',$commission* 0.5);  //PV
 //            $yanglaojin=$pv; //新的养老金
-            Log::info("养老金：".$yanglaojin);
+//             Log::info("养老金：".$yanglaojin);
             // if($yanglaojin < 0.1) {
             //     continue;
             // }
@@ -262,7 +262,7 @@ class TaoKe extends BaseController
                     'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000), //月销量
                     'cat_ids'=>$goods['cat_ids']
                 ];
-                Log::info($current_goods);
+                // Log::info($current_goods);
                 $goodsList[] =$current_goods;
                 $cid=isset($goods['cat_ids'][0])?$goods['cat_ids'][0]:0;
                 // Db::name("third_party_goods")->insert([

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

@@ -313,8 +313,8 @@ class Vip extends BaseController
             ->orderRaw("RAND({$salt})")
             ->select()->toArray();
 
-        Log::info("vip=================");
-        log::info($data);
+        // Log::info("vip=================");
+        // log::info($data);
 
         // 获取列表数据
         // $data = Db::name('third_party_goods')->where('type', 5)->page($page, $limit)->select()->toArray();
@@ -763,8 +763,8 @@ class Vip extends BaseController
                     "{$value}TimeStart" => $startTime,
                     "{$value}TimeEnd" => $endTime,
                 ];
-                log::info("====VIP 订单===");
-                log::info($params);
+                // log::info("====VIP 订单===");
+                // log::info($params);
 
                 $result = $this->doOrderVip($params);
                 $result && $orderList[] = $result;

app/controller/merchant/gong/Goods.php

@@ -253,7 +253,13 @@ class Goods extends BaseController
             $spuId_info = json_decode($data['spuId_info'], true);
             $slider_image = $spuId_info['detail_img_list'] ?? '';
             $image = $spuId_info['cover_url'] ?? '';
-            $slider_image = empty($slider_image) ? $image : implode(',', json_decode($slider_image, true));
+            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、商品入库数据

app/event.php

@@ -19,7 +19,7 @@ return [
             \crmeb\listens\AutoUnLockBrokerageListen::class,//自动解冻佣金
             \crmeb\listens\AutoSendPayOrderSmsListen::class,//查询10分钟内未支付的订单，发送短信提示用户
             \crmeb\listens\SyncSmsResultCodeListen::class,//查询短信发送记录后 api返回结果
-            \crmeb\listens\SyncBroadcastStatusListen::class,
+            // \crmeb\listens\SyncBroadcastStatusListen::class,
             \crmeb\listens\ExcelFileDelListen::class,
 //            \crmeb\listens\RefundOrderAgreeListen::class,//商户自动处理退款订单期限（天）
             \crmeb\listens\SeckillTImeCheckListen::class,//自动检测秒杀结束失败

app/traits/GongApiRequest.php

@@ -633,9 +633,9 @@ trait GongApiRequest
             $data = strstr($data,'{');
         }
         if ($url != 'https://www.douhuomall.com/api/category/get_list'){
-            log::info('供应链【'.$url.'】body:'.json_encode($postFields,JSON_UNESCAPED_UNICODE));
-            log::info('供应链【'.$url.'】headerArray:'.json_encode($header,JSON_UNESCAPED_UNICODE));
-            log::info('供应链【'.$url.'】data:'.$data);
+            // log::info('供应链【'.$url.'】body:'.json_encode($postFields,JSON_UNESCAPED_UNICODE));
+            // log::info('供应链【'.$url.'】headerArray:'.json_encode($header,JSON_UNESCAPED_UNICODE));
+            // log::info('供应链【'.$url.'】data:'.$data);
 //            Db::name("log")->insert(array('data'=>'供应链【'.$url.'】body:'.json_encode($postFields)));//日志记录
 //            Db::name("log")->insert(array('data'=>'供应链【'.$url.'】headerArray:'.json_encode($header)));//日志记录
 //            Db::name("log")->insert(array('data'=>'供应链【'.$url.'】data:'.$data));//日志记录

config/console.php

@@ -33,5 +33,6 @@ return [
         'movie_order' => 'app\command\MovieOrderCommand',
         'repair_pay_success' => 'app\command\repairPaySuccess',
         'repair_fzone_pay_type' => 'app\command\repairFzonePayType',
+        'wiwibaoproductsync' => 'app\command\WiwibaoProductSync',
     ],
 ];

crmeb/listens/AutoCancelGroupOrderListen.php

@@ -5,7 +5,7 @@
  * @author xaboy
  * @day 2020/6/9
  *
- * 
+ *
  */
 
 namespace crmeb\listens;
@@ -31,7 +31,15 @@ class AutoCancelGroupOrderListen implements ListenerInterface
                 try {
                     $storeGroupOrderRepository->cancel($id);
                 } catch (\Exception $e) {
-                    Log::info('自动关闭订单失败' . var_export($id, 1));
+                    Log::error('自动关闭订单失败' . json_encode([
+                            'order_id' => $id,
+                            'error_message' => $e->getMessage(),
+                            'error_file' => $e->getFile(),
+                            'error_line' => $e->getLine(),
+                            'error_code' => $e->getCode(),
+                            'exception_class' => get_class($e),
+                            'trace' => $e->getTraceAsString()
+                        ], JSON_UNESCAPED_UNICODE));
                 }
             }
         });
@@ -47,7 +55,15 @@ class AutoCancelGroupOrderListen implements ListenerInterface
                         $storeGroupOrderRepository->cancel($id);
                     }
                 } catch (\Exception $e) {
-                    Log::info('自动关闭订单失败' . var_export($id, 1));
+                    Log::error('自动关闭代付订单失败' . json_encode([
+                            'order_id' => $id,
+                            'error_message' => $e->getMessage(),
+                            'error_file' => $e->getFile(),
+                            'error_line' => $e->getLine(),
+                            'error_code' => $e->getCode(),
+                            'exception_class' => get_class($e),
+                            'trace' => $e->getTraceAsString()
+                        ], JSON_UNESCAPED_UNICODE));
                 }
             }
         });

route/admin.php

@@ -978,6 +978,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::post('killOrderRewards', 'Order/killOrderRewards');//撤回订单
             Route::post('killOrderLst', 'Order/killOrderLst');//撤回订单的列表
             Route::post('easterKillOrder', 'Order/easterKillOrder');//撤回撤回订单
+            Route::get('merchantOfflineOrder', 'MerchantOfflineOrder/lst');//线下订单展示
         })->prefix('admin.order.');
 
         //第三方订单