From a685984380ff9763d70bf4361190c3010205e739 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 17 May 2023 15:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=91=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/product/SpuRepository.php           |  15 +
 app/controller/api/Common.php.bak             | 477 ------------------
 .../api/store/merchant/Merchant.php.bak       | 122 -----
 .../api/store/order/StoreCart.php.bak         | 271 ----------
 .../api/store/order/StoreOrder.php.bak        | 298 -----------
 .../api/store/product/StoreProduct.php.bak    | 196 -------
 app/controller/api/store/product/StoreSpu.php |  27 +
 .../merchant/store/product/Product.php.bak    | 381 --------------
 app/listener/ProductCreate.php                |  91 ++--
 .../6d/ea25ba26d0916a28e7391e06cb43a5.php     |   4 +-
 10 files changed, 102 insertions(+), 1780 deletions(-)
 delete mode 100644 app/controller/api/Common.php.bak
 delete mode 100644 app/controller/api/store/merchant/Merchant.php.bak
 delete mode 100644 app/controller/api/store/order/StoreCart.php.bak
 delete mode 100644 app/controller/api/store/order/StoreOrder.php.bak
 delete mode 100644 app/controller/api/store/product/StoreProduct.php.bak
 delete mode 100644 app/controller/merchant/store/product/Product.php.bak

diff --git a/app/common/repositories/store/product/SpuRepository.php b/app/common/repositories/store/product/SpuRepository.php
index ee710a00..08177b6a 100644
--- a/app/common/repositories/store/product/SpuRepository.php
+++ b/app/common/repositories/store/product/SpuRepository.php
@@ -157,6 +157,21 @@ class SpuRepository extends BaseRepository
         return compact('count', 'list');
     }
 
+    public function getApiCloudSearch($where, $page, $limit)
+    {
+        $where['spu_status'] = 1;
+        $where['mer_status'] = 1;
+        $query = $this->dao->search($where);
+
+        $count = $query->count();
+//        $Sql=$query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->fetchSql(true);
+        $list = $query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->select();
+        $append = ['stop_time','svip_price','show_svip_info','is_svip_price'];
+
+        $list->append($append);
+        $list = $this->getBorderList($list);
+        return compact('count', 'list');
+    }
     public function getBorderList($list)
     {
         $make = app()->make(StoreActivityRepository::class);
diff --git a/app/controller/api/Common.php.bak b/app/controller/api/Common.php.bak
deleted file mode 100644
index 130879f5..00000000
--- a/app/controller/api/Common.php.bak
+++ /dev/null
@@ -1,477 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-
-namespace app\controller\api;
-
-
-use app\common\repositories\delivery\DeliveryOrderRepository;
-use app\common\repositories\store\product\ProductAssistSetRepository;
-use app\common\repositories\store\product\ProductGroupBuyingRepository;
-use app\common\repositories\store\product\ProductGroupRepository;
-use app\common\repositories\store\product\ProductPresellRepository;
-use app\common\repositories\store\product\ProductRepository;
-use app\common\repositories\store\shipping\ExpressRepository;
-use app\common\repositories\store\StoreCategoryRepository;
-use app\common\repositories\system\CacheRepository;
-use app\common\repositories\system\diy\DiyRepository;
-use app\common\repositories\system\groupData\GroupDataRepository;
-use app\common\repositories\system\merchant\MerchantRepository;
-use app\common\repositories\system\notice\SystemNoticeConfigRepository;
-use app\common\repositories\user\UserRepository;
-use app\common\repositories\user\UserSignRepository;
-use app\common\repositories\user\UserVisitRepository;
-use app\common\repositories\wechat\TemplateMessageRepository;
-use app\common\repositories\wechat\WechatUserRepository;
-use crmeb\basic\BaseController;
-use crmeb\services\AlipayService;
-use crmeb\services\CopyCommand;
-use crmeb\services\MiniProgramService;
-use crmeb\services\UploadService;
-use crmeb\services\WechatService;
-use Exception;
-use Joypack\Tencent\Map\Bundle\Location;
-use Joypack\Tencent\Map\Bundle\LocationOption;
-use think\exception\ValidateException;
-use think\facade\Cache;
-use think\facade\Log;
-use think\Response;
-
-/**
- * Class Common
- * @package app\controller\api
- * @author xaboy
- * @day 2020/5/28
- */
-class Common extends BaseController
-{
-    /**
-     * @return mixed
-     * @author xaboy
-     * @day 2020/5/28
-     */
-    public function hotKeyword()
-    {
-        $type = $this->request->param('type');
-        switch ($type) {
-            case 0:
-                $keyword = systemGroupData('hot_keyword');
-                break;
-            case 1:
-                $keyword = systemGroupData('community_hot_keyword');
-                break;
-        }
-        return app('json')->success($keyword);
-    }
-
-    public function express(ExpressRepository $repository)
-    {
-        return app('json')->success($repository->options());
-    }
-
-    public function menus()
-    {
-        return app('json')->success([
-            'global_theme' => $this->getThemeVar(systemConfig('global_theme')),
-            'banner' => systemGroupData('my_banner'),
-            'menu' => systemGroupData('my_menus')
-        ]);
-    }
-
-    public function refundMessage()
-    {
-        return app('json')->success(explode("\n", systemConfig('refund_message')));
-    }
-
-    private function getThemeVar($type)
-    {
-        return app()->make(DiyRepository::class)->getThemeVar($type);
-    }
-
-    public function config()
-    {
-        $config = systemConfig(['open_update_info', 'store_street_theme', 'is_open_service', 'is_phone_login', 'global_theme', 'integral_status', 'mer_location', 'alipay_open', 'hide_mer_status', 'mer_intention_open', 'share_info', 'share_title', 'share_pic', 'store_user_min_recharge', 'recharge_switch', 'balance_func_status', 'yue_pay_status', 'site_logo', 'routine_logo', 'site_name', 'login_logo', 'procudt_increase_status', 'sys_extension_type', 'member_status', 'copy_command_status', 'community_status','community_reply_status','community_app_switch', 'withdraw_type', 'recommend_switch', 'member_interests_status', 'beian_sn', 'community_reply_auth','hot_ranking_switch','svip_switch_status','margin_ico','margin_ico_switch']);
-        $make = app()->make(TemplateMessageRepository::class);
-
-        $cache = app()->make(CacheRepository::class)->search(['copyright_status', 'copyright_context', 'copyright_image', 'sys_intention_agree']);
-
-        if (!isset($cache['sys_intention_agree'])) {
-            $cache['sys_intention_agree'] = systemConfig('sys_intention_agree');
-        }
-
-        $title = app()->make(UserSignRepository::class)->signConfig();
-        if (!$title) {
-            $config['member_status'] = 0;
-        }
-        if (!is_array($config['withdraw_type'])) {
-            $config['withdraw_type'] = ['1', '2', '3'];
-        }
-
-        $config['tempid'] = app()->make(SystemNoticeConfigRepository::class)->getSubscribe();
-        $config['global_theme'] = $this->getThemeVar($config['global_theme']);
-        $config['navigation'] = app()->make(DiyRepository::class)->getNavigation();
-        $config = array_merge($config, $cache);
-        return app('json')->success($config);
-    }
-
-    /**
-     * @param GroupDataRepository $repository
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/3
-     */
-    public function userRechargeQuota(GroupDataRepository $repository)
-    {
-        $recharge_quota = $repository->groupDataId('user_recharge_quota', 0);
-        $recharge_attention = explode("\n", systemConfig('recharge_attention'));
-        return app('json')->success(compact('recharge_quota', 'recharge_attention'));
-    }
-
-    /**
-     * @param $field
-     * @return mixed
-     * @author xaboy
-     * @day 2020/5/28
-     */
-    public function uploadImage($field)
-    {
-        $name = $this->request->param('name');
-        $file = $this->request->file($field);
-        if (!$file)
-            return app('json')->fail('请上传图片');
-        if ($name) {
-            $f = $this->request->getOriginFile($field);
-            if ($f) {
-                $f['name'] = $name;
-            }
-            $this->request->setOriginFile($field, $f);
-            $file = $this->request->file($field);
-        }
-        $file = is_array($file) ? $file[0] : $file;
-        validate(["$field|图片" => [
-            'fileSize' => config('upload.filesize'),
-            'fileExt' => 'jpg,jpeg,png,bmp,gif',
-            'fileMime' => 'image/jpeg,image/png,image/gif,application/octet-stream'
-        ]])->check([$field => $file]);
-        $upload = UploadService::create();
-        $info = $upload->to('def')->move($field);
-        if ($info === false) {
-            return app('json')->fail($upload->getError());
-        }
-        $res = $upload->getUploadInfo();
-        $res['dir'] = tidy_url($res['dir']);
-        return app('json')->success('上传成功', ['path' => $res['dir']]);
-    }
-
-    /**
-     * @return Response
-     * @author xaboy
-     * @day 2020/6/3
-     */
-    public function wechatNotify()
-    {
-        try {
-            if($this->request->header('content-type') === 'application/json'){
-                return response(WechatService::create()->handleNotifyV3()->getContent());
-            }
-            return response(WechatService::create()->handleNotify()->getContent());
-        } catch (Exception $e) {
-            Log::info('支付回调失败:' . var_export([$e->getMessage(), $e->getFile() . ':' . $e->getLine()], true));
-        }
-    }
-
-    /**
-     * 电商收付通合并支付回调
-     */
-    public function wechatCombinePayNotify($type)
-    {
-        if (!in_array($type, ['order', 'presell'], true))
-            throw new ValidateException('参数错误');
-        try {
-            return WechatService::create()->handleCombinePayNotify($type);
-        } catch (Exception $e) {
-            Log::info('电商收付通支付回调失败:' . var_export([$e->getMessage(), $e->getFile() . ':' . $e->getLine()], true));
-        }
-    }
-
-    /**
-     * 电商收付通合并支付回调
-     */
-    public function routineCombinePayNotify($type)
-    {
-        if (!in_array($type, ['order', 'presell'], true))
-            throw new ValidateException('参数错误');
-        try {
-            return WechatService::create()->handleCombinePayNotify($type);
-        } catch (Exception $e) {
-            Log::info('小程序电商收付通支付回调失败:' . var_export([$e->getMessage(), $e->getFile() . ':' . $e->getLine()], true));
-        }
-    }
-
-    public function routineNotify()
-    {
-        try {
-            if($this->request->header('content-type') === 'application/json'){
-                return response(MiniProgramService::create()->handleNotifyV3()->getContent());
-            }
-            return response(MiniProgramService::create()->handleNotify()->getContent());
-        } catch (Exception $e) {
-            Log::info('支付回调失败:' . var_export([$e->getMessage(), $e->getFile() . ':' . $e->getLine(),$this->request->header()], true));
-        }
-    }
-
-    public function alipayNotify($type)
-    {
-        if (!in_array($type, ['order', 'user_recharge', 'presell', 'user_order'], true))
-            throw new ValidateException('参数错误');
-        $post = $_POST;
-        $get = $_GET;
-        $_POST = $this->request->post();
-        $_GET = $this->request->get();
-        try {
-            AlipayService::create()->notify($type);
-        } catch (Exception $e) {
-            Log::info('支付宝回调失败:' . var_export([$e->getMessage(), $e->getFile() . ':' . $e->getLine()], true));
-        } finally {
-            $_POST = $post;
-            $_GET = $get;
-        }
-    }
-
-    public function getVersion()
-    {
-        return app('json')->success(['version' => get_crmeb_version(), 'host' => request()->host(), 'system' => PHP_OS, 'php' => @phpversion()]);
-    }
-
-    /**
-     * 获取图片base64
-     * @return mixed
-     */
-    public function get_image_base64()
-    {
-        list($imageUrl, $codeUrl) = $this->request->params([
-            ['image', ''],
-            ['code', ''],
-        ], true);
-        checkSuffix([$imageUrl, $codeUrl]);
-        try {
-            $codeTmp = $code = $codeUrl ? image_to_base64($codeUrl) : '';
-            if (!$codeTmp) {
-                $putCodeUrl = put_image($codeUrl);
-                $code = $putCodeUrl ? image_to_base64('./runtime/temp' . $putCodeUrl) : '';
-                $code && unlink('./runtime/temp' . $putCodeUrl);
-            }
-
-            $imageTmp = $image = $imageUrl ? image_to_base64($imageUrl) : '';
-            if (!$imageTmp) {
-                $putImageUrl = put_image($imageUrl);
-                $image = $putImageUrl ? image_to_base64('./runtime/temp' . $putImageUrl) : '';
-                $image && unlink('./runtime/temp' . $putImageUrl);
-            }
-            return app('json')->success(compact('code', 'image'));
-        } catch (Exception $e) {
-            return app('json')->fail($e->getMessage());
-        }
-    }
-
-    public function home()
-    {
-        $banner = systemGroupData('home_banner', 1, 10);
-        $menu = systemGroupData('home_menu');
-        $hot = systemGroupData('home_hot', 1, 4);
-        $activity = systemGroupData('sys_activity', 1, 1)[0] ?? null;
-        $activity_lst = systemGroupData('sys_activity', 1, 3);
-        $ad = systemConfig(['home_ad_pic', 'home_ad_url']);
-        $category = app()->make(StoreCategoryRepository::class)->getTwoLevel();
-        return app('json')->success(compact('banner', 'menu', 'hot', 'ad', 'category', 'activity', 'activity_lst'));
-    }
-
-    public function activityLst($id)
-    {
-        $merId = (int)$id;
-        [$page, $limit] = $this->getPage();
-        return app('json')->success($merId ? merchantGroupData($merId, 'mer_activity', $page, $limit) : systemGroupData('sys_activity', $page, $limit));
-    }
-
-    public function activityInfo($id)
-    {
-        $activity = app()->make(GroupDataRepository::class)->getData((int)$id);
-        if (!$activity) {
-            return app('json')->fail('活动不存在');
-        }
-        $activity['merchant'] = $activity['group_mer_id'] ? app()->make(MerchantRepository::class)->search(['mer_id' => $activity['group_mer_id']])->field('mer_name,mer_avatar')->find() : null;
-        return app('json')->success($activity);
-    }
-
-    public function visit()
-    {
-        if (!$this->request->isLogin()) return app('json')->success();
-        [$page, $type] = $this->request->params(['page', 'type'], true);
-        $uid = $this->request->uid();
-        if (!$page || !$uid) return app('json')->fail();
-        $userVisitRepository = app()->make(UserVisitRepository::class);
-        $type == 'routine' ? $userVisitRepository->visitSmallProgram($uid, $page) : $userVisitRepository->visitPage($uid, $page);
-        return app('json')->success();
-    }
-
-    public function hotBanner($type)
-    {
-        if (!in_array($type, ['new', 'hot', 'best', 'good']))
-            $data = [];
-        else
-            $data = systemGroupData($type . '_home_banner');
-        return app('json')->success($data);
-    }
-
-    public function pay_key($key)
-    {
-        $cache = Cache::store('file');
-        if (!$cache->has('pay_key' . $key)) {
-            return app('json')->fail('支付链接不存在');
-        }
-        return app('json')->success($cache->get('pay_key' . $key));
-    }
-
-    public function lbs_geocoder()
-    {
-        $data = explode(',', $this->request->param('location', ''));
-        $locationOption = new LocationOption(systemConfig('tx_map_key'));
-        $locationOption->setLocation($data[0] ?? '', $data[1] ?? '');
-        $location = new Location($locationOption);
-        $res = $location->request();
-        if ($res->error) {
-            return app('json')->fail($res->error);
-        }
-        if ($res->status) {
-            return app('json')->fail($res->message);
-        }
-        if (!$res->result) {
-            return app('json')->fail('获取失败');
-        }
-        return app('json')->success($res->result);
-    }
-
-
-    public function getCommand()
-    {
-        $key = $this->request->param('key');
-        if (!preg_match('/^(\/@[1-9]{1}).*\*\//', $key)) {
-            return app('json')->fail('无效口令');
-        }
-        $userInfo = $this->request->isLogin() ? $this->request->userInfo() : null;
-        $command = app()->make(CopyCommand::class)->getMassage($key);
-        if (empty($command)) return app('json')->fail('无效口令');
-        $info = [];
-        if ($command['uid']) {
-            $user = app()->make(UserRepository::class)->get($command['uid']);
-            $info = [
-                'uid' => $user['uid'],
-                'nickname' => $user['nickname'],
-                'avatar' => $user['avatar'],
-            ];
-        }
-        switch ($command['type']) {
-            case 0:
-                $data = app()->make(ProductRepository::class)->detail($command['id'], $userInfo);
-                $ret['product_id'] = $command['id'];
-                break;
-            case 1:
-                $data = app()->make(ProductRepository::class)->detail($command['id'], $userInfo);
-                $ret['product_id'] = $command['id'];
-                break;
-            case 2:
-                $data = app()->make(ProductPresellRepository::class)->apiDetail((int)$command['id'], $userInfo);
-                $ret['activity_id'] = $command['id'];
-                break;
-            case 4:
-                $data = app()->make(ProductGroupRepository::class)->apiDetail($command['id'], $userInfo);
-                $ret['activity_id'] = $command['id'];
-                break;
-            case 30:
-                $data = app()->make(ProductAssistSetRepository::class)->detail($command['id'], $userInfo);
-                $ret['activity_id'] = $command['id'];
-                break;
-            case 40:
-                $data = app()->make(ProductGroupBuyingRepository::class)->detail($command['id'], $userInfo);
-                $ret['activity_id'] = $command['id'];
-                break;
-        }
-        if ($userInfo && $command['uid']) app()->make(UserRepository::class)->bindSpread($userInfo, $command['uid']);
-        $ret['product_type'] = $command['type'];
-        $ret['user'] = $info;
-        $ret['com'] = $command['com'];
-        $ret['data'] = $data;
-        return app('json')->success($ret);
-    }
-
-    public function script()
-    {
-        return \response(systemConfig('static_script'));
-    }
-
-    public function appVersion()
-    {
-        return app('json')->success(systemConfig([
-            'appVersion',
-            'iosAddress',
-            'androidAddress',
-            'openUpgrade'
-        ]));
-    }
-
-    public function deliveryNotify()
-    {
-        try {
-            $params = $this->request->param();
-            app()->make(DeliveryOrderRepository::class)->notify($params);
-        } catch (Exception $e) {
-            Log::info('同城配送订单回调失败:' . var_export([$e->getMessage(), $e->getFile() . ':' . $e->getLine()], true));
-        }
-    }
-
-    public function diy()
-    {
-        $merid = $this->request->param('id', 0);
-        return app('json')->success(app()->make(DiyRepository::class)->getDiyInfo(0, $merid));
-    }
-
-    public function getNavigation()
-    {
-        return app('json')->success(app()->make(DiyRepository::class)->getNavigation());
-    }
-
-    public function micro()
-    {
-        $id = $this->request->param('id', 0);
-        return app('json')->success(app()->make(DiyRepository::class)->getDiyInfo($id, 0, 0));
-    }
-
-    /**
-     * 是否关注
-     * @return mixed
-     */
-    public function subscribe()
-    {
-        if ($this->request->isLogin()) {
-            $user = $this->request->userInfo();
-            if ($user && $user['wechat_user_id']) {
-                $wechatUserService = app()->make(WechatUserRepository::class);
-                $subscribe = $wechatUserService->getWhereCount([
-                        'wechat_user_id' => $user['wechat_user_id'],
-                        'subscribe' => 1
-                    ]) > 0;
-                return app('json')->success(['subscribe' => $subscribe]);
-            }
-        }
-        return app('json')->success(['subscribe' => false, 'qrcode' => systemConfig('wechat_qrcode')]);
-    }
-}
diff --git a/app/controller/api/store/merchant/Merchant.php.bak b/app/controller/api/store/merchant/Merchant.php.bak
deleted file mode 100644
index 0719b505..00000000
--- a/app/controller/api/store/merchant/Merchant.php.bak
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-namespace app\controller\api\store\merchant;
-
-use app\common\repositories\user\UserMerchantRepository;
-use think\App;
-use crmeb\basic\BaseController;
-use app\common\repositories\system\merchant\MerchantRepository as repository;
-
-class Merchant extends BaseController
-{
-    protected $repository;
-    protected $userInfo;
-
-    /**
-     * ProductCategory constructor.
-     * @param App $app
-     * @param repository $repository
-     */
-    public function __construct(App $app, repository $repository)
-    {
-        parent::__construct($app);
-        $this->repository = $repository;
-        $this->userInfo =$this->request->isLogin() ? $this->request->userInfo():null;
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/27
-     * @return mixed
-     */
-    public function lst()
-    {
-        [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader']);
-        return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/29
-     * @param $id
-     * @return mixed
-     */
-    public function detail($id)
-    {
-        if (!$this->repository->apiGetOne($id))
-            return app('json')->fail('店铺已打烊');
-
-        if ($this->request->isLogin()) {
-            app()->make(UserMerchantRepository::class)->updateLastTime($this->request->uid(), intval($id));
-        }
-
-        return app('json')->success($this->repository->detail($id, $this->userInfo));
-    }
-
-    public function systemDetail()
-    {
-        $config = systemConfig(['site_logo', 'site_name','login_logo']);
-        return app('json')->success([
-            'mer_avatar' => $config['login_logo'],
-            'mer_name' => $config['site_name'],
-            'mer_id' => 0,
-        ]);
-    }
-
-
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/29
-     * @param $id
-     * @return mixed
-     */
-    public function productList($id)
-    {
-        [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword','order','mer_cate_id','cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid']);
-        if(!$this->repository->apiGetOne($id)) return app('json')->fail(' 店铺已打烊');
-        return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo));
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/29
-     * @param int $id
-     * @return mixed
-     */
-    public function categoryList($id)
-    {
-        if(!$this->repository->merExists((int)$id))
-            return app('json')->fail('店铺已打烊');
-        return app('json')->success($this->repository->categoryList($id));
-    }
-
-    public function qrcode($id)
-    {
-        if(!$this->repository->merExists($id))
-            return app('json')->fail('店铺已打烊');
-        $url = $this->request->param('type') == 'routine' ? $this->repository->routineQrcode(intval($id)) : $this->repository->wxQrcode(intval($id));
-        return app('json')->success(compact('url'));
-    }
-
-    public function localLst()
-    {
-        [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id']);
-        $where['delivery_way'] = 1;
-        return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
-    }
-
-}
diff --git a/app/controller/api/store/order/StoreCart.php.bak b/app/controller/api/store/order/StoreCart.php.bak
deleted file mode 100644
index 6156aa4b..00000000
--- a/app/controller/api/store/order/StoreCart.php.bak
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-namespace app\controller\api\store\order;
-
-use app\common\repositories\store\order\StoreOrderRepository;
-use app\common\repositories\store\product\ProductAssistRepository;
-use app\common\repositories\store\product\ProductAssistSetRepository;
-use app\common\repositories\store\product\ProductAttrValueRepository;
-use app\common\repositories\store\product\ProductGroupRepository;
-use app\common\repositories\store\product\ProductPresellRepository;
-use app\common\repositories\store\product\ProductRepository;
-use app\common\repositories\store\product\StoreDiscountProductRepository;
-use app\common\repositories\store\product\StoreDiscountRepository;
-use app\common\repositories\store\StoreSeckillActiveRepository;
-use app\common\repositories\user\UserRepository;
-use MongoDB\BSON\MaxKey;
-use think\App;
-use crmeb\basic\BaseController;
-use app\validate\api\StoreCartValidate as validate;
-use app\common\repositories\store\order\StoreCartRepository as repository;
-use think\exception\ValidateException;
-
-class StoreCart extends BaseController
-{
-    /**
-     * @var repository
-     */
-    protected $repository;
-
-    /**
-     * StoreBrand constructor.
-     * @param App $app
-     * @param repository $repository
-     */
-    public function __construct(App $app, repository $repository)
-    {
-        parent::__construct($app);
-        $this->repository = $repository;
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/28
-     * @return mixed
-     */
-    public function lst()
-    {
-        [$page, $limit] = $this->getPage();
-        return app('json')->success($this->repository->getList($this->request->userInfo()));
-    }
-
-    /**
-     * @param validate $validate
-     * @return mixed
-     * @author Qinii
-     */
-    public function create(validate $validate)
-    {
-        $data = $this->checkParams($validate);
-
-        if(!in_array($data['product_type'],[0,1,2,3,4])) return app('json')->fail('商品类型错误');
-        if ($data['cart_num'] <= 0) return app('json')->fail('购买数量有误');
-        $user = $this->request->userInfo();
-        event('user.cart.before',compact('user','data'));
-        switch ($data['product_type'])
-        {
-            case 0:  //普通商品
-                $result = app()->make(ProductRepository::class)->cartCheck($data,$this->request->userInfo());
-
-                [$source, $sourceId, $pid] = explode(':', $this->request->param('source', '0'), 3) + ['', '', ''];
-                $data['source'] = (in_array($source, [0, 1]) && $pid == $data['product_id']) ? $source : 0;
-                if ($data['source'] > 0) $data['source_id'] = intval($sourceId);
-                break;
-            case 1:  //秒杀商品
-                $result = app()->make(ProductRepository::class)->cartSeckillCheck($data,$this->request->userInfo());
-                break;
-            case 2:  //预售商品
-                $result = app()->make(ProductPresellRepository::class)->cartCheck($data,$this->request->userInfo());
-                $data['source'] = $data['product_type'];
-                $data['source_id'] = $data['product_id'];
-                $data['product_id'] = $result['product']['product_id'];
-                break;
-            case 3: //助力商品
-                $result = app()->make(ProductAssistSetRepository::class)->cartCheck($data,$this->request->userInfo());
-                $data['source'] = $data['product_type'];
-                $data['source_id'] = $data['product_id'];
-                $data['product_id'] = $result['product']['product_id'];
-                break;
-            case 4: //拼团商品
-                $result = app()->make(ProductGroupRepository::class)->cartCheck($data,$this->request->userInfo());
-                $data['source'] = $data['product_type'];
-                $data['source_id'] = $data['group_buying_id'];
-                $data['product_id'] = $result['product']['product_id'];
-                break;
-        }
-
-        unset($data['group_buying_id']);
-
-        if ($cart = $result['cart']) {
-            //更新购物车
-            $cart_id = $cart['cart_id'];
-            $cart_num = ['cart_num' => ($cart['cart_num'] + $data['cart_num'])];
-            $storeCart = $this->repository->update($cart_id,$cart_num);
-        } else {
-            //添加购物车
-            $data['uid'] = $this->request->uid();
-            $data['mer_id'] = $result['product']['mer_id'];
-            $cart = $storeCart = $this->repository->create($data);
-        }
-        event('user.cart', compact('user','storeCart'));
-        return app('json')->success(['cart_id' => $cart['cart_id']]);
-    }
-
-
-    /**
-     * @param $id
-     * @return mixed
-     * @throws \think\db\exception\DbException
-     * @author Qinii
-     */
-    public function change($id)
-    {
-        $where = $this->request->params(['cart_num']);
-        $product_attr_unique = $this->request->param('product_attr_unique');
-        if (intval($where['cart_num']) < 0)
-            return app('json')->fail('数量必须大于0');
-        if (!$cart = $this->repository->getOne($id, $this->request->uid()))
-            return app('json')->fail('购物车信息不存在');
-        if ($cart->product->once_count) {
-            $cart_num = app()->make(ProductRepository::class)->productOnceCountCart($cart['product_id'], $this->request->uid());
-            if (($cart_num - $cart['cart_num'] + $where['cart_num']) > $cart->product->once_count)
-                return app('json')->fail('单次购买限制 ' . $cart->product->once_count . ' 件');
-        }
-        if (!$res = app()->make(ProductAttrValueRepository::class)->getOptionByUnique($product_attr_unique ?? $cart['product_attr_unique']))
-            return app('json')->fail('SKU不存在');
-        if ($res['stock'] < $where['cart_num'])
-            return app('json')->fail('库存不足');
-        if($product_attr_unique){
-            $where['product_attr_unique'] = $product_attr_unique;
-        }
-        $this->repository->update($id, $where);
-        return app('json')->success('修改成功');
-    }
-
-    /**
-     * @return mixed
-     * @author Qinii
-     */
-    public function batchDelete()
-    {
-        $ids = $this->request->param('cart_id');
-        if(!count($ids))return app('json')->fail('参数错误');
-        $this->repository->batchDelete($ids,$this->request->uid());
-        return app('json')->success('删除成功');
-    }
-
-
-    /**
-     * @return mixed
-     * @author Qinii
-     */
-    public function cartCount()
-    {
-        return app('json')->success($this->repository->getCartCount($this->request->uid()));
-    }
-
-    /**
-     * @param $data
-     * @return mixed
-     * @author Qinii
-     * @day 2020-06-11
-     */
-    public function check($data)
-    {
-        $product = app()->make(ProductRepository::class)->get($data['product_id']);
-        if(!$product)
-           throw new ValidateException('商品不存在');
-        if( $data['cart_num'] < 0 )
-            throw new ValidateException('数量必须大于0');
-        if(!$res= app()->make(ProductAttrValueRepository::class)->getOptionByUnique($data['product_attr_unique']))
-            throw new ValidateException('SKU不存在');
-        if($res['product_id'] != $data['product_id'])
-            throw new ValidateException('数据不一致');
-        if($res['stock'] < $data['cart_num'])
-            throw new ValidateException('库存不足');
-        $data['is_new'] = 1;
-        $data['uid'] = $this->request->uid();
-        $data['mer_id'] = $product['mer_id'];
-        return $data;
-    }
-
-
-    /**
-     * @param validate $validate
-     * @return mixed
-     * @author Qinii
-     * @day 2020-06-11
-     */
-    public function again(validate $validate)
-    {
-        $param = $this->request->param('data',[]);
-        foreach ($param as $data){
-            $validate->check($data);
-            $item[] = $this->check($data);
-        }
-
-        foreach ($item as $it){
-            $it__id = $this->repository->create($it);
-            $ids[] = $it__id['cart_id'];
-        }
-        return app('json')->success(['cart_id' => $ids]);
-    }
-
-
-    /**
-     * @param validate $validate
-     * @return array
-     * @author Qinii
-     * @day 2020-06-11
-     */
-    public function checkParams(validate $validate)
-    {
-        $data = $this->request->params(['product_id','product_attr_unique','cart_num','is_new',['product_type',0],['group_buying_id',0],['spread_id',0]]);
-        $validate->check($data);
-        if ($data['spread_id']) {
-            if ($data['spread_id'] !== $this->request->userInfo()->uid){
-                $user = app()->make(UserRepository::class)->get($data['spread_id']);
-                if (!$user) $data['spread_id'] = 0;
-            } else {
-                $data['spread_id'] = 0;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * TODO 套餐购买
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 1/7/22
-     */
-    public function batchCreate()
-    {
-        $data = $this->request->params(['data','discount_id','is_new']);
-        $productRepostory = app()->make(ProductRepository::class);
-        if (!$data['discount_id'])
-            return app('json')->fail('优惠套餐ID不能为空');
-        if (!$data['is_new'])
-            return app('json')->fail('套餐不能加入购物车');
-
-        $cartData = app()->make(StoreDiscountRepository::class)->check($data['discount_id'], $data['data'], $this->request->userInfo());
-        $cart_id = [];
-        if ($cartData){
-            foreach ($cartData as $datum) {
-                $cart = $this->repository->create($datum);
-                $cart_id[] = $cart['cart_id'];
-            }
-        }
-        return app('json')->success(compact('cart_id'));
-    }
-}
diff --git a/app/controller/api/store/order/StoreOrder.php.bak b/app/controller/api/store/order/StoreOrder.php.bak
deleted file mode 100644
index daa788e1..00000000
--- a/app/controller/api/store/order/StoreOrder.php.bak
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-
-namespace app\controller\api\store\order;
-
-
-use app\common\repositories\delivery\DeliveryOrderRepository;
-use app\common\repositories\store\order\StoreOrderCreateRepository;
-use app\common\repositories\store\order\StoreOrderReceiptRepository;
-use app\validate\api\UserReceiptValidate;
-use crmeb\basic\BaseController;
-use app\common\repositories\store\order\StoreCartRepository;
-use app\common\repositories\store\order\StoreGroupOrderRepository;
-use app\common\repositories\store\order\StoreOrderRepository;
-use crmeb\services\ExpressService;
-use crmeb\services\LockService;
-use think\App;
-use think\exception\ValidateException;
-use think\facade\Log;
-
-/**
- * Class StoreOrder
- * @package app\controller\api\store\order
- * @author xaboy
- * @day 2020/6/10
- */
-class StoreOrder extends BaseController
-{
-    /**
-     * @var StoreOrderRepository
-     */
-    protected $repository;
-
-    /**
-     * StoreOrder constructor.
-     * @param App $app
-     * @param StoreOrderRepository $repository
-     */
-    public function __construct(App $app, StoreOrderRepository $repository)
-    {
-        parent::__construct($app);
-        $this->repository = $repository;
-    }
-
-    public function v2CheckOrder(StoreCartRepository $cartRepository, StoreOrderCreateRepository $orderCreateRepository)
-    {
-        $cartId = (array)$this->request->param('cart_id', []);
-        $addressId = (int)$this->request->param('address_id');
-        $couponIds = (array)$this->request->param('use_coupon', []);
-        $takes = (array)$this->request->param('takes', []);
-        $useIntegral = (bool)$this->request->param('use_integral', false);
-        $user = $this->request->userInfo();
-        $uid = $user->uid;
-        if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid)))
-            return app('json')->fail('数据无效');
-        $orderInfo = $orderCreateRepository->v2CartIdByOrderInfo($user, $cartId, $takes, $couponIds, $useIntegral, $addressId);
-
-        return app('json')->success($orderInfo);
-    }
-
-    public function v2CreateOrder(StoreCartRepository $cartRepository, StoreOrderCreateRepository $orderCreateRepository)
-    {
-        $cartId = (array)$this->request->param('cart_id', []);
-        $addressId = (int)$this->request->param('address_id');
-        $couponIds = (array)$this->request->param('use_coupon', []);
-        $takes = (array)$this->request->param('takes', []);
-        $useIntegral = (bool)$this->request->param('use_integral', false);
-        $receipt_data = (array)$this->request->param('receipt_data', []);
-        $extend = (array)$this->request->param('extend', []);
-        $mark = (array)$this->request->param('mark', []);
-        $payType = $this->request->param('pay_type');
-        $post = (array)$this->request->param('post');
-
-        $isPc = $payType === 'pc';
-        if ($isPc) {
-            $payType = 'balance';
-        }
-
-        if (!in_array($payType, StoreOrderRepository::PAY_TYPE, true))
-            return app('json')->fail('请选择正确的支付方式');
-
-        $validate = app()->make(UserReceiptValidate::class);
-        foreach ($receipt_data as $receipt) {
-            if (!is_array($receipt)) throw new ValidateException('发票信息有误');
-            $validate->check($receipt);
-        }
-
-        $uid = $this->request->uid();
-        if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid)))
-            return app('json')->fail('数据无效');
-//        if (!$addressId)
-//            return app('json')->fail('请选择地址');
-
-        $groupOrder = app()->make(LockService::class)->exec('order.create', function () use ($orderCreateRepository, $receipt_data, $mark, $extend, $cartId, $payType, $takes, $couponIds, $useIntegral, $addressId, $post) {
-            return $orderCreateRepository->v2CreateOrder(array_search($payType, StoreOrderRepository::PAY_TYPE), $this->request->userInfo(), $cartId, $extend, $mark, $receipt_data, $takes, $couponIds, $useIntegral, $addressId, $post);
-        });
-
-        if ($groupOrder['pay_price'] == 0) {
-            $this->repository->paySuccess($groupOrder);
-            return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
-        }
-        if ($isPc) {
-            return app('json')->success(['order_id' => $groupOrder->group_order_id]);
-        }
-        try {
-            return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());
-        } catch (\Exception $e) {
-            return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
-        }
-    }
-
-    /**
-     * @return mixed
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author xaboy
-     * @day 2020/6/10
-     */
-    public function lst()
-    {
-        [$page, $limit] = $this->getPage();
-        $where['status'] = $this->request->param('status');
-        $where['search'] = $this->request->param('store_name');
-        $where['uid'] = $this->request->uid();
-        $where['paid'] = 1;
-        $where['is_user'] = 1;
-        return app('json')->success($this->repository->getList($where, $page, $limit));
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/10
-     */
-    public function detail($id)
-    {
-        $order = $this->repository->getDetail((int)$id, $this->request->uid());
-        if (!$order)
-            return app('json')->fail('订单不存在');
-        if ($order->order_type == 1) {
-            $order->append(['take', 'refund_status']);
-        }
-        return app('json')->success($order->toArray());
-    }
-
-    /**
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/10
-     */
-    public function number()
-    {
-        return app('json')->success(['orderPrice' => $this->request->userInfo()->pay_price] + $this->repository->userOrderNumber($this->request->uid()));
-    }
-
-    /**
-     * @param StoreGroupOrderRepository $groupOrderRepository
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/10
-     */
-    public function groupOrderList(StoreGroupOrderRepository $groupOrderRepository)
-    {
-        [$page, $limit] = $this->getPage();
-        $list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0], $page, $limit);
-        return app('json')->success($list);
-    }
-
-    /**
-     * @param $id
-     * @param StoreGroupOrderRepository $groupOrderRepository
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/10
-     */
-    public function groupOrderDetail($id, StoreGroupOrderRepository $groupOrderRepository)
-    {
-        $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id);
-        if (!$groupOrder)
-            return app('json')->fail('订单不存在');
-        else
-            return app('json')->success($groupOrder->append(['cancel_time', 'cancel_unix'])->toArray());
-    }
-
-    public function groupOrderStatus($id, StoreGroupOrderRepository $groupOrderRepository)
-    {
-        $groupOrder = $groupOrderRepository->status($this->request->uid(), intval($id));
-        if (!$groupOrder)
-            return app('json')->fail('订单不存在');
-        if ($groupOrder->paid) $groupOrder->append(['give_coupon']);
-        $activity_type = 0;
-        $activity_id = 0;
-        foreach ($groupOrder->orderList as $order) {
-            $activity_type = max($order->activity_type, $activity_type);
-            if ($order->activity_type == 4 && $groupOrder->paid) {
-                $order->append(['orderProduct']);
-                $activity_id = $order->orderProduct[0]['activity_id'];
-            }
-        }
-        $groupOrder->activity_type = $activity_type;
-        $groupOrder->activity_id = $activity_id;
-        return app('json')->success($groupOrder->toArray());
-    }
-
-    /**
-     * @param $id
-     * @param StoreGroupOrderRepository $groupOrderRepository
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/10
-     */
-    public function cancelGroupOrder($id, StoreGroupOrderRepository $groupOrderRepository)
-    {
-        $groupOrderRepository->cancel((int)$id, $this->request->uid());
-        return app('json')->success('取消成功');
-    }
-
-    public function groupOrderPay($id, StoreGroupOrderRepository $groupOrderRepository)
-    {
-        //TODO 佣金结算,佣金退回,物流查询
-        $type = $this->request->param('type');
-        if (!in_array($type, StoreOrderRepository::PAY_TYPE))
-            return app('json')->fail('请选择正确的支付方式');
-        $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id, false);
-        if (!$groupOrder)
-            return app('json')->fail('订单不存在或已支付');
-        $this->repository->changePayType($groupOrder, array_search($type, StoreOrderRepository::PAY_TYPE));
-        if ($groupOrder['pay_price'] == 0) {
-            $this->repository->paySuccess($groupOrder);
-            return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
-        }
-
-        try {
-            return $this->repository->pay($type, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());
-        } catch (\Exception $e) {
-            return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
-        }
-    }
-
-    public function take($id)
-    {
-        $this->repository->takeOrder($id, $this->request->userInfo());
-        return app('json')->success('确认收货成功');
-    }
-
-    public function express($id)
-    {
-        $order = $this->repository->getWhere(['order_id' => $id, 'is_del' => 0]);
-        if (!$order)
-            return app('json')->fail('订单不存在');
-        if (!$order->delivery_type || !$order->delivery_id)
-            return app('json')->fail('订单未发货');
-        $express = $this->repository->express($id,null);
-        $order->append(['orderProduct']);
-        return app('json')->success(compact('express', 'order'));
-    }
-
-    public function verifyCode($id)
-    {
-        $order = $this->repository->getWhere(['order_id' => $id, 'uid' => $this->request->uid(), 'is_del' => 0, 'order_type' => 1]);
-        if (!$order)
-            return app('json')->fail('订单状态有误');
-        return app('json')->success(['qrcode' => $this->repository->wxQrcode($id, $order->verify_code)]);
-    }
-
-    public function del($id)
-    {
-        $this->repository->userDel($id, $this->request->uid());
-        return app('json')->success('删除成功');
-    }
-
-    public function createReceipt($id)
-    {
-        $data = $this->request->params(['receipt_type' , 'receipt_title' , 'duty_paragraph', 'receipt_title_type', 'bank_name', 'bank_code', 'address','tel', 'email']);
-        $order = $this->repository->getWhere(['order_id' => $id, 'uid' => $this->request->uid(), 'is_del' => 0]);
-        if (!$order) return app('json')->fail('订单不属于您或不存在');
-        app()->make(StoreOrderReceiptRepository::class)->add($data, $order);
-        return app('json')->success('操作成功');
-    }
-
-    public function getOrderDelivery($id, DeliveryOrderRepository $orderRepository)
-    {
-        $res = $orderRepository->show($id, $this->request->uid());
-        return app('json')->success($res);
-    }
-}
diff --git a/app/controller/api/store/product/StoreProduct.php.bak b/app/controller/api/store/product/StoreProduct.php.bak
deleted file mode 100644
index b63ecf94..00000000
--- a/app/controller/api/store/product/StoreProduct.php.bak
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-
-namespace app\controller\api\store\product;
-
-use app\common\repositories\store\PriceRuleRepository;
-use app\common\repositories\store\product\SpuRepository;
-use app\common\repositories\store\StoreCategoryRepository;
-use app\common\repositories\system\groupData\GroupDataRepository;
-use app\common\repositories\user\UserMerchantRepository;
-use think\App;
-use crmeb\basic\BaseController;
-use app\common\repositories\store\product\ProductRepository as repository;
-use think\facade\Cache;
-
-class StoreProduct extends BaseController
-{
-    /**
-     * @var repository
-     */
-    protected $repository;
-    protected $userInfo = null;
-
-    /**
-     * StoreProduct constructor.
-     * @param App $app
-     * @param repository $repository
-     */
-    public function __construct(App $app, repository $repository)
-    {
-        parent::__construct($app);
-        $this->repository = $repository;
-        $this->userInfo = $this->request->isLogin() ? $this->request->userInfo() : null;
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/28
-     * @return mixede
-     */
-    public function lst()
-    {
-        [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword', 'cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid','star']);
-        $data = $this->repository->getApiSearch(null, $where, $page, $limit, $this->userInfo);
-        return app('json')->success($data);
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/30
-     * @param $id
-     * @return mixed
-     */
-    public function detail($id)
-    {
-        $data = $this->repository->detail($id, $this->userInfo);
-        if (!$data){
-            app()->make(SpuRepository::class)->changeStatus($id,0);
-            return app('json')->fail('商品已下架');
-        }
-
-        if ($this->request->isLogin()) {
-            app()->make(UserMerchantRepository::class)->updateLastTime($this->request->uid(), $data->mer_id);
-        }
-
-        return app('json')->success($data);
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/30
-     * @return mixed
-     */
-    public function recommendList()
-    {
-        [$page, $limit] = $this->getPage();
-        return app('json')->success($this->repository->recommend($this->userInfo, null, $page, $limit));
-    }
-
-    public function qrcode($id)
-    {
-        $id = (int)$id;
-        $param = $this->request->params(['type', ['product_type', 0]]);
-        $param['product_type'] = (int)$param['product_type'];
-        if (!$id || !$product = $this->repository->existsProduct($id, $param['product_type']))
-            return app('json')->fail('商品不存在');
-
-        if ($param['type'] == 'routine') {
-            $url = $this->repository->routineQrCode($id, $param['product_type'], $this->request->userInfo());
-        }else{
-            $url = $this->repository->wxQrCode($id, $param['product_type'], $this->request->userInfo());
-        }
-
-        if (!$url) return app('json')->fail('二维码生成失败');
-        return app('json')->success(compact('url'));
-    }
-
-    public function getBagList()
-    {
-        if(!systemConfig('extension_status'))  return app('json')->fail('活动未开启');
-        [$page, $limit] = $this->getPage();
-        $where = $this->repository->bagShow();
-        return app('json')->success($this->repository->getBagList($where, $page, $limit));
-    }
-
-    public function getBagrecomm()
-    {
-        $where = $this->repository->bagShow();
-        $where['is_best'] = 1;
-        return app('json')->success($this->repository->selectWhere($where)->append(['merchant']));
-    }
-
-    public function getBagExplain()
-    {
-        if(!systemConfig('extension_status'))  return app('json')->fail('活动未开启');
-        $data = [
-            'explain' => systemConfig('promoter_explain'),
-            'data' => app()->make(GroupDataRepository::class)->groupData('promoter_config', 0),
-        ];
-        return app('json')->success($data);
-    }
-
-    public function hot($type)
-    {
-        [$page, $limit] = $this->getPage();
-        return app('json')->success($this->repository->getApiSearch(null, ['hot_type' => $type, 'is_gift_bag' => 0, 'is_used' => 1], $page, $limit, $this->userInfo));
-    }
-
-    public function guaranteeTemplate($id)
-    {
-        $where = [
-            'guarantee_template_id' => $id,
-            'status' => 1,
-        ];
-        $data = $this->repository->GuaranteeTemplate($where);
-        return app('json')->success($data);
-    }
-
-    public function setIncreaseTake()
-    {
-        $product_id = $this->request->param('product_id');
-        $unique = $this->request->param('unique');
-        $type = $this->request->param('type');
-        if($type == 1 && !$this->userInfo['phone']) return app('json')->fail('请先绑定手机号');
-        $this->repository->increaseTake($this->request->uid(),$unique,$type,$product_id);
-        return app('json')->success('订阅成功');
-    }
-
-    /**
-     * TODO
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 6/15/21
-     */
-    public function preview()
-    {
-        $param = $this->request->params(['key','id','product_type']);
-        $data = [];
-        if($param['key']){
-            $data = Cache::get($param['key']);
-            Cache::delete($param['key']);
-        }elseif($param['id']){
-            $data = $this->repository->getPreview($param);
-        }
-        if(!$data) return app('json')->fail('数据不存在');
-        return app('json')->success($data);
-    }
-
-    public function priceRule($id)
-    {
-        $path = app()->make(StoreCategoryRepository::class)->query(['store_category_id' => $id, 'mer_id' => 0])->value('path');
-        if ($path && $path !== '/') {
-            $ids = explode('/', trim($path, '/'));
-            $ids[] = $id;
-        } else {
-            $ids[] = $id;
-        }
-        $rule = app()->make(PriceRuleRepository::class)->search(['cate_id' => $ids, 'is_show' => 1])
-            ->order('sort DESC,rule_id DESC')->find();
-        if ($rule) {
-            return app('json')->success($rule->toArray());
-        }
-        return app('json')->fail('规则不存在');
-    }
-}
diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php
index f09807d6..31a2dc67 100644
--- a/app/controller/api/store/product/StoreSpu.php
+++ b/app/controller/api/store/product/StoreSpu.php
@@ -18,6 +18,7 @@ use crmeb\services\CopyCommand;
 use think\App;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\product\SpuRepository;
+use think\facade\Db;
 
 class StoreSpu extends BaseController
 {
@@ -86,6 +87,32 @@ class StoreSpu extends BaseController
         return app('json')->success($data);
     }
 
+    /**
+     * TODO 镇云仓库商户的商品搜索列表
+     * @param $id
+     * @return mixed
+     * @author Qinii
+     * @day 12/24/20
+     */
+    public function cloudMerProductLst($id)
+    {
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params([
+            'keyword', 'cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid', 'mer_cate_id', ['product_type', 0], 'action', 'common'
+        ]);
+        if ($where['action']) unset($where['product_type']);
+        $category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');
+        $mer_id=Db::name('merchant')->where('category_id',$category_id)->where('type_id',11)->value('mer_id');
+        if (!$mer_id){
+            return app('json')->success(['count'=>0,'list'=>[]]);
+
+        }
+        $where['mer_id'] = $mer_id;
+        $where['is_gift_bag'] = 0;
+        $where['order'] = $where['order'] ? $where['order'] : 'sort';
+        $data = $this->repository->getApiCloudSearch($where, $page, $limit);
+        return app('json')->success($data);
+    }
     /**
      * TODO 推荐列表
      * @return mixed
diff --git a/app/controller/merchant/store/product/Product.php.bak b/app/controller/merchant/store/product/Product.php.bak
deleted file mode 100644
index efa05be0..00000000
--- a/app/controller/merchant/store/product/Product.php.bak
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-namespace app\controller\merchant\store\product;
-
-use app\common\repositories\store\order\StoreCartRepository;
-use app\common\repositories\store\product\ProductAttrValueRepository;
-use app\common\repositories\store\product\SpuRepository;
-use app\common\repositories\store\shipping\ShippingTemplateRepository;
-use app\common\repositories\store\StoreCategoryRepository;
-use crmeb\services\UploadService;
-use think\App;
-use crmeb\basic\BaseController;
-use app\validate\merchant\StoreProductValidate as validate;
-use app\common\repositories\store\product\ProductRepository as repository;
-use think\exception\ValidateException;
-
-class Product extends BaseController
-{
-    protected  $repository ;
-
-    /**
-     * Product constructor.
-     * @param App $app
-     * @param repository $repository
-     */
-    public function __construct(App $app ,repository $repository)
-    {
-        parent::__construct($app);
-        $this->repository = $repository;
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @return mixed
-     */
-    public function lst()
-    {
-        [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['temp_id','cate_id','keyword',['type',1],'mer_cate_id','is_gift_bag','status','us_status','product_id','mer_labels',['order','sort'],'is_ficti','svip_price_type']);
-        $where = array_merge($where,$this->repository->switchType($where['type'],$this->request->merId(),0));
-        return app('json')->success($this->repository->getList($this->request->merId(),$where, $page, $limit));
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @param $id
-     * @return mixed
-     */
-    public function detail($id)
-    {
-        if(!$this->repository->merExists($this->request->merId(),$id))
-            return app('json')->fail('数据不存在');
-        return app('json')->success($this->repository->getAdminOneProduct($id,null));
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @param validate $validate
-     * @return mixed
-     */
-    public function create()
-    {
-        $params = $this->request->params($this->repository::CREATE_PARAMS);
-        $data = $this->repository->checkParams($params,$this->request->merId());
-        $data['mer_id'] = $this->request->merId();
-        if ($data['is_gift_bag'] && !$this->repository->checkMerchantBagNumber($data['mer_id']))
-            return app('json')->fail('礼包数量超过数量限制');
-        $data['status'] = $this->request->merchant()->is_audit ? 0 : 1;
-        $data['mer_status'] = ($this->request->merchant()->is_del || !$this->request->merchant()->mer_state || !$this->request->merchant()->status) ? 0 : 1;
-        $data['rate'] = 3;
-        $this->repository->create($data,0);
-        return app('json')->success('添加成功');
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @param $id
-     * @param validate $validate
-     * @return mixed
-     */
-    public function update($id)
-    {
-        $params = $this->request->params($this->repository::CREATE_PARAMS);
-        $data = $this->repository->checkParams($params,$this->request->merId(), $id);
-        if (!$this->repository->merExists($this->request->merId(), $id))
-            return app('json')->fail('数据不存在');
-        $pro = $this->repository->getWhere(['product_id' => $id]);
-        if ($pro->status == -2) {
-            $data['status'] = 0;
-        } else {
-            $data['status'] = $this->request->merchant()->is_audit ? 0 : 1;
-        }
-        $data['mer_status'] = ($this->request->merchant()->is_del || !$this->request->merchant()->mer_state || !$this->request->merchant()->status) ? 0 : 1;
-        $data['mer_id'] = $this->request->merId();
-        $this->repository->edit($id, $data, $this->request->merId(), 0);
-        return app('json')->success('编辑成功');
-    }
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @param $id
-     * @return mixed
-     */
-    public function delete($id)
-    {
-        if(!$this->repository->merExists($this->request->merId(),$id))
-            return app('json')->fail('数据不存在');
-        if($this->repository->getWhereCount(['product_id' => $id,'is_show' => 1,'status' => 1]))
-            return app('json')->fail('商品上架中');
-        $this->repository->delete($id);
-        //queue(ChangeSpuStatusJob::class,['product_type' => 0,'id' => $id]);
-        return app('json')->success('转入回收站');
-    }
-
-
-    public function destory($id)
-    {
-        if(!$this->repository->merDeleteExists($this->request->merId(),$id))
-            return app('json')->fail('只能删除回收站的商品');
-        if(app()->make(StoreCartRepository::class)->getProductById($id))
-            return app('json')->fail('商品有被加入购物车不可删除');
-        $this->repository->destory($id);
-        return app('json')->success('删除成功');
-    }
-
-
-
-    /**
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @return mixed
-     */
-    public function getStatusFilter()
-    {
-        return app('json')->success($this->repository->getFilter($this->request->merId(),'商品',0));
-    }
-
-    /**
-     * TODO
-     * @return mixed
-     * @author Qinii
-     * @day 2020-06-24
-     */
-    public function config()
-    {
-        $data = systemConfig(['extension_status','svip_switch_status','integral_status']);
-        $merData= merchantConfig($this->request->merId(),['mer_integral_status','mer_integral_rate','mer_svip_status','svip_store_rate']);
-        $svip_store_rate = $merData['svip_store_rate'] > 0 ? bcdiv($merData['svip_store_rate'],100,2) : 0;
-        $data['mer_svip_status'] = ($data['svip_switch_status']  && $merData['mer_svip_status'] != 0 ) ? 1 : 0;
-        $data['svip_store_rate'] = $svip_store_rate;
-        $data['integral_status'] = $data['integral_status'] && $merData['mer_integral_status'] ? 1 : 0;
-        $data['integral_rate'] = $merData['mer_integral_rate'] ?: 0;
-        $data['delivery_way'] = $this->request->merchant()->delivery_way ? $this->request->merchant()->delivery_way : [2];
-        $data['is_audit'] = $this->request->merchant()->is_audit;
-        return app('json')->success($data);
-    }
-
-    /**
-     * TODO
-     * @param $id
-     * @return mixed
-     * @author Qinii
-     * @day 2020-07-03
-     */
-    public function restore($id)
-    {
-        if(!$this->repository->merDeleteExists($this->request->merId(),$id))
-            return app('json')->fail('只能恢复回收站的商品');
-        $this->repository->restore($id);
-        return app('json')->success('商品已恢复');
-    }
-
-    /**
-     * @return \think\response\Json
-     * @throws \think\Exception
-     * @author xaboy
-     * @day 2020/11/16
-     */
-    public function temp_key()
-    {
-        $upload = UploadService::create();
-        $re = $upload->getTempKeys();
-        return app('json')->success($re);
-    }
-
-    public function updateSort($id)
-    {
-        $sort = $this->request->param('sort');
-        $this->repository->updateSort($id,$this->request->merId(),['sort' => $sort]);
-        return app('json')->success('修改成功');
-    }
-
-    public function preview()
-    {
-        $data = $this->request->param();
-        $data['merchant'] = [
-            'mer_name' => $this->request->merchant()->mer_name,
-            'is_trader' => $this->request->merchant()->is_trader,
-            'mer_avatar' => $this->request->merchant()->mer_avatar,
-            'product_score' => $this->request->merchant()->product_score,
-            'service_score' => $this->request->merchant()->service_score,
-            'postage_score' => $this->request->merchant()->postage_score,
-            'service_phone' => $this->request->merchant()->service_phone,
-            'care_count' => $this->request->merchant()->care_count,
-            'type_name' => $this->request->merchant()->type_name->type_name ?? '',
-            'care' => true,
-            'recommend' => $this->request->merchant()->recommend,
-        ];
-        $data['mer_id'] = $this->request->merId();
-        $data['status'] =  1;
-        $data['mer_status'] = 1;
-        $data['rate'] = 3;
-        return app('json')->success($this->repository->preview($data));
-    }
-
-    public function setLabels($id)
-    {
-        $data = $this->request->params(['mer_labels']);
-        app()->make(SpuRepository::class)->setLabels($id,0,$data,$this->request->merId());
-        return app('json')->success('修改成功');
-    }
-
-    public function getAttrValue($id)
-    {
-        $data = $this->repository->getAttrValue($id, $this->request->merId());
-        return app('json')->success($data);
-    }
-
-    public function  freeTrial($id)
-    {
-        $params = [
-            "mer_cate_id",
-            "sort" ,
-            "is_show",
-            "is_good",
-            "attr",
-            "attrValue",
-            'spec_type'
-        ];
-        $data = $this->request->params($params);
-        $count = app()->make(StoreCategoryRepository::class)->getWhereCount(['store_category_id' => $data['mer_cate_id'],'is_show' => 1,'mer_id' => $this->request->merId()]);
-        if (!$count) throw new ValidateException('商户分类不存在或不可用');
-        $data['status'] = 1;
-        $this->repository->freeTrial($id, $data,$this->request->merId());
-        return app('json')->success('编辑成功');
-    }
-
-    /**
-     * TODO 上下架
-     * @Author:Qinii
-     * @Date: 2020/5/18
-     * @param int $id
-     * @return mixed
-     */
-    public function switchStatus($id)
-    {
-        $status = $this->request->param('status', 0) == 1 ? 1 : 0;
-        $this->repository->switchShow($id, $status,'is_show',$this->request->merId());
-        return app('json')->success('修改成功');
-    }
-
-
-    /**
-     * TODO 批量上下架
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 2022/9/6
-     */
-    public function batchShow()
-    {
-        $ids = $this->request->param('ids');
-        if (empty($ids)) return app('json')->fail('请选择商品');
-        $status = $this->request->param('status') == 1 ? 1 : 0;
-        $this->repository->batchSwitchShow($ids,$status,'is_show',$this->request->merId());
-        return app('json')->success('修改成功');
-    }
-
-    /**
-     * TODO 批量设置模板
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 2022/9/6
-     */
-    public function batchTemplate()
-    {
-        $ids = $this->request->param('ids');
-        $ids = is_array($ids) ? $ids : explode(',',$ids);
-        $data = $this->request->params(['temp_id']);
-        if (empty($ids)) return app('json')->fail('请选择商品');
-        if (empty($data['temp_id'])) return app('json')->fail('请选择运费模板');
-        if (!$this->repository->merInExists($this->request->merId(), $ids)) return app('json')->fail('请选择您自己商品');
-        $make = app()->make(ShippingTemplateRepository::class);
-        if (!$make->merInExists($this->request->merId(), [$data['temp_id']]))
-            return app('json')->fail('请选择您自己的运费模板');
-        $data['delivery_free'] = 0;
-        $this->repository->updates($ids,$data);
-        return app('json')->success('修改成功');
-    }
-
-    /**
-     * TODO 批量标签
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 2022/9/6
-     */
-    public function batchLabels()
-    {
-        $ids = $this->request->param('ids');
-        $data = $this->request->params(['mer_labels']);
-        if (empty($ids)) return app('json')->fail('请选择商品');
-        if (!$this->repository->merInExists($this->request->merId(), $ids))
-            return app('json')->fail('请选择您自己商品');
-        app()->make(SpuRepository::class)->batchLabels($ids, $data,$this->request->merId());
-        return app('json')->success('修改成功');
-    }
-
-    /**
-     * TODO 批量设置推荐类型
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 2022/9/6
-     */
-    public function batchHot()
-    {
-        $ids = $this->request->param('ids');
-        $data['is_good'] = 1;
-        if (empty($ids)) return app('json')->fail('请选择商品');
-        if (!$this->repository->merInExists($this->request->merId(), $ids))
-            return app('json')->fail('请选择您自己商品');
-        $this->repository->updates($ids,$data);
-        return app('json')->success('修改成功');
-    }
-
-    /**
-     * TODO 批量设置佣金
-     * @param ProductAttrValueRepository $repository
-     * @return \think\response\Json
-     * @author Qinii
-     * @day 2022/12/26
-     */
-    public function batchExtension(ProductAttrValueRepository $repository)
-    {
-        $ids = $this->request->param('ids');
-        $data = $this->request->params(['extension_one','extension_two']);
-        if ($data['extension_one'] > 1 || $data['extension_one'] < 0 || $data['extension_two'] < 0 || $data['extension_two'] > 1) {
-            return app('json')->fail('比例0～1之间');
-        }
-        if (empty($ids)) return app('json')->fail('请选择商品');
-        if (!$this->repository->merInExists($this->request->merId(), $ids))
-            return app('json')->fail('请选择您自己商品');
-        $repository->updatesExtension($ids,$data);
-        return app('json')->success('修改成功');
-    }
-
-    public function batchSvipType()
-    {
-        $ids = $this->request->param('ids');
-        $data = $this->request->params([['svip_price_type',0]]);
-
-        if (empty($ids)) return app('json')->fail('请选择商品');
-        if (!$this->repository->merInExists($this->request->merId(), $ids))
-            return app('json')->fail('请选择您自己商品');
-        $this->repository->updates($ids,$data);
-        return app('json')->success('修改成功');
-    }
-}
diff --git a/app/listener/ProductCreate.php b/app/listener/ProductCreate.php
index c3b91d9d..2dfb4464 100644
--- a/app/listener/ProductCreate.php
+++ b/app/listener/ProductCreate.php
@@ -12,11 +12,13 @@ class ProductCreate
     public function handle($event)
     {
         $merchant=Db::name('merchant')->where('mer_id',$event['product']['mer_id'])->find();
-        if ($merchant['type_id']==13){
+        if ($merchant['type_id']==13 ||$merchant['type_id']==11){
             return false;
         }
-        $mer_id=Db::name('merchant')->where('category_id',$merchant['category_id'])->where('type_id',13)->value('mer_id');
         $product_find=Db::name('store_product')->where('product_id',$event['product']['product_id'])->where('mer_id',$event['product']['mer_id'])->find();
+
+        //市级云仓
+        $mer_id=Db::name('merchant')->where('category_id',$merchant['category_id'])->where('type_id',13)->value('mer_id');
         $is_product=0;
         if ($product_find['bar_code']!='' &&in_array($product_find['product_type'],[0,98]) &&$product_find['spec_type']==0){
             $find=Db::name('store_product')->where('bar_code',$product_find['bar_code'])->where('mer_id',$mer_id)->find();
@@ -30,39 +32,62 @@ class ProductCreate
             }
         }
         if ($is_product==1){
-            $datas=[
-                'mer_id'=>$mer_id,
-                'status'=>1,
-                'brand_id'=>0,
-                'is_show'=>0,
-                'store_name'=>$product_find['store_name'],
-                'store_info'=>$product_find['store_info'],
-                'keyword'=>$product_find['keyword'],
-                'bar_code'=>$product_find['bar_code'],
-                'cate_id'=>$product_find['cate_id'],
-                'unit_name'=>$product_find['unit_name'],
-                'price'=>$product_find['price'],
-                'stock'=>$product_find['stock'],
-                'cost'=>$product_find['cost'],
-                'ot_price'=>$product_find['ot_price'],
-                'spec_type'=>$product_find['spec_type'],
-                'create_time'=>date('Y-m-d H:i:s'),
-                'image'=>$product_find['image'],
-                'slider_image'=>$product_find['slider_image'],
-            ];
-            $product_id=Db::name('store_product')->insertGetId($datas);
-            $content=Db::name('store_product_content')->where('product_id',$event['product']['product_id'])->find();
-            Db::name('store_product_content')->insert(['product_id'=>$product_id,'content'=>$content['content'],'type'=>$content['type']]);
-            $spu_arr=Db::name('store_spu')->where('mer_id',$product_find['mer_id'])->where('product_id',$event['product']['product_id'])->select()->toArray();
-            foreach ($spu_arr as $k=>$v){
-                $spu_arr[$k]['product_id']=$product_id;
-                $spu_arr[$k]['mer_id']=$mer_id;
-                $spu_arr[$k]['product_type']=0;
-                $spu_arr[$k]['create_time']=date('Y-m-d H:i:s');
-                unset($spu_arr[$k]['spu_id']);
+            $this->AddProduct($mer_id,$product_find,$event);
+        }
+        //镇街云仓
+        $is_product=0;
+        if ($merchant['type_id']==11){
+            $mer_id=Db::name('merchant')->where('category_id',$merchant['category_id'])->where('type_id',11)->value('mer_id');
+            if ($product_find['bar_code']!='' &&in_array($product_find['product_type'],[0,98]) &&$product_find['spec_type']==0){
+                $find=Db::name('store_product')->where('bar_code',$product_find['bar_code'])->where('mer_id',$mer_id)->find();
+                if (!$find){
+                    $is_product=1;
+                }
+            }else{
+                $find=Db::name('store_product')->where('store_name',$product_find['store_name'])->where('mer_id',$mer_id)->find();
+                if (!$find){
+                    $is_product=1;
+                }
+            }
+            if ($is_product==1){
+                $this->AddProduct($mer_id,$product_find,$event);
             }
-            Db::name('store_spu')->insertAll($spu_arr);
         }
         return false;
     }
+
+    public function AddProduct($mer_id,$product_find,$event){
+        $datas=[
+            'mer_id'=>$mer_id,
+            'status'=>1,
+            'brand_id'=>0,
+            'is_show'=>0,
+            'store_name'=>$product_find['store_name'],
+            'store_info'=>$product_find['store_info'],
+            'keyword'=>$product_find['keyword'],
+            'bar_code'=>$product_find['bar_code'],
+            'cate_id'=>$product_find['cate_id'],
+            'unit_name'=>$product_find['unit_name'],
+            'price'=>$product_find['price'],
+            'stock'=>$product_find['stock'],
+            'cost'=>$product_find['cost'],
+            'ot_price'=>$product_find['ot_price'],
+            'spec_type'=>$product_find['spec_type'],
+            'create_time'=>date('Y-m-d H:i:s'),
+            'image'=>$product_find['image'],
+            'slider_image'=>$product_find['slider_image'],
+        ];
+        $product_id=Db::name('store_product')->insertGetId($datas);
+        $content=Db::name('store_product_content')->where('product_id',$event['product']['product_id'])->find();
+        Db::name('store_product_content')->insert(['product_id'=>$product_id,'content'=>$content['content'],'type'=>$content['type']]);
+        $spu_arr=Db::name('store_spu')->where('mer_id',$product_find['mer_id'])->where('product_id',$event['product']['product_id'])->select()->toArray();
+        foreach ($spu_arr as $k=>$v){
+            $spu_arr[$k]['product_id']=$product_id;
+            $spu_arr[$k]['mer_id']=$mer_id;
+            $spu_arr[$k]['product_type']=0;
+            $spu_arr[$k]['create_time']=date('Y-m-d H:i:s');
+            unset($spu_arr[$k]['spu_id']);
+        }
+        Db::name('store_spu')->insertAll($spu_arr);
+    }
 }
diff --git a/runtime/cache/6d/ea25ba26d0916a28e7391e06cb43a5.php b/runtime/cache/6d/ea25ba26d0916a28e7391e06cb43a5.php
index 569baabc..3ad9b570 100644
--- a/runtime/cache/6d/ea25ba26d0916a28e7391e06cb43a5.php
+++ b/runtime/cache/6d/ea25ba26d0916a28e7391e06cb43a5.php
@@ -1,4 +1,4 @@
 <?php
-//000000002986
+//000000003088
  exit();?>
-a:8:{s:9:"visitUser";i:0;s:9:"orderUser";i:0;s:10:"orderPrice";d:0;s:12:"payOrderUser";i:0;s:13:"payOrderPrice";d:0;s:12:"payOrderRate";i:0;s:8:"userRate";i:0;s:9:"orderRate";i:0;}
\ No newline at end of file
+a:8:{s:9:"visitUser";i:2;s:9:"orderUser";i:1;s:10:"orderPrice";d:270;s:12:"payOrderUser";i:1;s:13:"payOrderPrice";d:135;s:12:"payOrderRate";s:4:"1.00";s:8:"userRate";s:6:"135.00";s:9:"orderRate";s:4:"0.50";}
\ No newline at end of file