.example.env

@@ -1,37 +1 @@
-APP_KEY = '#APP_KEY#'
-APP_DEBUG = false
-INSTALLED = true
-QUEUE_NAME = default
-
-[APP]
-DEFAULT_TIMEZONE = Asia/Shanghai
-
-[DATABASE]
-TYPE = mysql
-HOSTNAME = 47.109.36.146
-DATABASE = preview_shop_lihaink_cn
-PREFIX   = eb_
-HOSTPORT = 3306
-USERNAME = preview_shop_lihaink_cn
-PASSWORD = HwQ2RsjDTDJWcS7r
-CHARSET  = utf8mb4
-DEBUG    = true
-[DATABASE]
-TYPE = mysql
-HOSTNAME = 47.109.36.146
-DATABASE = ceshi_shop_lihaink_cn
-PREFIX   = eb_
-HOSTPORT = 3306
-USERNAME = ceshi_shop_lihaink_cn
-PASSWORD = 4EfPeWfkx2rtGQef
-CHARSET  = utf8mb4
-DEBUG    = true
-[LANG]
-default_lang = zh-cn
-
-
-[REDIS]
-REDIS_HOSTNAME = '#RB_HOST#'
-PORT           = '#RB_PORT#'
-REDIS_PASSWORD = '#RB_PWD#'
-SELECT         = '#RB_SELECT#'
+APP_KEY = '#APP_KEY#'
APP_DEBUG = false
INSTALLED = true
QUEUE_NAME = default

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = '#DB_HOST#'
HOSTPORT = '#DB_PORT#'
USERNAME = '#DB_USER#'
PASSWORD = '#DB_PWD#'
DATABASE = '#DB_NAME#'
PREFIX   = '#DB_PREFIX#'
CHARSET  = utf8
DEBUG    = true

[LANG]
default_lang = zh-cn


[REDIS]
REDIS_HOSTNAME = '#RB_HOST#'
PORT           = '#RB_PORT#'
REDIS_PASSWORD = '#RB_PWD#'
SELECT         = '#RB_SELECT#'

.gitignore

@@ -2,20 +2,13 @@
 /.vscode
 *.log
 .env
-.example.env
-.user.ini
 .phpstorm.meta.php
 .constant
 install/install.lock
 public/static/download/*
-public/dev/*
-public/preview/*
-public/prod/*
 public/phpExcel/*
 app/controller/api/Test.php
 public/protocol.html
-runtime/*
+/runtime/*
+runtime/swoole.pid
 cert_crmeb copy.key
-dump.rdb
-config/swoole.php
-.example.env

.well-known/acme-challenge/QGTfAcLOWmw4whJ02mWHaWLj2CWDjuREt6_TsDW90AU

@@ -1 +0,0 @@
-QGTfAcLOWmw4whJ02mWHaWLj2CWDjuREt6_TsDW90AU.ygZpRA3Elso4JmfhhS2sEZzf8WSBgcsagKxvXavv6_M

app/ExceptionHandle.php

@@ -12,7 +12,6 @@
 
 namespace app;
 
-use crmeb\utils\DingTalk;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\ModelNotFoundException;
 use think\db\exception\PDOException;
@@ -23,8 +22,6 @@ use think\exception\HttpResponseException;
 use think\exception\ValidateException;
 use think\Response;
 use Throwable;
-use Exception;
-use think\facade\Request;
 
 /**
  * 应用异常处理类
@@ -52,22 +49,8 @@ class ExceptionHandle extends Handle
      */
     public function report(Throwable $exception): void
     {
-        $data = [
-            'file'    => $exception->getFile(),
-            'line'    => $exception->getLine(),
-            'message' => $this->getMessage($exception),
-            'code'    => $this->getCode($exception),
-            'http'    =>Request::url()
-        ];
-        $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
-        if ($this->app->config->get('log.record_trace')) {
-            $log .= PHP_EOL . $exception->getTraceAsString();
-        }
-        try {
-            $this->app->log->record($log, 'error');
-        } catch (Exception $e) {}
         // 使用内置的方式记录异常日志
-        // parent::report($exception);
+        parent::report($exception);
     }
 
     /**
@@ -82,9 +65,6 @@ class ExceptionHandle extends Handle
     {
         // 添加自定义异常处理机制
         $this->report($e);
-        if ($e->getCode() != 0) {
-            DingTalk::exception($e, $e->getMessage(), $request);
-        }
         // 其他错误交给系统处理
         if ($e instanceof ValidateException)
             return app('json')->fail($e->getMessage());

app/common.php

@@ -13,12 +13,9 @@
 
 use app\common\repositories\system\config\ConfigValueRepository;
 use app\common\repositories\system\groupData\GroupDataRepository;
-use crmeb\jobs\SendSmsJob;
 use crmeb\services\UploadService;
 use Swoole\Lock;
 use think\db\BaseQuery;
-use think\facade\Db;
-use think\facade\Queue;
 
 if (!function_exists('go')) {
     function go(): bool
@@ -1155,43 +1152,5 @@ if (!function_exists('checkSuffix')) {
     }
 }
 
-if (!function_exists('Financial_Operations')) {
 
-    function Financial_Operations($activity_type,$order_id,$tempId='ORDER_CREATE',$id=0){
-                        //发送运营财务短信
-                        $group_id=0;
-                        if($activity_type==98){
-                            $group_id=Db::name('system_group')->where('group_key','city_operations')->value('group_id');
-                        }else{
-                            $group_id=Db::name('system_group')->where('group_key','town_operation')->value('group_id');
-                        }
-                        if($group_id){
-                            $group_value=Db::name('system_group_data')->where('group_id',$group_id)->column('value');
-                            if($group_value){
-                                foreach($group_value as $k=>$v){
-                                    $phone=json_decode($v,true);
-                                    Queue::push(SendSmsJob::class, ['tempId' => $tempId, 'phone' => $phone['phone'],'orderId'=>$order_id,'id'=>$id]);//短信通知
-                                }
-                            }
-            
-                        }
-    }
-}
-
-if (!function_exists('reset_index')) {
-    /**
-     * 重置数组索引
-     * @param array $data
-     * @param string $index
-     * @return array
-     */
-    function reset_index(array $data, string $index)
-    {
-        $return = [];
-        foreach ($data as $item) {
-            $return[$item[$index]] = $item;
-        }
-        return $return;
-    }
-}
 

app/common/dao/article/ArticleCategoryDao.php

@@ -81,8 +81,6 @@ class ArticleCategoryDao extends BaseDao
             $query->where('status', $where['status']);
         })->when(isset($where['pid']) && $where['pid'] !== '', function ($query) use ($where) {
             $query->where('pid', $where['pid']);
-        })->when(isset($where['is_home']) && $where['is_home'] !== '', function ($query) use ($where) {
-            $query->where('is_home', $where['is_home']);
         })->order('sort DESC, article_category_id DESC');
     }
 

app/common/dao/community/CommunityDao.php

@@ -17,7 +17,6 @@ use app\common\dao\BaseDao;
 use app\common\model\community\Community;
 use app\common\model\system\Relevance;
 use app\common\repositories\system\RelevanceRepository;
-use think\facade\Db;
 
 class CommunityDao extends BaseDao
 {
@@ -31,8 +30,7 @@ class CommunityDao extends BaseDao
     {
         $query = Community::hasWhere('author', function($query) use ($where){
             $query->when(isset($where['username']) && $where['username'] !==  '', function ($query) use($where) {
-                $uid = Db::name('merchant')->where('mer_name', $where['username'])->value('uid', -1);
-                $query->where('uid', $uid);
+                $query->whereLike('real_name|phone|nickname',"%{$where['username']}%");
             });
             $query->where(true);
         });
@@ -40,9 +38,6 @@ class CommunityDao extends BaseDao
             ->when(isset($where['keyword']) && $where['keyword'] !==  '', function ($query) use($where) {
                 $query->whereLike('Community.title',"%{$where['keyword']}%");
             })
-            ->when(!empty($where['resale_type']), function ($query) use($where) {
-                $query->where('Community.resale_type', $where['resale_type']);
-            })
             ->when(isset($where['uid']) && $where['uid'] !==  '', function ($query) use($where) {
                 $query->where('Community.uid',$where['uid']);
             })

app/common/dao/store/CityAreaDao.php

@@ -16,12 +16,6 @@ namespace app\common\dao\store;
 use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\store\CityArea;
-use app\common\model\store\GeoProvince;
-use app\common\model\store\GeoCity;
-use app\common\model\store\GeoArea;
-use app\common\model\store\GeoStreet;
-use app\common\model\store\GeoVillage;
-use app\common\model\store\GeoBrigade;
 
 class CityAreaDao extends BaseDao
 {
@@ -59,35 +53,10 @@ class CityAreaDao extends BaseDao
                     }
                 }
             }
-            $query->getVillage('path', $path . '%')->where('name', $street);
+            $query->whereLike('path', $path . '%')->where('name', $street);
         });
     }
 
-    public function searchGeo(array $where)
-    {
-        if (!empty($where['street_code'])) {
-            return GeoVillage::getDB()->where('street_code', $where['street_code']);
-        }
-        if (!empty($where['area_code'])) {
-            return GeoStreet::getDB()->where('area_code', $where['area_code']);
-        }
-        if (!empty($where['city_code'])) {
-            return GeoArea::getDB()->where('city_code', $where['city_code']);
-        }
-        if (!empty($where['province_code'])) {
-            return GeoCity::getDB()->where('province_code', $where['province_code']);
-        } else {
-            return GeoProvince::getDB();
-        }
-        return false;
-    }
-
-    public function searchBrigade(array $where)
-    {
-        return GeoBrigade::getDB();
-    }
-
-
     public function getCityList(CityArea $city)
     {
         if (!$city->parent_id) return [$city];
@@ -95,30 +64,4 @@ class CityAreaDao extends BaseDao
         $lst[] = $city;
         return $lst;
     }
-
-    /**
-     * 获取经纬度
-     * @param $location
-     * @param $streetCode
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function getLngAndLat($location, $streetCode)
-    {
-        if (!empty($streetCode)) {
-            $location = GeoStreet::where('street_code', $streetCode)->field('lng,lat')->find();
-            if (!empty($location)) {
-                [$lat, $lng] = [$location['lat'], $location['lng']];
-            }
-        } elseif (!empty($location) && $location != ',') {
-            [$lat, $lng] = explode(',', $location);
-        }
-        if (empty($lat) || empty($lng)) {
-            [$lat, $lng] = ['28.889137', '105.443352'];
-        }
-        return [$lat, $lng];
-    }
-
 }

app/common/dao/store/StoreActivityDao.php

@@ -14,16 +14,9 @@ namespace app\common\dao\store;
 
 
 use app\common\dao\BaseDao;
-use app\common\dao\store\product\CloudProductDao;
-use app\common\model\store\product\CloudProduct;
-use app\common\model\store\product\Product;
+use app\common\model\BaseModel;
 use app\common\model\store\StoreActivity;
-use app\common\model\store\StoreActivityOrderProduct;
-use app\common\repositories\store\product\SpuRepository;
-use think\db\Query;
-use think\exception\ValidateException;
-use think\facade\Db;
-use think\facade\Log;
+use app\common\repositories\system\RelevanceRepository;
 
 /**
  *
@@ -42,150 +35,4 @@ class StoreActivityDao extends BaseDao
         $where['is_del'] = 0;
         return $this->getSearch($where);
     }
-
-    /**
-     * 活动商品专区
-     * @param $userId
-     * @param $location
-     * @param $streetCode
-     * @param $activityId
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function product($userId, $location, $streetCode, $activityId)
-    {
-        $limit = 5;
-        [$lat, $lng] = (new CityAreaDao())->getLngAndLat($location, $streetCode);
-        $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], $limit);
-        $cloud_product = [];
-        foreach ($cloud_product_arr as $key => $value) {
-            $cloud_product[] = $value['product_id'];
-        }
-        $where = [
-            'is_show' => 1,
-            'is_used' => 1,
-            'status' => 1,
-            'is_del' => 0,
-            'mer_status' => 1,
-            'product_id' => $cloud_product
-        ];
-        if (!$cloud_product) {
-            return app('json')->success(['count' => 0, 'list' => []]);
-        }
-        /** @var SpuRepository $spuRep */
-        $spuRep = app()->make(SpuRepository::class);
-        $products = $spuRep->getApiSearch($where, 1, $limit, false, true);
-        $canBuy = 1;
-        if ($products['list']) {
-            $list = $products['list'];
-            $productList = array_column($list->toArray(), 'product');
-            $oldProductIds = array_column($productList, 'old_product_id');
-            $oldProductList = Product::whereIn('product_id', $oldProductIds)->field('product_id,stock')->select()->toArray();
-            $oldProductList = reset_index($oldProductList, 'product_id');
-            foreach ($cloud_product_arr as $key => $value) {
-                if (!empty($userId)) {
-                    $buyRecord = $this->canBuy($userId, $value['product_id']);
-                    if (!$buyRecord['is_true']) {
-                        $canBuy = 0;
-                    }
-                }
-                foreach ($list as $k => $v) {
-                    if ($activityId == 2) {
-                        $list[$k]['limited_price'] = '2.00';
-                        if (isset($oldProductList[$v['product']['old_product_id']])) {
-                            $list[$k]['product']['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
-                            $list[$k]['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
-                            if ($list[$k]['stock'] < 1) {
-                                $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage;
-                            }
-                        }
-                    }
-                    if ($value['product_id'] == $v['product_id']) {
-                        if ($value['mer_labels'] == ',5,') {
-                            $list[$k]['mer_labels_name'] = '五日达';
-                        } else {
-                            $list[$k]['mer_labels_name'] = '同城';
-                        }
-                    }
-                }
-            }
-        }
-        return ['can_buy' => $canBuy, 'count' => $products['count'], 'list' => $list ?? []];
-    }
-
-    /**
-     * 是否可购买活动商品
-     * @param $userId
-     * @param $productId
-     * @return bool|int
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function canBuy($userId, $productId)
-    {
-        $activityId = Db::name('cloud_product')->where('product_id', $productId)->value('activity_id');
-        $find = Db::name('store_activity_order_product')->where('user_id', $userId)->where('status', 1)->find();
-        $data=['activityId'=>$activityId,'is_true'=>true];
-        if ($find && $activityId == 2) {
-            $data['is_true']=false;
-        }
-        return $data;
-    }
-
-    /**
-     * 保存活动订单商品
-     * @param $activityId
-     * @param $order
-     * @return void
-     */
-    public function saveOrderProduct($activityId, $order)
-    {
-        $orderProductIds = array_column($order->orderProduct->toArray(), 'product_id');
-        $productIds = CloudProduct::whereIn('product_id', $orderProductIds)->where('activity_id', $activityId)->column('product_id');
-        if (empty($productIds)) {
-            return;
-        }
-        // $find = StoreActivityOrderProduct::where('user_id', $order['uid'])->where('status', 1)->find();
-        foreach ($productIds as $productId) {
-            // if (!empty($find['product_id']) && $find['product_id'] == $productId && $activityId == 2) {
-            //     throw new ValidateException('活动商品限购1个');
-            // }
-            $model = new StoreActivityOrderProduct();
-            $model->user_id = $order['uid'];
-            $model->activity_id = $activityId;
-            $model->product_id = $productId;
-            $model->number = 1;
-            if (!$model->save()) {
-                Log::error('活动商品数据保存失败productId'.$productId);
-                // throw new ValidateException('活动商品数据保存失败');
-            }
-        }
-    }
-
-    /**
-     * 根据活动获取对应的镇街
-     * @param $activityId
-     * @return array
-     */
-    public function district($activityId)
-    {
-        $merchants = CloudProduct::with(['merchant' => function (Query $query) {
-            $query->with(['street' => function (Query $query) {
-                $query->field('street_code,street_name');
-            }])->field('mer_id,street_id');
-        }])->where('activity_id', $activityId)->field('mer_id')->group('mer_id')->select()->toArray();
-        $result = [];
-        foreach ($merchants as $merchant) {
-            $streetCode = $merchant['merchant']['street']['street_code'] ?? '';
-            $streetName = $merchant['merchant']['street']['street_name'] ?? '';
-            if (!isset($result[$streetCode]) && !empty($streetCode)) {
-                $result[$streetCode] = ['street_code' => $streetCode, 'street_name' => $streetName];
-            }
-        }
-        return array_values($result);
-    }
-
 }

app/common/dao/store/StoreActivityOrderDao.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace app\common\dao\store;
-
-use app\common\dao\BaseDao;
-use app\common\model\store\consumption\StoreConsumptionDetail;
-use app\common\model\store\consumption\StoreConsumptionUser;
-use app\common\model\store\StoreActivityOrder;
-
-class StoreActivityOrderDao extends BaseDao
-{
-
-    protected function getModel(): string
-    {
-        return StoreActivityOrder::class;
-    }
-
-    /**
-     * 保存活动订单数据
-     * @param $groupOrder 订单
-     * @param int $spreadId 推荐人id
-     * @param int $isFirstOrder 是否首单
-     * @param int $activityId 活动id
-     * @return StoreActivityOrder
-     * @throws \Exception
-     */
-    public function save($groupOrder, int $spreadId, int $isFirstOrder, int $activityId = 1)
-    {
-        $model = new StoreActivityOrder();
-        $model->activity_id = $activityId;
-        $model->user_id = $groupOrder['uid'];
-        $model->group_order_id = $groupOrder['group_order_id'];
-        $model->spread_id = $spreadId;
-        $model->pay_price = $groupOrder['pay_price'];
-        $model->is_first_order = $isFirstOrder;
-        $model->status = StoreActivityOrder::STATUS_VALID;
-        $consumptionDetail = StoreConsumptionDetail::where('group_order_id', $groupOrder['group_order_id'])
-            ->field('group_order_id,sum(amount) amount,sum(pay_price) pay_price,coupon_user_id')
-            ->find();
-        if (!empty($consumptionDetail['amount'])) {
-            // 当前订单使用现金抵扣红包 或 使用通用红包后实付金额不足红包金额的1.5倍，视为无效订单
-            $redPackType = StoreConsumptionUser::where('coupon_user_id', $consumptionDetail['coupon_user_id'])->value('type');
-            if ($redPackType == StoreConsumptionUser::TYPE_TWO || ($redPackType == StoreConsumptionUser::TYPE_TWO && $consumptionDetail['pay_price'] < $consumptionDetail['amount'] * 1.5)) {
-                $model->status = StoreActivityOrder::STATUS_INVALID;
-            }
-        }
-        $model->red_pack = $consumptionDetail['amount'] ?? 0;
-        if (!$model->save()) {
-            throw new \Exception('活动订单保存失败');
-        }
-        return $model;
-    }
-
-    /**
-     * 活动订单撤销
-     * @param int $groupOrderId
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function repeal(int $groupOrderId)
-    {
-        $model = StoreActivityOrder::where('group_order_id', $groupOrderId)->find();
-        if ($model) {
-            $model->status = StoreActivityOrder::STATUS_INVALID;
-            if (!$model->save()) {
-                throw new \Exception('活动订单保存失败');
-            }
-        }
-    }
-
-    /**
-     * 活动订单批量撤销
-     * @param array $groupOrderIds
-     * @return void
-     * @throws \Exception
-     */
-    public function batchRepeal(array $groupOrderIds)
-    {
-        $count = StoreActivityOrder::whereIn('group_order_id', $groupOrderIds)->update(['status' => StoreActivityOrder::STATUS_INVALID]);
-        if ($count < count($groupOrderIds)) {
-            throw new \Exception('活动订单批量作废失败');
-        }
-    }
-
-}

app/common/dao/store/StoreActivityUserDao.php

@@ -1,316 +0,0 @@
-<?php
-
-namespace app\common\dao\store;
-
-use app\common\dao\BaseDao;
-use app\common\dao\store\consumption\StoreConsumptionUserDao;
-use app\common\model\store\consumption\StoreConsumption;
-use app\common\model\store\consumption\StoreConsumptionDetail;
-use app\common\model\store\consumption\StoreConsumptionUser;
-use app\common\model\store\StoreActivityOrder;
-use app\common\model\store\StoreActivityUser;
-use app\common\model\user\User;
-use app\common\model\user\UserBill;
-
-class StoreActivityUserDao extends BaseDao
-{
-
-    protected function getModel(): string
-    {
-        return StoreActivityUser::class;
-    }
-
-    /**
-     * 选择消费金类型
-     * @param int $userId
-     * @param int $couponId
-     * @param int $activityId
-     * @return void
-     * @throws \Exception
-     */
-    public function choose(int $userId, int $couponId, int $activityId)
-    {
-        $consumption = StoreConsumption::where('coupon_id', $couponId)->find();
-        if ($consumption['status'] != 1 || strtotime($consumption['start_time']) > time() || strtotime($consumption['end_time']) <= time()) {
-            throw new \Exception('当前活动已结束');
-        }
-        $model = StoreActivityUser::where('user_id', $userId)->where('value', $couponId)->where('activity_id', $activityId)->find();
-        if (empty($model)) {
-            $model = new StoreActivityUser();
-            $model->user_id = $userId;
-            $model->value = $couponId;
-            $model->activity_id = $activityId;
-            $model->create_time = time();
-            $model->status = 1;
-            if (!$model->save()) {
-                throw new \Exception('保存出错');
-            }
-        }
-        $validModel = StoreActivityUser::where('user_id', $userId)->where('activity_id', $activityId)->where('status', 1)->find();
-        if ($validModel['value'] != $couponId) {
-            $consumption = StoreConsumption::where('coupon_id', $validModel['value'])->find();
-            if ($consumption['type'] == StoreConsumption::TYPE_PULL_CONSUMPTION) {
-                $groupOrders = StoreActivityOrder::whereRaw('user_id=:user_id or spread_id=:spread_id', ['user_id' => $userId, 'spread_id' => $userId])
-                    ->where('activity_id', $activityId)
-                    ->where('status', StoreActivityOrder::STATUS_VALID)
-                    ->count();
-                if ($groupOrders > 0) {
-                    $model->status = 0;
-                    if (!$model->save()) {
-                        throw new \Exception('保存出错');
-                    }
-                    throw new \Exception('您正在参与活动，暂时不支持切换');
-                }
-            }
-            $validModel->status = 0;
-            if (!$validModel->save()) {
-                throw new \Exception('保存出错');
-            }
-            $model->status = 1;
-            if (!$model->save()) {
-                throw new \Exception('保存出错');
-            }
-        }
-    }
-
-    /**
-     * 获取用户选择的消费金类型
-     * @param int $userId
-     * @param int $activityId
-     * @return int
-     */
-    public function getValue(int $userId, int $activityId = 1)
-    {
-        $data = StoreActivityUser::where('user_id', $userId)->where('activity_id', $activityId)->where('status', 1)->find();
-        return $data->value ?? 0;
-    }
-
-    /**
-     * @deprecated 用下面的 default()
-     * @param int $userId
-     * @param int $activityId
-     * @return StoreActivityUser|array|mixed|\think\Model|null
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function getOne(int $userId, int $activityId = 1)
-    {
-        return StoreActivityUser::where('user_id', $userId)->where('activity_id', $activityId)->where('status', 1)->find();
-    }
-
-    /**
-     * 获取用户参加的活动类型，默认为消费返利
-     * @param int $userId
-     * @param int $activityId
-     * @return StoreActivityUser|array|mixed|\think\Model|null
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function default(int $userId, int $activityId = 1)
-    {
-        $default = StoreActivityUser::where('user_id', $userId)->where('activity_id', $activityId)->where('status', 1)->find();
-        if (empty($default)) {
-            $couponId = StoreConsumption::where('type', StoreConsumption::TYPE_OWNER_CONSUMPTION)->value('coupon_id');
-            $default = new StoreActivityUser();
-            $default->user_id = $userId;
-            $default->activity_id = $activityId;
-            $default->value = $couponId;
-            $default->status = 1;
-            $default->save();
-        }
-        return $default;
-    }
-
-    /**
-     * 获取用户参与活动的状态
-     * @param int $userId 用户id
-     * @param int $activityId 活动id
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function status(int $userId, int $activityId)
-    {
-        $target = 0;
-        $userInfo = [];
-        $activityUser = StoreActivityUser::where('user_id', $userId)
-            ->where('activity_id', $activityId)
-            ->where('status', 1)
-            ->find();
-        if (empty($activityUser)) {
-            return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo];
-        }
-        $consumption = StoreConsumption::where('coupon_id', $activityUser['value'])
-            ->where('type', StoreConsumption::TYPE_PULL_CONSUMPTION)
-            ->find();
-        $unReceiveConsumption = StoreConsumptionUser::where('uid', $userId)->where('status', StoreConsumptionUser::STATUS_UN_RECEIVE)->value('order_id_set');
-        if (!empty($unReceiveConsumption)) {
-            $groupOrderIds = explode(',', $unReceiveConsumption);
-            $groupOrderId = $groupOrderIds[0];
-            $myOrderWhere = ['group_order_id' => $groupOrderId];
-        } else {
-            $myOrderWhere = ['status' => StoreActivityOrder::STATUS_VALID];
-        }
-        $myOrder = StoreActivityOrder::where('user_id', $userId)
-            ->where('activity_id', $activityId)
-            ->where($myOrderWhere)
-            ->find();
-        if (empty($myOrder) || empty($myOrder['pay_price'])) {
-            return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo];
-        }
-        $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray();
-        $storeConsumptionUserDao = new StoreConsumptionUserDao();
-        $scope = $storeConsumptionUserDao->getScope($consumption, $myOrder['pay_price']);
-        // 订单有效金额为实付金额+红包金额
-        $orderValidAmount = bcadd($myOrder['pay_price'], $myOrder['red_pack'], 2);
-        $orderValidAmount = min($orderValidAmount, $storeConsumptionUserDao->maxAmount);
-        $orderQuery = StoreActivityOrder::where('spread_id', $userId)
-            ->whereIn('user_id', array_column($userInfo, 'uid'))
-            ->where('activity_id', $activityId)
-            ->where('is_first_order', StoreActivityOrder::IS_FIRST_ORDER)
-            ->where('pay_price', '>=', $orderValidAmount);
-        if (!empty($groupOrderIds)) {
-            unset($groupOrderIds[0]);
-            $orderQuery->whereIn('group_order_id', $groupOrderIds);
-        } else {
-            $orderQuery->where('status', StoreActivityOrder::STATUS_VALID);
-        }
-        $orders = $orderQuery->select()->toArray();
-        $orders = reset_index($orders, 'user_id');
-        foreach ($userInfo as &$user) {
-            $user['target_amount'] = $orderValidAmount;
-            $user['is_finish'] = isset($orders[$user['uid']]) ? 1 : 0;
-        }
-        return ['target' => $scope['num'], 'allow_receive' => count($orders) >= $scope['num'], 'user_info' => $userInfo];
-    }
-
-    /**
-     * 领取消费金
-     * @param int $userId
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function receive(int $userId)
-    {
-        $consumption = StoreConsumption::where('type', StoreConsumption::TYPE_PULL_CONSUMPTION)
-            ->where('status', StoreConsumption::STATUS_ENABLE)
-            ->find();
-        $userConsumption = StoreConsumptionUser::where('uid', $userId)
-            ->where('coupon_id', $consumption['coupon_id'])
-            ->where('status', StoreConsumptionUser::STATUS_UN_RECEIVE)
-            ->find();
-        if (empty($userConsumption)) {
-            throw new \Exception('您没有可领取的红包');
-        }
-        $userConsumption->status = StoreConsumptionUser::STATUS_UNUSED;
-        $userConsumption->start_time = date('Y-m-d H:i:s', time() + 7 * 86400);
-        $userConsumption->end_time = '2026-01-15 23:59:59';
-        if (!$userConsumption->save()) {
-            throw new \Exception('领取出错，请稍后重试');
-        }
-        return ['amount' => $userConsumption['coupon_price'], 'end_time' => $userConsumption['end_time']];
-    }
-
-    /**
-     * 红包获取记录
-     * @param int $userId
-     * @param int $type
-     * @param int $page
-     * @param int $limit
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function record(int $userId, int $type, int $page, int $limit)
-    {
-        $totalAmount = StoreConsumptionUser::where('uid', $userId)
-            ->whereIn('type', $type)
-            ->where('status', StoreConsumptionUser::STATUS_UNUSED)
-            ->sum('balance');
-        $query = UserBill::field('link_id,create_time,number coupon_price,mark')
-            ->where('uid', $userId)
-            ->where('category', 'red_pack')
-            ->where('status', 1)
-            ->where('type', "red_pack_{$type}");
-        $count = $query->count();
-        $record = $query->page($page)->limit($limit)->select()->toArray();
-        foreach ($record as &$item) {
-            $item['order_amount'] = 0;
-            if (mb_strpos($item['mark'], '订单金额：') !== false) {
-                $item['order_amount'] = mb_substr($item['mark'], mb_strpos($item['mark'], '订单金额：') + 5);
-            }
-            unset($item['mark']);
-        }
-        return ['total_amount' => $totalAmount, 'count' => $count, 'record' => $record];
-    }
-
-    /**
-     * 红包获取记录
-     * @param int $userId
-     * @param int $type
-     * @param int $page
-     * @param int $limit
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function useRecord(int $userId, int $type, int $page, int $limit)
-    {
-        $totalAmount = StoreConsumptionUser::where('uid', $userId)
-            ->whereIn('type', $type)
-            ->where('status', StoreConsumptionUser::STATUS_UNUSED)
-            ->sum('balance');
-        $query = StoreConsumptionDetail::field('create_time,order_id,amount coupon_price,pay_price')
-            ->where('user_id', $userId)
-            ->where('type', 1);
-        $count = $query->count();
-        $record = $query->page($page)->limit($limit)->select()->toArray();
-        foreach ($record as &$item) {
-            $item['order_amount'] = bcadd($item['coupon_price'], $item['pay_price'], 2);
-        }
-        return ['total_amount' => $totalAmount, 'count' => $count, 'record' => $record];
-    }
-
-    /**
-     * 红包余额统计
-     * @param int $userId
-     * @return array|array[]
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function total(int $userId)
-    {
-        $totalAmount = StoreConsumptionUser::where('uid', $userId)
-            ->whereIn('type', [StoreConsumptionUser::TYPE_ONE, StoreConsumptionUser::TYPE_TWO])
-            ->whereIn('status', [StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::STATUS_REPEAL])
-            ->field('balance,type')
-            ->select()->toArray();
-        $result = [
-            '1' => [
-                'type' => 1,
-                'total_amount' => 0.00,
-                'type_cn' => StoreConsumptionUser::TYPE_MAP[1],
-            ],
-            '2' => [
-                'type' => 2,
-                'total_amount' => 0.00,
-                'type_cn' => StoreConsumptionUser::TYPE_MAP[2],
-            ]
-        ];
-        foreach ($totalAmount as $item) {
-            if (isset($result[$item['type']])) {
-                $result[$item['type']]['total_amount']= bcadd($result[$item['type']]['total_amount'], $item['balance'], 2);
-            }
-        }
-        return array_values($result);
-    }
-
-}

app/common/dao/store/consumption/CommissionDao.php

@@ -1,256 +0,0 @@
-<?php
-
-namespace app\common\dao\store\consumption;
-
-use app\common\dao\system\financial\FinancialDao;
-use app\common\model\store\consumption\StoreConsumption;
-use app\common\model\store\consumption\StoreConsumptionUser;
-use app\common\model\store\order\StoreOrder;
-use app\common\model\system\merchant\FinancialRecord;
-use app\common\model\system\merchant\Merchant;
-use app\common\model\user\User;
-use app\common\model\user\UserBill;
-use app\common\repositories\system\merchant\MerchantRepository;
-use crmeb\utils\Curl;
-use think\facade\Log;
-
-class CommissionDao
-{
-
-    /**
-     * 活动首单商户佣金 (支付成功后调用)
-     * @param $order
-     * @param $financeDao
-     * @return mixed
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function firstOrderCommission($order, $financeDao)
-    {
-        $commission = bcmul($order['pay_price'], 0.01, 2);
-        if ($commission > 0 && $order['order_type'] == 1) {
-            // 订单为自提，且佣金大于0
-            $financeDao->user = $order->user;
-            $financeDao->order = $order;
-            $financeDao->platformOut($commission, 'commission_to_store', $order['mer_id']);
-            app()->make(MerchantRepository::class)->addLockMoney($order['mer_id'], 'order', $order['order_id'], $commission);
-        }
-        $consumption = StoreConsumption::where('status', 1)->where('type', StoreConsumption::TYPE_FIRST_ORDER_COMMISSION)->find();
-        if (empty($consumption)) {
-            return $financeDao;
-        }
-        $storeConsumptionDao = new StoreConsumptionUserDao();
-        $isFirstOrder = $storeConsumptionDao->isFirstOrder($order['uid'], $consumption['start_time'], $consumption['end_time']);
-        if (!$isFirstOrder) {
-            return $financeDao;
-        }
-        // 给镇合伙人、村合伙人、小组服务团队、店铺分佣，仅直推
-        $promotionCode = User::where('uid', $order['uid'])->value('promotion_code');
-        if (!empty($promotionCode)) {
-            $merchantId = substr($promotionCode, strpos($promotionCode, 'mer_') + 4);
-            if (strpos($promotionCode, 'mer_') !== false && $merchantId) {
-                $userId = Merchant::where('mer_id', $merchantId)->value('uid');
-                $user = User::where('uid', $userId)->find();
-                $commission = bcmul($order['pay_price'], 0.03, 2);
-                $financeDao->user = $user;
-                $financeDao->order = $order;
-                $financeDao->platformOut($commission, 'commission_to_promoter', $merchantId);
-                app()->make(MerchantRepository::class)->addLockMoney($merchantId, 'order', $order['order_id'], $commission);
-                $redPack = bcmul($order['pay_price'], $consumption['config']['red_pack_rate'], 2);
-                if ($redPack > 0) {
-                    try {
-                        (new StoreConsumptionUserDao())->send($consumption, $consumption['config']['red_pack_rate'], $user['uid'], $order['order_id'], $order['pay_price'], StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
-                    } catch (\Exception $e) {
-                        Log::error($e->getMessage());
-                    }
-                }
-            } else {
-                $this->sendCommission($order, $promotionCode);
-            }
-        }
-        return $financeDao;
-    }
-
-    /**
-     * 活动首单推广人佣金（供应商平台异步回调）
-     * @param $data
-     * @return mixed
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function firstOrderCommissionCallback($data)
-    {
-        $consumption = StoreConsumption::where('status', 1)->where('type', StoreConsumption::TYPE_FIRST_ORDER_COMMISSION)->find();
-        if (empty($consumption)) {
-            return [];
-        }
-        $users = $this->getUsers($data['user']);
-        $order = StoreOrder::where('order_id', $data['order_id'])->find();
-        if (empty($order)) {
-            return [];
-        }
-        $result = [];
-        $financeDao = new FinancialDao();
-        foreach ($users as $user) {
-            $commission = bcdiv($user['user_profit'], 100, 2);
-            if ($commission > 0) {
-                $financeDao->user = $user;
-                $financeDao->order = $order;
-                $financialType = $user['type'] == 4 ? 'commission_to_courier' : 'commission_to_promoter';
-                $financeDao->platformOut($commission, $financialType);
-                $result[] = $user;
-            }
-            $redPack = bcmul($order['pay_price'], $consumption['config']['red_pack_rate'], 2);
-            if ($redPack > 0) {
-                try {
-                    (new StoreConsumptionUserDao())->send($consumption, $consumption['config']['red_pack_rate'], $user['uid'], $order['order_id'], $order['pay_price'], StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
-                } catch (\Exception $e) {
-                    Log::error($e->getMessage());
-                }
-            }
-        }
-        $financeDao->save();
-        return $result;
-    }
-
-    /**
-     * 给镇合伙人或推广人发放佣金（支付完成后调用，推广人仅首单奖励）
-     * 请求发送给供应商平台后异步回调
-     * 暂时取消镇合伙人佣金
-     * @param $order
-     * @param $promotionCode
-     * @param int $type 类型：1=>小组，2=>村合伙人，3=>镇合伙人，4=>配送员
-     * @return void
-     */
-    public function sendCommission($order, $promotionCode, $type = 1)
-    {
-        $curl = new Curl();
-        $timestamp = time();
-        $json = ['timestamp' => $timestamp, 'data' => ['order_id' => $order['order_id'], 'order_sn' => $order['order_sn'], 'order_money' => bcmul($order['pay_price'], 100), 'promotion_code' => $promotionCode]];
-        if ($type == 3) {
-            $json['data']['street_code'] = $promotionCode;
-        } elseif ($type == 4) {
-            $json['data']['courier_phone'] = $promotionCode;
-        } else {
-            $json['data']['promotion_code'] = $promotionCode;
-        }
-        $aes = new \AES();
-        $iv = $aes->buildIv($timestamp);
-        $encrypt = $aes->encrypt($json, $iv);
-        $api = in_array($type, [1, 2]) ? 'user_first_order_share_profit' : 'user_order_share_profit';
-        $url = env('task.new_worker_host_url') . '/api/shop_call/' . $api;
-        $result = $curl->post($url, ['timestamp' => $timestamp, 'data' => $encrypt]);
-        $result = json_decode($result, true);
-        Log::info('供销佣金：' . var_export($result, true));
-    }
-
-    /**
-     * 订单退款，店铺退佣金
-     * @param $refundOrder
-     * @return void
-     */
-    public function refundByOrder($refundOrder)
-    {
-        // 是否已经退过佣金
-        $refunded = FinancialRecord::where('order_id', $refundOrder->order['order_id'])
-            ->whereIn('financial_type', ['commission_to_store_refund', 'commission_to_courier_refund', 'commission_to_promoter_refund'])
-            ->count();
-        if ($refunded > 0) {
-            return;
-        }
-        // 退佣金和红包、保证金
-        $financeRecord = FinancialRecord::where('order_id', $refundOrder->order['order_id'])
-            ->whereIn('financial_type', ['commission_to_store', 'commission_to_courier', 'commission_to_promoter'])
-            ->field('user_id uid,user_info nickname,number,mer_id,financial_type')->select()->toArray();
-        if (empty($financeRecord)) {
-            return;
-        }
-        $userIds = [];
-        $financeDao = new FinancialDao();
-        foreach ($financeRecord as $item) {
-            $userIds[] = $item['uid'];
-            $financeDao->user = $item;
-            $financeDao->order = $refundOrder->order;
-            $financeDao->platformIn($item['number'], $item['financial_type'] . '_refund', $item['mer_id']);
-            if ($item['mer_id'] > 0) {
-                app()->make(MerchantRepository::class)->subLockMoney($item['mer_id'], 'order', $refundOrder->order['order_id'], $item['number']);
-            }
-        }
-        $financeDao->save();
-
-        // 服务团队退红包
-        $redPacks = UserBill::whereIn('uid', $userIds)->where('extra->order_id',$refundOrder->order['order_id'])->select()->toArray();
-        foreach ($redPacks as $redPack) {
-            (new StoreConsumptionUserDao())->refundByCommission($redPack['uid'], $refundOrder->order['order_id'], $redPack['number']);
-        }
-
-        $promotionCode = User::where('uid', $refundOrder['uid'])->value('promotion_code');
-        if ($promotionCode && strpos($promotionCode, 'mer_') === false){
-            $curl = new Curl();
-            $aes = new \AES();
-            $timestamp = time();
-            $json = ['timestamp' => $timestamp, 'data' => ['order_sn' => $refundOrder->order['order_sn']]];
-            $iv = $aes->buildIv($timestamp);
-            $encrypt = $aes->encrypt($json, $iv);
-            $url = env('task.new_worker_host_url') . '/api/shop_call/handleRefund';
-            $result = $curl->post($url, ['timestamp' => $timestamp, 'data' => $encrypt]);
-            $result = json_decode($result, true);
-            Log::error('发起佣金退款：' . var_export($result, true));
-        }
-    }
-
-    /**
-     * @deprecated 暂时弃用，后续可能会用
-     * 供销平台退佣金回调
-     * @param $data
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function refundByCallback($data)
-    {
-        $result = [];
-        $users = $this->getUsers($data['user']);
-        $order = StoreOrder::where('order_id', $data['order_id'])->find();
-        if (empty($order) || empty($users)) {
-            return [];
-        }
-        $financeDao = new FinancialDao();
-        foreach ($users as $user) {
-            $commission = bcdiv($user['user_profit'], 100, 2);
-            if ($commission > 0) {
-                $financeDao->user = $user;
-                $financeDao->order = $order;
-                $financialType = ($user['type'] == 3 ? 'order_commission' : 'first_order_commission') . '_refund';
-                $financeDao->platformIn($commission, $financialType);
-                $result[] = $user;
-            }
-            $redPack = bcmul($order['pay_price'], 0.07, 2);
-            if ($redPack > 0) {
-                try {
-                    (new StoreConsumptionUserDao())->refundByCommission($user['uid'], $order->order_id, $redPack);
-                } catch (\Exception $e) {
-                    Log::error($e->getMessage());
-                }
-            }
-        }
-        $financeDao->save();
-        return $result;
-    }
-
-    public function getUsers($info)
-    {
-        $info = reset_index($info, 'account');
-        $users = User::whereIn('account', array_keys($info))->field('uid,account,nickname')->select()->toArray();
-        foreach ($users as &$user) {
-            if (isset($info[$user['account']])) {
-                $user = array_merge($info[$user['account']], $user);
-            }
-        }
-        return $users;
-    }
-
-}

app/common/dao/store/consumption/StoreConsumptionDao.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace app\common\dao\store\consumption;
-
-use app\common\dao\BaseDao;
-use \app\common\model\store\consumption\StoreConsumption;
-
-class StoreConsumptionDao extends BaseDao
-{
-
-    /**
-     * @return string
-     */
-    protected function getModel(): string
-    {
-        return StoreConsumption::class;
-    }
-
-    /**
-     * 获取有效的消费金列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function getValidList()
-    {
-        return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE)
-        ->field('coupon_id,start_time,end_time,title')->select()->each(function ($item){
-                if($item['title']=='无门槛实物通用补贴'){
-                    $item['title'] = '用户推荐拉新活动';
-                }else{
-                    $item['title'] = '用户消费补贴活动';
-                }
-                return $item;
-        });
-    }
-
-    public function getOne($id)
-    {
-        return StoreConsumption::where('coupon_id', $id)
-            ->where('status', StoreConsumption::STATUS_ENABLE)
-            ->whereTime('start_time', '<=', time())
-            ->find();
-    }
-
-}

app/common/dao/store/consumption/StoreConsumptionUserDao.php

@@ -1,579 +0,0 @@
-<?php
-
-namespace app\common\dao\store\consumption;
-
-use app\common\dao\BaseDao;
-use app\common\dao\store\StoreActivityOrderDao;
-use app\common\dao\store\StoreActivityUserDao;
-use app\common\dao\system\financial\FinancialDao;
-use app\common\model\store\consumption\StoreConsumption;
-use app\common\model\store\consumption\StoreConsumptionUser;
-use app\common\model\store\order\StoreGroupOrder;
-use app\common\model\store\order\StoreOrder;
-use app\common\model\store\StoreActivityOrder;
-use app\common\model\user\User;
-use app\common\repositories\user\UserBillRepository;
-use think\exception\ValidateException;
-use think\facade\Db;
-
-class StoreConsumptionUserDao extends BaseDao
-{
-
-    /** @var float $maxAmount 单笔订单计算红包的最大有效金额 */
-    public $maxAmount = 20000;
-
-    /** @var float $orderTotalPrice 订单总金额 */
-    public $orderTotalPrice;
-
-    /** @var float $orderPayPrice 订单实付金额 */
-    public $orderPayPrice;
-
-    /** @var float $orderProductPrice 当前商品金额 */
-    public $orderProductPrice;
-
-    /** @var float $realPriceTotal 扣除红包后实际支付金额 */
-    public $realPriceTotal = 0;
-
-    /** @var float $isLast 是否最后一条数据 */
-    public $isLast = false;
-
-    /** @var float $groupOrderTotalPrice 订单组总金额 */
-    public $groupOrderTotalPrice;
-
-    /** @var float $consumptionTotalAmount 红包总金额 */
-    public $consumptionTotalAmount;
-    /** @var int $orderType 订单类型：1 groupOrder，2 order */
-    public $orderType = 2;
-    /** @var float $consumptionUsed 已使用的红包金额 */
-    public $consumptionUsed;
-    /** @var float $profitRate 商品毛利率 */
-    public $profitRate;
-
-    public $startTime;
-    public $endTime;
-    public $billExtra;
-    public $onlyBill = false; // 是否只写入用户账单
-
-    protected function getModel(): string
-    {
-        return StoreConsumptionUser::class;
-    }
-
-    /**
-     * 校验用户是否满足红包拉新活动条件
-     * @param int $userId 用户id
-     * @param int $groupOrderId 订单id
-     * @return false|void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function check(int $userId, int $groupOrderId)
-    {
-        $spreadUserId = User::where('uid', $userId)->value('spread_uid');
-        $groupOrder = StoreGroupOrder::where('group_order_id', $groupOrderId)->find();
-        if (empty($spreadUserId)) {
-            $this->promoter($userId, $groupOrder, $spreadUserId);
-        } else {
-            $this->guest($userId, $groupOrder, $spreadUserId);
-        }
-    }
-
-    /**
-     * 发起人活动校验
-     * @param int $userId
-     * @param $groupOrder
-     * @param int $spreadUserId
-     * @return bool
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function promoter(int $userId, $groupOrder, int $spreadUserId)
-    {
-        $activityUser = (new StoreActivityUserDao())->default($userId);
-        $consumption = (new StoreConsumptionDao())->getOne($activityUser['value'] ?? 0);
-        //用户没有参加 消费金活动 或 已超过任务完成时间
-        $endTime = $this->getEndTime($activityUser['create_time'] ?? '2024-01-01 00:00:00');
-        if (empty($consumption['config']) || $endTime < time()) {
-            return false;
-        }
-        $orderValidAmount = min($groupOrder['pay_price'], $this->maxAmount);
-        $scope = $this->getScope($consumption, $orderValidAmount);
-        //用户没有达到 消费金活动 任一档次
-        if (empty($scope) || $scope['rate'] <= 0) {
-            return false;
-        }
-        Db::startTrans();
-        try {
-            $isFirstOrder = $this->isFirstOrder($userId, $consumption['start_time'], date('Y-m-d H:i:s', $endTime));
-            $storeActivityOrderDao = new StoreActivityOrderDao();
-            $storeActivityOrder = $storeActivityOrderDao->save($groupOrder, $spreadUserId, $isFirstOrder);
-            if ($consumption['type'] == StoreConsumption::TYPE_OWNER_CONSUMPTION && $storeActivityOrder['status'] == StoreActivityOrder::STATUS_VALID && $storeActivityOrder['red_pack'] == 0) {
-                $this->orderType = 1;
-                $this->send($consumption, $scope['rate'], $userId, $groupOrder['group_order_id'], $orderValidAmount, StoreConsumptionUser::STATUS_UNUSED);
-                $this->send($consumption, $scope['rate_two'], $userId, $groupOrder['group_order_id'], $orderValidAmount, StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
-                $storeActivityOrderDao->repeal($groupOrder['group_order_id']);
-            }
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-        }
-        return true;
-    }
-
-    /**
-     * 受邀人活动校验
-     * @param int $userId
-     * @param $groupOrder
-     * @param int $spreadUserId
-     * @return bool|void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function guest(int $userId, $groupOrder, int $spreadUserId)
-    {
-        // 查询推荐人的消费金类型
-        $spreadActivityUser = (new StoreActivityUserDao())->default($spreadUserId);
-        $endTime = $this->getEndTime($spreadActivityUser['create_time'] ?? '2024-01-01 00:00:00');
-        $spreadConsumption = (new StoreConsumptionDao())->getOne($spreadActivityUser['value'] ?? 0);
-        // 查询推荐人满足条件的有效订单
-        $spreadGroupOrder = StoreActivityOrder::where('user_id', $spreadUserId)->where('status', StoreActivityOrder::STATUS_VALID)->find();
-        if (empty($spreadGroupOrder) || empty($spreadConsumption['config']) || empty($spreadActivityUser) || $endTime < time()) {
-            // 推荐人消费金数据为空 或 推荐人的有效订单为空 或推荐人已超过任务完成时间，作为发起人参加活动
-            return $this->promoter($userId, $groupOrder, 0);
-        }
-        // 订单有效金额为实付金额+红包金额
-        $orderValidAmount = bcadd($spreadGroupOrder['pay_price'], $spreadGroupOrder['red_pack'], 2);
-        $orderValidAmount = min($orderValidAmount, $this->maxAmount);
-        $spreadScope = $this->getScope($spreadConsumption, $orderValidAmount);
-        $spreadScope['start'] = $orderValidAmount;
-        if ($groupOrder['pay_price'] < $spreadScope['start']) {
-            // 当前用户的订单不在推荐人的档位区间，作为发起人参加活动
-            return $this->promoter($userId, $groupOrder, 0);
-        }
-        Db::startTrans();
-        try {
-            $isFirstOrder = $this->isFirstOrder($userId, $spreadConsumption['start_time'], date('Y-m-d H:i:s', $endTime));
-            $storeActivityOrderDao = new StoreActivityOrderDao();
-            $storeActivityOrder = $storeActivityOrderDao->save($groupOrder, $spreadUserId, $isFirstOrder);
-            if ($spreadConsumption['type'] == StoreConsumption::TYPE_PULL_CONSUMPTION && $isFirstOrder && $storeActivityOrder['status'] == StoreActivityOrder::STATUS_VALID) {
-                // 推荐人消费金类型为拉新且当前用户为首单
-                $spreadOrderIds = $this->isFinished($spreadUserId, $spreadScope);
-                if ($spreadOrderIds !== false) {
-                    $spreadOrderIds = "{$spreadGroupOrder['group_order_id']}," . $spreadOrderIds;
-                    // 使用了红包，订单有效金额需要乘以80%
-                    $orderValidAmount = $spreadGroupOrder['red_pack'] > 0 ? bcmul($orderValidAmount, 0.8, 2) : $orderValidAmount;
-                    $this->orderType = 1;
-                    $this->send($spreadConsumption, $spreadScope['rate'], $spreadUserId, $spreadOrderIds, $orderValidAmount);
-                    $storeActivityOrderDao->batchRepeal(explode(',', $spreadOrderIds));
-                }
-            }
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-        }
-    }
-
-    /**
-     * 获取消费档位区间
-     * @param $consumption
-     * @param float $amount
-     * @return array|mixed
-     */
-    public function getScope($consumption, float $amount)
-    {
-        $scope = [];
-        foreach ($consumption['config'] as $k => $item) {
-            if ($item['start'] <= $amount && $item['end'] >= $amount) {
-                $item['rate'] = bcdiv($item['rate'], 100, 2);
-                $item['rate_two'] = (isset($item['rate_two']) && $item['rate_two'] > 0) ? bcdiv($item['rate_two'], 100, 2) : 0;
-                $scope = $item;
-                break;
-            }
-        }
-        return $scope;
-    }
-
-    /**
-     * 判断用户是否满足条件
-     * @param int $userId
-     * @param array $scope
-     * @return false|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function isFinished(int $userId, array $scope)
-    {
-        $groupOrders = StoreActivityOrder::where('spread_id', $userId)
-            ->where('is_first_order', StoreActivityOrder::IS_FIRST_ORDER)
-            ->where('pay_price', '>=', $scope['start'])
-            ->where('status', StoreActivityOrder::STATUS_VALID)
-            ->field('group_order_id,user_id,pay_price')->select();
-        $userOrders = [];
-        foreach ($groupOrders as $groupOrder) {
-            if (!isset($userOrders[$groupOrder['user_id']])) {
-                $userOrders[$groupOrder['user_id']] = $groupOrder;
-            }
-        }
-        if (count($userOrders) < $scope['num']) {
-            return false;
-        }
-        return implode(',', array_column($userOrders, 'group_order_id'));
-    }
-
-    /**
-     * 发放消费金
-     * @param $consumption 消费金类型
-     * @param float $rate 红包发放比例
-     * @param int $userId 用户id
-     * @param string $groupOrderIds 订单id集合
-     * @param float $amount 订单金额
-     * @param float $status 红包领取状态
-     * @param int $type 红包类型
-     * @return void
-     * @throws \Exception
-     */
-    public function send($consumption, float $rate, int $userId, string $groupOrderIds, float $amount, $status = -2, $type = 1)
-    {
-        $title = $type == StoreConsumptionUser::TYPE_TWO ? '补贴' : '春耕采购余额';
-        $model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find();
-        $couponPrice = bcmul($amount, $rate, 2);
-        if (!empty($model) && $model['type'] == $type) {
-            if (!$this->onlyBill) {
-                $model->coupon_price = bcadd($model->coupon_price, $couponPrice, 2);
-                $model->balance = bcadd($model->balance, $couponPrice, 2);
-                if ($model->status != StoreConsumptionUser::STATUS_UNUSED) {
-                    $model->status = StoreConsumptionUser::STATUS_UNUSED;
-                }
-            }
-        } else {
-            $model = new StoreConsumptionUser();
-            $model->coupon_id = $consumption['coupon_id'];
-            $model->uid = $userId;
-            $model->coupon_title = $title;
-            $model->order_id_set = $groupOrderIds;
-            $model->coupon_price = $couponPrice;
-            $model->balance = $model->coupon_price;
-            $model->order_amount = $amount;
-            $model->create_time = date('Y-m-d H:i:s');
-            $model->start_time = $this->startTime ?: date('Y-m-d H:i:s', time() + 7 * 86400);
-            $model->end_time = $this->endTime ?: '2026-01-15 23:59:59';
-            $model->type = $type;
-            $model->status = $status;
-            if ($this->onlyBill === true) {
-                $model->status = StoreConsumptionUser::STATUS_REPEAL;
-            }
-        }
-        if (!$model->save()) {
-            throw new \Exception('发放失败');
-        }
-        // 写入红包日志
-        /** @var  $userBillRepository UserBillRepository */
-        $userBillRepository = app()->make(UserBillRepository::class);
-        $extra = ['order_amount' => $amount, 'coupon_user_id' => $model['coupon_user_id']];
-        if ($this->orderType == 2) {
-            $extra['order_id'] = $groupOrderIds;
-        } else {
-            $extra['group_order_id'] = $groupOrderIds;
-        }
-        if (!empty($this->billExtra)) {
-            $extra = array_merge($extra, $this->billExtra);
-        }
-        $userBillRepository->incBill($userId, 'red_pack', "red_pack_{$type}", [
-            'link_id' => $model['coupon_user_id'],
-            'status' => $status == -1 ?: 1,
-            'title' => '获得' . $title,
-            'number' => $couponPrice,
-            'mark' => '获得' . $title . $couponPrice . ",订单金额：{$amount}",
-            'extra' => json_encode($extra, JSON_UNESCAPED_UNICODE),
-            'balance' => 0
-        ]);
-    }
-
-    /**
-     * 判断是否是首单
-     * @param int $userId 用户id
-     * @param string $startTime 活动开始时间
-     * @param string $endTime 活动结束时间
-     * @return int
-     * @throws \think\db\exception\DbException
-     */
-    public function isFirstOrder(int $userId, string $startTime, string $endTime)
-    {
-        $isNewUser = User::where('uid', $userId)->whereBetweenTime('create_time', $startTime, $endTime)->count();
-        if ($isNewUser == 0) {
-            return 0;
-        }
-        $exceptGroupOrderIds = StoreOrder::where('uid', $userId)
-            ->where('source', 105)
-            ->group('group_order_id')
-            ->column('group_order_id');
-        $count = StoreGroupOrder::where('uid', $userId)
-            ->whereNotIn('group_order_id', $exceptGroupOrderIds)
-            ->where('paid', 1)
-            ->whereBetweenTime('pay_time', $startTime, $endTime)
-            ->count();
-        return intval($count <= 0);
-    }
-
-    public function getEndTime($datetime)
-    {
-        return strtotime('+1 year', strtotime($datetime));
-    }
-
-    /**
-     * 增加红包余额
-     * @param $id
-     * @param $amount
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function increase($id, $amount)
-    {
-        $storeConsumptionUser = StoreConsumptionUser::where('coupon_user_id', $id)->find();
-        if (empty($storeConsumptionUser)) {
-            throw new \Exception('红包记录不存在');
-        }
-        $storeConsumptionUser->balance = bcadd($storeConsumptionUser->balance, $amount, 2);
-        if (!$storeConsumptionUser->save()) {
-            throw new \Exception('红包余额更新出错');
-        }
-    }
-
-    /**
-     * 扣减红包余额
-     * @param $id
-     * @param $amount
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function reduce($id, $amount)
-    {
-        $storeConsumptionUser = StoreConsumptionUser::where('coupon_user_id', $id)->find();
-        if (empty($storeConsumptionUser) || $storeConsumptionUser->balance < $amount) {
-            throw new \Exception('红包余额不足');
-        }
-        $balance = bcsub($storeConsumptionUser->balance, $amount, 2);
-        $storeConsumptionUser->balance = $balance;
-        if ($balance <= 0 && $storeConsumptionUser->type == StoreConsumptionUser::TYPE_ONE) {
-            $storeConsumptionUser->status = StoreConsumptionUser::STATUS_USED;
-        }
-        if (!$storeConsumptionUser->save()) {
-            throw new \Exception('红包余额更新出错');
-        }
-    }
-
-    /**
-     * @deprecated 已废弃，用下面的 typeTwoByProduct 和 typeOneByProduct
-     * 根据订单商品计算实际金额和红包金额
-     * @return array
-     */
-    public function calculate()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $orderTotalPrice = $this->orderTotalPrice * 100;
-        $orderPayPrice = $this->orderPayPrice * 100;
-        $productPrice = $this->orderProductPrice * 100;
-        $realPriceTotal = $this->realPriceTotal * 100;
-        $consumptionAmount = 0;
-        if ($orderTotalPrice == $orderPayPrice) {
-            $realPrice = $productPrice;
-        } else {
-            $rate = bcdiv($productPrice, $orderTotalPrice, 5);
-            $realPrice = $this->isLast ? bcsub($orderPayPrice, $realPriceTotal, 2) : ceil(bcmul($orderPayPrice, $rate, 5));
-            $consumptionAmount = $productPrice - $realPrice;
-        }
-        $realPriceTotal += $realPrice;
-        $realPrice = bcdiv($realPrice, 100, 2);
-        $consumptionAmount = bcdiv($consumptionAmount, 100, 2);
-        $realPriceTotal = bcdiv($realPriceTotal, 100, 2);
-        /** $realPrice：实际支付的金额，$realPriceTotal：实际支付金额总计，$consumptionAmount：红包金额总计 */
-        return [$realPrice, $realPriceTotal, $consumptionAmount];
-    }
-
-    /**
-     * @deprecated 已废弃，用下面的 typeTwoByProduct 和 typeOneByProduct
-     * 根据订单计算实际金额和红包金额
-     * @return array
-     */
-    public function calculateByOrder()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $orderTotalPrice = $this->orderTotalPrice * 100;
-        $groupOrderTotalPrice = $this->groupOrderTotalPrice * 100;
-        $consumptionBalance = $this->consumptionTotalAmount * 100;
-        $rate = bcdiv($orderTotalPrice, $groupOrderTotalPrice, 5);
-        if ($consumptionBalance >= $groupOrderTotalPrice) {
-            $useAmount = $orderTotalPrice;
-        } else {
-            $useAmount = $this->isLast ? $consumptionBalance : ceil(bcmul($consumptionBalance, $rate, 5));
-        }
-        $consumptionBalance -= $useAmount;
-        $payPrice = $orderTotalPrice - $useAmount;
-        $groupOrderTotalPrice -= $useAmount;
-
-        $payPrice = bcdiv($payPrice, 100, 2);
-        $useAmount = bcdiv($useAmount, 100, 2);
-        $consumptionBalance = bcdiv($consumptionBalance, 100, 2);
-        $groupOrderTotalPrice = bcdiv($groupOrderTotalPrice, 100, 2);
-        /** $payPrice：实际支付的金额，$groupOrderTotalPrice：实际支付金额总计，$useAmount：红包金额总计，$consumptionAmount：红包余额总计 */
-        return [$payPrice, $groupOrderTotalPrice, $useAmount, $consumptionBalance];
-    }
-
-    /**
-     * 通过订单id退用户红包
-     * @param $refundOrder
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function refundByOrder($refundOrder)
-    {
-        $order = StoreOrder::where('order_id', $refundOrder['order_id'])->find();
-        $model = StoreConsumptionUser::where('uid', $refundOrder['uid'])->where('coupon_user_id', $order['consumption_id'])->find();
-        if (empty($model) || $order['source'] == 105) {
-            return;
-        }
-        $model->balance = bcadd($model->balance, $refundOrder['refund_consumption'], 2);
-        $model->status = StoreConsumptionUser::STATUS_UNUSED;
-        if (!$model->save()) {
-            throw new ValidateException('红包退还失败');
-        }
-        // 写入红包日志
-        /** @var  $userBillRepository UserBillRepository */
-        $userBillRepository = app()->make(UserBillRepository::class);
-        $title = $model['type'] == StoreConsumptionUser::TYPE_TWO ? '现金抵扣补贴' : '无门槛实物通用补贴';
-        $userBillRepository->incBill($refundOrder['uid'], 'red_pack', "red_pack_{$model['type']}", [
-            'link_id' => $refundOrder['order_id'],
-            'status' => 1,
-            'title' => '订单退款，获得' . $title,
-            'number' => $refundOrder['refund_consumption'],
-            'mark' => '订单退款，获得' . $title . $refundOrder['refund_consumption'] . ",退款订单ID：{$refundOrder['order_id']}",
-            'balance' => 0
-        ]);
-        $financeDao = new FinancialDao();
-        $financeDao->user = $order->user;
-        $financeDao->order = $order;
-        $financeDao->platformIn($refundOrder['refund_consumption'], 'platform_consumption_refund');
-        $financeDao->save();
-    }
-
-    /**
-     * 订单退款，服务团队退红包
-     * @param $userId
-     * @param $orderId
-     * @param $amount
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function refundByCommission($userId, $orderId, $amount)
-    {
-        $model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find();
-        if (empty($model)) {
-            return;
-        }
-        $model->balance = bcsub($model->balance, $amount, 2);
-        if (!$model->save()) {
-            throw new ValidateException('红包退还失败');
-        }
-        // 写入红包日志
-        /** @var  $userBillRepository UserBillRepository */
-        $userBillRepository = app()->make(UserBillRepository::class);
-        $userBillRepository->decBill($userId, 'consumption_refund', 'deduction', [
-            'link_id' => $orderId,
-            'status' => 1,
-            'title' => '订单退款，退现金抵扣红包',
-            'number' => $amount,
-            'mark' => '订单退款，退现金抵扣红包' . floatval($amount) . '元',
-            'balance' => 0
-        ]);
-    }
-
-    /**
-     * 红包类型为 现金抵扣红包
-     * 根据商品毛利率计算红包金额
-     * @return array
-     */
-    public function typeTwoByProduct()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $totalPrice = $this->orderProductPrice * 100;
-        $consumptionUsed = $this->consumptionUsed * 100;
-        $consumptionTotal = $this->consumptionTotalAmount * 100;
-        $consumptionBalance = $consumptionTotal - $consumptionUsed;
-        if ($consumptionBalance <= 0) {
-            return [$this->orderProductPrice, '0.00', $this->consumptionUsed];
-        }
-        $rate = $this->getRate($this->profitRate);
-        $useAmount = bcmul($totalPrice, $rate, 2);
-        if ($useAmount >= $consumptionBalance) {
-            $useAmount = $consumptionBalance;
-        }
-        $payPrice = $totalPrice - $useAmount;
-        $consumptionUsed += $useAmount;
-        $payPrice = bcdiv($payPrice, 100, 2);
-        $useAmount = bcdiv($useAmount, 100, 2);
-        $consumptionUsed = bcdiv($consumptionUsed, 100, 2);
-        /** $payPrice：实际支付的金额，$useAmount：当前商品使用的红包金额，$consumptionUsed：使用的红包金额总计 */
-        return [$payPrice, $useAmount, $consumptionUsed];
-    }
-
-    /**
-     * 红包类型为 无门槛红包
-     * 根据商品毛利率计算红包金额
-     * @return array
-     */
-    public function typeOneByProduct()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $totalPrice = $this->orderProductPrice * 100;
-        $consumptionUsed = $this->consumptionUsed * 100;
-        $consumptionTotal = $this->consumptionTotalAmount * 100;
-        $groupOrderTotalPrice = $this->groupOrderTotalPrice * 100;
-        $rate = bcdiv($totalPrice, $groupOrderTotalPrice, 5);
-        if ($consumptionTotal >= $groupOrderTotalPrice) {
-            $useAmount = $totalPrice;
-        } else {
-            $useAmount = $this->isLast ? $consumptionTotal - $consumptionUsed : round(bcmul($consumptionTotal, $rate, 1));
-        }
-        $payPrice = $totalPrice - $useAmount;
-        $consumptionUsed += $useAmount;
-        $payPrice = bcdiv($payPrice, 100, 2);
-        $useAmount = bcdiv($useAmount, 100, 2);
-        $consumptionUsed = bcdiv($consumptionUsed, 100, 2);
-        /** $payPrice：实际支付的金额，$useAmount：当前商品使用的红包金额，$consumptionUsed：使用的红包金额总计 */
-        return [$payPrice, $useAmount, $consumptionUsed];
-    }
-
-    /**
-     * 根据商品毛利率计算红包抵扣比例
-     * @param float $profitRate 毛利率
-     * @return float|int
-     */
-    public function getRate($profitRate)
-    {
-        $rateArray = [
-            '0.25' => 0.4,
-            '0.2' => 0.3,
-            '0.15' => 0.2,
-            '0.1' => 0.1,
-        ];
-        $rate = 0;
-        foreach ($rateArray as $k => $item) {
-            if ($profitRate >= $k) {
-                $rate = $item;
-                break;
-            }
-        }
-        return $rate;
-    }
-
-}

app/common/dao/store/order/StoreCartDao.php

@@ -29,10 +29,6 @@ class StoreCartDao extends BaseDao
 
     const SOURCE_STORE_CLOUD = 101; //店铺内云商品
     const SOURCE_CLOUD = 102; //云仓内店铺商品
-    const CITY_CLOUD = 103; //市级云仓商品
-    const SOURCE_PROCURE  = 13; //供应链采购商品B2B
-    const SOURCE_COMMUNITY_RESALE  = 201; //转售商品
-    const SOURCE_COMMUNITY_ENTRUST = 202; //委托商品
 
     protected function getModel(): string
     {
@@ -69,24 +65,21 @@ class StoreCartDao extends BaseDao
      * @param int $uid
      * @return mixed
      */
-    public function getAll(int $uid,$product_type,$source=0)
+    public function getAll(int $uid,$product_type)
     {
-        $where=['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0,'product_type' => $product_type,'source'=>$source];
-        if($source==103){
-            $where=['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0,'source'=>$source];
-        }
-        $query = ($this->getModel())::where($where)
+        $query = ($this->getModel())::where(['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0,'product_type' => $product_type])
             ->with([
                 'product' => function ($query) {
                     $query->field('product_id,image,store_name,is_show,status,is_del,unit_name,price,mer_status,is_used,product_type,once_max_count,once_min_count,pay_limit,mer_svip_status,svip_price_type');
                 },
                 'productAttr' => function ($query) {
-                    $query->field('product_id,stock,price,unique,sku,image,svip_price,procure_price');
+                    $query->field('product_id,stock,price,unique,sku,image,svip_price');
                 },
                 'merchant' => function ($query) {
-                    $query->field('mer_id,mer_name,mer_state,mer_avatar,is_trader,type_id,credit_buy,street_id')->with(['type_names']);
+                    $query->field('mer_id,mer_name,mer_state,mer_avatar,is_trader,type_id')->with(['type_name']);
                 }
             ])->select();
+
         return $query;
     }
 
@@ -117,22 +110,19 @@ class StoreCartDao extends BaseDao
                 }
             },
             'productAttr' => function (Relation $query) {
-                $query->field('image,extension_one,extension_two,product_id,stock,price,unique,sku,volume,weight,ot_price,cost,svip_price,procure_price')
+                $query->field('image,extension_one,extension_two,product_id,stock,price,unique,sku,volume,weight,ot_price,cost,svip_price')
                     ->append(['bc_extension_one', 'bc_extension_two']);
             },
             'merchant' => function (Relation $query) use ($uid) {
-                $query->field('mer_id,mer_name,mer_state,mer_avatar,delivery_way,commission_rate,category_id,credit_buy,settle_cycle,interest_rate,type_id,street_id')
-                    ->with([
-                    'coupon' => function ($query) use ($uid) {
-                        $query->where('uid', $uid);
-                    },
-                    'config' => function ($query) {
-                        $query->whereIn('config_key', ['mer_integral_status', 'mer_integral_rate', 'mer_store_stock', 'mer_take_status', 'mer_take_name', 'mer_take_phone', 'mer_take_address', 'mer_take_location', 'mer_take_day', 'mer_take_time']);
-                    },
-                    'merchantCategory'
-                    ]);
-        }])
-        ->whereIn('cart_id', $ids)->order('product_type DESC,cart_id DESC')->select();
+                $query->field('mer_id,mer_name,mer_state,mer_avatar,delivery_way,commission_rate,category_id')->with(['coupon' => function ($query) use ($uid) {
+                    $query->where('uid', $uid);
+                },
+            'config' => function ($query) {
+                $query->whereIn('config_key', ['mer_integral_status', 'mer_integral_rate', 'mer_store_stock', 'mer_take_status', 'mer_take_name', 'mer_take_phone', 'mer_take_address', 'mer_take_location', 'mer_take_day', 'mer_take_time']);
+            },
+            'merchantCategory'
+            ]);
+        }])->whereIn('cart_id', $ids)->order('product_type DESC,cart_id DESC')->select();
     }
 
     /**
@@ -150,14 +140,10 @@ class StoreCartDao extends BaseDao
      * @return mixed
      * @author Qinii
      */
-    public function getCartCount(int $uid,$product_type,$source=0)
+    public function getCartCount(int $uid,$product_type)
     {
-        $where=['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0,'product_type' => $product_type,'is_fail'=>0,'source'=>$source];
-        if($source==103){
-            $where=['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0,'is_fail'=>0,'source'=>$source];
-        }
-        $count = ($this->getModel()::getDB())->where($where)->count();
-        $data[0]['count'] = $count;
+        $data = ($this->getModel()::getDB())->where(['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0,'product_type' => $product_type])->field('count(*) as count')->select();
+        $data[0]['count'] = $data[0]['count'] ? $data[0]['count'] : 0;
         return $data;
     }
 

app/common/dao/store/order/StoreCartDao.php.bak

@@ -0,0 +1,160 @@
+<?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\common\dao\store\order;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\store\order\StoreCart;
+use app\common\model\user\UserAddress;
+use think\Collection;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\model\Relation;
+
+class StoreCartDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return StoreCart::class;
+    }
+
+    public function test()
+    {
+        return StoreCart::getDB()->with(['product' => function (Relation $query) {
+            $query->where('store_name', '儿童节礼物');
+        }])->select();
+    }
+
+    /**
+     * @param array $ids
+     * @param $uid
+     * @param int|null $merId
+     * @return array
+     * @author xaboy
+     * @day 2020/6/5
+     */
+    public function validIntersection(array $ids, $uid, int $merId = null): array
+    {
+        return StoreCart::getDB()->whereIn('cart_id', $ids)
+            ->when($merId, function ($query, $merId) {
+                $query->where('mer_id', $merId);
+            })
+            ->where('is_del', 0)->where('is_fail', 0)->where('is_pay', 0)->where('uid', $uid)->column('cart_id');
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/6/1
+     * @param int $uid
+     * @return mixed
+     */
+    public function getAll(int $uid)
+    {
+        $query = ($this->getModel())::where(['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0])
+            ->with([
+                'product' => function ($query) {
+                    $query->field('product_id,image,store_name,is_show,status,is_del,unit_name,price,mer_status,is_used,product_type,once_max_count,once_min_count,pay_limit,mer_svip_status,svip_price_type');
+                },
+                'productAttr' => function ($query) {
+                    $query->field('product_id,stock,price,unique,sku,image,svip_price');
+                },
+                'merchant' => function ($query) {
+                    $query->field('mer_id,mer_name,mer_state,mer_avatar,is_trader,type_id')->with(['type_name']);
+                }
+            ])->select();
+
+        return $query;
+    }
+
+    public function cartIbByData(array $ids, int $uid, ?UserAddress $address)
+    {
+        return StoreCart::getDb()->where('uid', $uid)->with([
+            'product' => function (Relation $query) use ($address) {
+                $query->field('product_id,cate_id,image,store_name,is_show,status,is_del,unit_name,price,mer_status,temp_id,give_coupon_ids,is_gift_bag,is_used,product_type,old_product_id,integral_rate,delivery_way,delivery_free,type,extend,pay_limit,once_max_count,once_min_count,mer_svip_status,svip_price_type');
+                if ($address) {
+                    $cityIds = array_filter([$address->province_id, $address->city_id, $address->district_id, $address->street_id]);
+                    $query->with(['temp' => ['region' => function (Relation $query) use ($cityIds) {
+                        $query->where(function ($query) use ($cityIds) {
+                            foreach ($cityIds as $v) {
+                                $query->whereOr('city_id', 'like', "%/{$v}/%");
+                            }
+                            $query->whereOr('city_id', '0');
+                        })->order('shipping_template_region_id DESC')->withLimit(1);
+                    }, 'undelives' => function ($query) use ($cityIds) {
+                        foreach ($cityIds as $v) {
+                            $query->whereOr('city_id', 'like', "%/{$v}/%");
+                        }
+                    }, 'free' => function (Relation $query) use ($cityIds) {
+                        foreach ($cityIds as $v) {
+                            $query->whereOr('city_id', 'like', "%/{$v}/%");
+                        }
+                        $query->order('shipping_template_free_id DESC')->withLimit(1);
+                    }]]);
+                }
+            },
+            'productAttr' => function (Relation $query) {
+                $query->field('image,extension_one,extension_two,product_id,stock,price,unique,sku,volume,weight,ot_price,cost,svip_price')
+                    ->append(['bc_extension_one', 'bc_extension_two']);
+            },
+            'merchant' => function (Relation $query) use ($uid) {
+                $query->field('mer_id,mer_name,mer_state,mer_avatar,delivery_way,commission_rate,category_id')->with(['coupon' => function ($query) use ($uid) {
+                    $query->where('uid', $uid);
+                },
+            'config' => function ($query) {
+                $query->whereIn('config_key', ['mer_integral_status', 'mer_integral_rate', 'mer_store_stock', 'mer_take_status', 'mer_take_name', 'mer_take_phone', 'mer_take_address', 'mer_take_location', 'mer_take_day', 'mer_take_time']);
+            },
+            'merchantCategory'
+            ]);
+        }])->whereIn('cart_id', $ids)->order('product_type DESC,cart_id DESC')->select();
+    }
+
+    /**
+     * @param array $cartIds
+     * @param int $uid
+     * @author Qinii
+     */
+    public function batchDelete(array $cartIds, int $uid)
+    {
+        return ($this->getModel()::getDB())->where('uid', $uid)->whereIn('cart_id', $cartIds)->delete();
+    }
+
+    /**
+     * @param int $uid
+     * @return mixed
+     * @author Qinii
+     */
+    public function getCartCount(int $uid)
+    {
+        $data = ($this->getModel()::getDB())->where(['uid' => $uid, 'is_del' => 0, 'is_new' => 0, 'is_pay' => 0])->field('SUM(cart_num) as count')->select();
+        $data[0]['count'] = $data[0]['count'] ? $data[0]['count'] : 0;
+        return $data;
+    }
+
+    /**
+     * @param $source
+     * @param array|null $ids
+     * @author xaboy
+     * @day 2020/8/31
+     */
+    public function getSourcePayInfo($source, ?array $ids = null)
+    {
+        return StoreCart::getDB()->alias('A')->where('A.source', $source)->where('A.is_pay', 1)->when($ids, function ($query, $ids) {
+            $query->whereIn('A.source_id', $ids);
+        })->leftJoin('StoreOrderProduct B', 'A.cart_id = B.cart_id')
+            ->field('sum(B.product_num) as pay_num,sum(B.product_price) as pay_price,A.source_id')->group('A.source_id')->select();
+    }
+}

app/common/dao/store/order/StoreGroupOrderDao.php

@@ -16,7 +16,6 @@ namespace app\common\dao\store\order;
 
 use app\common\dao\BaseDao;
 use app\common\model\store\order\StoreGroupOrder;
-use app\common\model\store\order\StoreOrder;
 
 /**
  * Class StoreGroupOrderDao
@@ -43,12 +42,11 @@ class StoreGroupOrderDao extends BaseDao
      * @author xaboy
      * @day 2020/6/11
      */
-    public function orderNumber($uid = null, $productType = 0)
+    public function orderNumber($uid = null)
     {
-        $storeOrderWhere = StoreOrder::where('activity_type', $productType);
-        return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)->when($uid, function ($query, $uid) {
-            $query->where('StoreGroupOrder.uid', $uid);
-        })->where('StoreGroupOrder.is_del', 0)->whereRaw("(StoreGroupOrder.paid=0 and status!=12) or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)")->count();
+        return StoreGroupOrder::when($uid, function ($query, $uid) {
+            $query->where('uid', $uid);
+        })->where('is_del', 0)->where('paid', 0)->count();
     }
 
     /**
@@ -59,18 +57,14 @@ class StoreGroupOrderDao extends BaseDao
      */
     public function search(array $where)
     {
-        return StoreGroupOrder::getDB()->alias('StoreGroupOrder')->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
-            if ($where['paid'] == 0) {
-                $query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)");
-            } else {
-                $query->where('StoreGroupOrder.paid', $where['paid']);
-            }
+        return StoreGroupOrder::getDB()->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
+            $query->where('paid', $where['paid']);
         })->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
-            $query->where('StoreGroupOrder.uid', $where['uid']);
+            $query->where('uid', $where['uid']);
         })->order('create_time DESC')->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
-            $query->where('StoreGroupOrder.is_del', $where['is_del']);
+            $query->where('is_del', $where['is_del']);
         }, function ($query) {
-            $query->where('StoreGroupOrder.is_del', 0);
+            $query->where('is_del', 0);
         });
     }
 

app/common/dao/store/order/StoreGroupOrderOtherDao.php

@@ -1,101 +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\common\dao\store\order;
-
-
-use app\common\dao\BaseDao;
-use app\common\model\store\order\StoreGroupOrderOther;
-use app\common\model\store\order\StoreOrderOther;
-
-/**
- * Class StoreGroupOrderOtherDao
- * @package app\common\dao\store\order
- * @author xaboy
- * @day 2020/6/9
- */
-class StoreGroupOrderOtherDao extends BaseDao
-{
-
-    /**
-     * @return string
-     * @author xaboy
-     * @day 2020/6/9
-     */
-    protected function getModel(): string
-    {
-        return StoreGroupOrderOther::class;
-    }
-
-    /**
-     * @param null $uid
-     * @return int
-     * @author xaboy
-     * @day 2020/6/11
-     */
-    public function orderNumber($uid = null, $productType = 0)
-    {
-        $storeOrderWhere = StoreOrderOther::where('activity_type', $productType);
-        return StoreGroupOrderOther::hasWhere('orderList', $storeOrderWhere)->when($uid, function ($query, $uid) {
-            $query->where('StoreGroupOrder.uid', $uid);
-        })->where('StoreGroupOrder.is_del', 0)->whereRaw("(StoreGroupOrder.paid=0 and status!=12) or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)")->count();
-    }
-
-    /**
-     * @param array $where
-     * @return \think\db\BaseQuery
-     * @author xaboy
-     * @day 2020/6/9
-     */
-    public function search(array $where)
-    {
-        return StoreGroupOrderOther::getDB()->alias('StoreGroupOrder')->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
-            if ($where['paid'] == 0) {
-                $query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)");
-            } else {
-                $query->where('StoreGroupOrder.paid', $where['paid']);
-            }
-        })->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
-            $query->where('StoreGroupOrder.uid', $where['uid']);
-        })->order('create_time DESC')->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
-            $query->where('StoreGroupOrder.is_del', $where['is_del']);
-        }, function ($query) {
-            $query->where('StoreGroupOrder.is_del', 0);
-        });
-    }
-
-    /**
-     * @param $time
-     * @param bool $is_remind
-     * @return array
-     * @author xaboy
-     * @day 2020/6/9
-     */
-    public function getTimeOutIds($time, $is_remind = false)
-    {
-        return StoreGroupOrderOther::getDB()->where('is_del', 0)->where('paid', 0)
-            ->when($is_remind, function ($query) {
-                $query->where('is_remind', 0);
-            })->where('create_time', '<=', $time)->column('group_order_id');
-    }
-
-    public function isRemind($id)
-    {
-        return StoreGroupOrderOther::getDB()->where('group_order_id', $id)->update(['is_remind' => 1]);
-    }
-
-    public function totalNowMoney($uid)
-    {
-        return StoreGroupOrderOther::getDB()->where('pay_type', 0)->where('uid', $uid)->sum('pay_price') ?: 0;
-    }
-}

app/common/dao/store/order/StoreOrderDao.php

@@ -15,7 +15,6 @@ namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
-use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreOrderProduct;
 use app\common\model\store\order\StoreOrderStatus;
@@ -72,33 +71,18 @@ class StoreOrderDao extends BaseDao
             if (isset($where['is_trader']) && $where['is_trader'] !== '') {
                 $query->where('is_trader', $where['is_trader']);
             }
-            $query->where('is_del', 0);
+            $query->where('is_del',0);
         });
-        if (isset($where['source']) && ($where['source'] == 103||$where['source'] == 105)) {
-            $wheres['activity_type'] = [0, 2, 98];
-            $wheres['source'] = [0,2,103,105,999];
-            $query->where($wheres);
-            unset($where['source']);
-        } elseif (isset($where['source']) && ($where['source'] == 11 || $where['source'] == 12)) {
-            $wheres['activity_type'] = 98;
-            $wheres['source'] = [$where['source'], 999];
-            $query->where($wheres);
-            unset($where['source']);
-        } else {
-            if(isset($where['product_type']) && $where['product_type'] !== ''){
-                $where['product_type'] = [$where['product_type'], 2];
-                $query->whereIn('activity_type', $where['product_type']);
-            }
-        }
+
         $query->when(($sysDel !== null), function ($query) use ($sysDel) {
             $query->where('is_system_del', $sysDel);
         })
             ->when(isset($where['order_type']) && $where['order_type'] >= 0 && $where['order_type'] !== '', function ($query) use ($where) {
                 if ($where['order_type'] == 2) {
                     $query->where('is_virtual', 1);
-                } else if ($where['order_type'] == 0) { //实体发货订单
-                    $query->where('order_type', 0)->where('is_virtual', 0);
-                } else if ($where['order_type'] == 3) { //发货订单
+                } else if($where['order_type'] == 0){ //实体发货订单
+                    $query->where('order_type', 0)->where('is_virtual',0);
+                } else if($where['order_type'] == 3) { //发货订单
                     $query->where('order_type', 0);
                 } else {
                     $query->where('order_type', $where['order_type']);
@@ -108,22 +92,15 @@ class StoreOrderDao extends BaseDao
                 $query->where('activity_type', $where['activity_type']);
             })
             ->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
-                // 12表示信用购 先货后款
                 switch ($where['status']) {
-                    case 0:
-                        $query->whereIn('StoreOrder.status', [0, 9, 12]);
+                    case 0 :
+                        $query->whereIn('StoreOrder.status', [0, 9]);
                         break;
-                    case -2:
-                        $query->where('StoreOrder.paid', 1)->whereNotIn('StoreOrder.status', [10, 11]);
+                    case -2 :
+                        $query->where('paid', 1)->whereNotIn('StoreOrder.status', [10, 11]);
                         break;
-                    case 10:
-                        $query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [10, 11]);
-                        break;
-                    case 2:
-                        $query->where('StoreOrder.paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
-                        break;
-                    case 20:
-                        $query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [2, 3]);
+                    case 10 :
+                        $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
                         break;
                     default:
                         $query->where('StoreOrder.status', $where['status']);
@@ -133,16 +110,16 @@ class StoreOrderDao extends BaseDao
             ->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
                 $query->where('StoreOrder.uid', $where['uid']);
             })
-            ->when(isset($where['is_user']) && $where['is_user'] !== 0, function ($query) use ($where) {
-                $query->where(function ($query) {
-                    $query->where('order_type', 0)->whereOr(function ($query) {
-                        $query->where('order_type', 1)->where('main_id', 0);
+            ->when(isset($where['is_user']) && $where['is_user'] !== '', function ($query) use ($where) {
+                $query->where(function($query) {
+                    $query->where('order_type',0)->whereOr(function($query){
+                        $query->where('order_type',1)->where('main_id',0);
                     });
                 });
             })
             //待核销订单
             ->when(isset($where['is_verify']) && $where['is_verify'], function ($query) use ($where) {
-                $query->where('StoreOrder.order_type', 1)->where('StoreOrder.status', 0);
+                $query->where('StoreOrder.order_type', 1)->where('StoreOrder.status',0);
             })
             ->when(isset($where['pay_type']) && $where['pay_type'] !== '', function ($query) use ($where) {
                 $query->where('StoreOrder.pay_type', $where['pay_type']);
@@ -150,15 +127,8 @@ class StoreOrderDao extends BaseDao
             ->when(isset($where['order_ids']) && $where['order_ids'] !== '', function ($query) use ($where) {
                 $query->whereIn('order_id', $where['order_ids']);
             })
-            ->when(isset($where['source']) && $where['source'] !== '', function ($query) use ($where) {
-                $query->whereIn('source', $where['source']);
-            })
             ->when(isset($where['order_id']) && $where['order_id'] !== '', function ($query) use ($where) {
-                if (is_array($where['order_id'])) {
-                    $query->whereIn('order_id', $where['order_id']);
-                } else {
-                    $query->where('order_id', $where['order_id']);
-                }
+                $query->where('order_id', $where['order_id']);
             })
             ->when(isset($where['take_order']) && $where['take_order'] != '', function ($query) use ($where) {
                 $query->where('order_type', 1)->whereNotNull('verify_time');
@@ -169,9 +139,6 @@ class StoreOrderDao extends BaseDao
             ->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
                 getModelTime($query, $where['date'], 'StoreOrder.create_time');
             })
-            ->when(isset($where['pay_time']) && $where['pay_time'] !== '', function ($query) use ($where) {
-                getModelTime($query, $where['pay_time'], 'StoreOrder.pay_time');
-            })
             ->when(isset($where['verify_date']) && $where['verify_date'] !== '', function ($query) use ($where) {
                 getModelTime($query, $where['verify_date'], 'verify_time');
             })
@@ -188,40 +155,37 @@ class StoreOrderDao extends BaseDao
                 $query->where('service_id', $where['service_id']);
             })
             ->when(isset($where['username']) && $where['username'] !== '', function ($query) use ($where) {
-                $query->join('User U', 'StoreOrder.uid = U.uid')
-                    ->where(function ($query) use ($where) {
-                        $query->where('nickname', 'like', "%{$where['username']}%")
-                            ->whereOr('phone', 'like', "%{$where['username']}%")
-                            ->whereOr('user_phone', 'like', "%{$where['username']}%");
+                $query->join('User U','StoreOrder.uid = U.uid')
+                    ->where(function($query) use($where) {
+                       $query->where('nickname', 'like', "%{$where['username']}%")
+                           ->whereOr('phone', 'like', "%{$where['username']}%")
+                           ->whereOr('user_phone', 'like', "%{$where['username']}%");
                     });
             })
             ->when(isset($where['store_name']) && $where['store_name'] !== '', function ($query) use ($where) {
                 $orderId = StoreOrderProduct::alias('op')
-                    ->join('storeProduct sp', 'op.product_id = sp.product_id')
-                    ->whereLike('store_name', "%{$where['store_name']}%")
-                    ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''), function ($query) use ($where) {
-                        $query->where('mer_id', $where['mer_id']);
+                    ->join('storeProduct sp','op.product_id = sp.product_id')
+                    ->whereLike('store_name',"%{$where['store_name']}%")
+                    ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''),function($query) use($where){
+                        $query->where('mer_id',$where['mer_id']);
                     })->column('order_id');
-                $query->whereIn('order_id', $orderId ?: '');
+                $query->whereIn('order_id',$orderId ?: '' );
             })
             ->when(isset($where['search']) && $where['search'] !== '', function ($query) use ($where) {
                 $orderId = StoreOrderProduct::alias('op')
-                    ->join('storeProduct sp', 'op.product_id = sp.product_id')
-                    ->whereLike('store_name', "%{$where['search']}%")
-                    ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''), function ($query) use ($where) {
-                        $query->where('mer_id', $where['mer_id']);
+                    ->join('storeProduct sp','op.product_id = sp.product_id')
+                    ->whereLike('store_name',"%{$where['search']}%")
+                    ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''),function($query) use($where){
+                        $query->where('mer_id',$where['mer_id']);
                     })->column('order_id');
-                $query->where(function ($query) use ($orderId, $where) {
-                    $query->whereIn('order_id', $orderId ? $orderId : '')
-                        ->whereOr('order_sn', 'like', "%{$where['search']}%")
-                        ->whereOr('user_phone', 'like', "%{$where['search']}%");
+                $query->where(function($query) use($orderId,$where){
+                    $query->whereIn('order_id',$orderId ? $orderId : '')
+                        ->whereOr('order_sn','like',"%{$where['search']}%")
+                        ->whereOr('user_phone','like',"%{$where['search']}%");
                 });
             })
-            ->when(isset($where['order_search']) && $where['order_search'] !== '', function ($query) use ($where) {
-                $query->where('order_sn', 'like', '%' . $where['order_search'] . '%')->whereOr('user_phone', $where['order_search']);
-            })
             ->when(isset($where['group_order_sn']) && $where['group_order_sn'] !== '', function ($query) use ($where) {
-                $query->join('StoreGroupOrder GO', 'StoreOrder.group_order_id = GO.group_order_id')->where('group_order_sn', $where['group_order_sn']);
+                $query->join('StoreGroupOrder GO','StoreOrder.group_order_id = GO.group_order_id')->where('group_order_sn',$where['group_order_sn']);
             })
             ->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) {
                 $query->where(function ($query) use ($where) {
@@ -235,6 +199,7 @@ class StoreOrderDao extends BaseDao
                     $query->where('reconciliation_id', 0);
                 });
             })->order('StoreOrder.create_time DESC');
+
         return $query;
     }
 
@@ -287,8 +252,8 @@ class StoreOrderDao extends BaseDao
     public function fieldExists($field, $value, ?int $except = null): bool
     {
         return ($this->getModel()::getDB())->when($except, function ($query) use ($field, $except) {
-            $query->where($field, '<>', $except);
-        })->where($field, $value)->count() > 0;
+                $query->where($field, '<>', $except);
+            })->where($field, $value)->count() > 0;
     }
 
     /**
@@ -377,15 +342,15 @@ class StoreOrderDao extends BaseDao
         })->when($date, function ($query, $date) use ($paid) {
             if (!$paid) {
                 getModelTime($query, $date);
-                //                $query->where(function ($query) use ($date) {
-                //                    $query->where(function ($query) use ($date) {
-                //                        $query->where('paid', 1);
-                //                        getModelTime($query, $date, 'pay_time');
-                //                    })->whereOr(function ($query) use ($date) {
-                //                        $query->where('paid', 0);
-                //                        getModelTime($query, $date);
-                //                    });
-                //                });
+//                $query->where(function ($query) use ($date) {
+//                    $query->where(function ($query) use ($date) {
+//                        $query->where('paid', 1);
+//                        getModelTime($query, $date, 'pay_time');
+//                    })->whereOr(function ($query) use ($date) {
+//                        $query->where('paid', 0);
+//                        getModelTime($query, $date);
+//                    });
+//                });
             } else
                 getModelTime($query, $date, 'pay_time');
         })->group('uid')->count();
@@ -441,7 +406,7 @@ class StoreOrderDao extends BaseDao
     public function orderGroupNum($date, $merId = null)
     {
         $field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`');
-        if ($date == 'year') {
+        if ($date == 'year'){
             $field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m\') as `day`');
         }
         $query = StoreOrder::getDB()->field($field)
@@ -457,19 +422,10 @@ class StoreOrderDao extends BaseDao
     {
         return StoreOrder::getDB()->when(isset($where['dateRange']), function ($query) use ($where) {
             getModelTime($query, date('Y/m/d 00:00:00', $where['dateRange']['start']) . '-' . date('Y/m/d 00:00:00', $where['dateRange']['stop']), 'pay_time');
-        })->field(
-            Db::raw('status,sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`')
-        )
+        })->field(Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`'))
             ->where('paid', 1)->when($merId, function ($query, $merId) {
                 $query->where('mer_id', $merId);
-            })->order('pay_time DESC')->page($page, $limit)->group('day')->select()->each(function ($item) use ($merId) {
-                $pay_time = explode(' ', $item['pay_time']);
-                $item->settlement_price = Db::name('store_order')
-                    ->whereIn('status', [2, 3])
-                    ->where('mer_id', $merId)
-                    ->whereDay('pay_time', $pay_time[0])
-                    ->sum('pay_price');
-            });
+            })->order('pay_time DESC')->page($page, $limit)->group('day')->select();
     }
 
     public function dayOrderPriceGroup($date, $merId = null)
@@ -547,7 +503,7 @@ class StoreOrderDao extends BaseDao
     {
         return StoreOrderStatus::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id')
             ->where('A.change_type', 'take')
-            ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2)->where('B.pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY)
+            ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2)
             ->column('A.order_id');
     }
 
@@ -560,20 +516,20 @@ class StoreOrderDao extends BaseDao
      * @author Qinii
      * @day 2020-11-11
      */
-    public function getTattendCount(array $data, ?int $uid)
+    public function getTattendCount(array $data,?int $uid)
     {
-        $query = StoreOrder::hasWhere('orderProduct', function ($query) use ($data, $uid) {
-            $query->when(isset($data['activity_id']), function ($query) use ($data) {
-                $query->where('activity_id', $data['activity_id']);
-            })
-                ->when(isset($data['product_sku']), function ($query) use ($data) {
-                    $query->where('product_sku', $data['product_sku']);
+        $query = StoreOrder::hasWhere('orderProduct',function($query)use($data,$uid){
+            $query->when(isset($data['activity_id']),function ($query)use($data){
+                    $query->where('activity_id',$data['activity_id']);
                 })
-                ->when(isset($data['product_id']), function ($query) use ($data) {
-                    $query->where('product_id', $data['product_id']);
+                ->when(isset($data['product_sku']),function ($query)use($data){
+                    $query->where('product_sku',$data['product_sku']);
                 })
-                ->when(isset($data['exsits_id']), function ($query) use ($data) {
-                    switch ($data['product_type']) {
+                ->when(isset($data['product_id']),function ($query)use($data){
+                    $query->where('product_id',$data['product_id']);
+                })
+                ->when(isset($data['exsits_id']),function ($query)use ($data){
+                    switch ($data['product_type']){
                         case 3:
                             $make = app()->make(ProductAssistSetRepository::class);
                             $id = 'product_assist_id';
@@ -585,33 +541,34 @@ class StoreOrderDao extends BaseDao
                     }
                     $where = [$id => $data['exsits_id']];
                     $activity_id = $make->getSearch($where)->column($make->getPk());
-                    if ($activity_id) {
+                    if($activity_id) {
                         $id = array_unique($activity_id);
-                        $query->where('activity_id', 'in', $id);
-                    } else {
-                        $query->where('activity_id', '<', 0);
+                        $query->where('activity_id','in',$id);
+                    }else{
+                        $query->where('activity_id','<',0);
                     }
                 })
-                ->where('product_type', $data['product_type']);
-            if ($uid) $query->where('uid', $uid);
+                ->where('product_type',$data['product_type']);
+            if($uid) $query->where('uid',$uid);
         });
-        $query->where('activity_type', $data['product_type']);
-        switch ($data['product_type']) {
+        $query->where('activity_type',$data['product_type']);
+        switch($data['product_type'])
+        {
             case 0:
-                $query->where(function ($query) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1);
-                    })->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
+                $query->where(function($query){
+                    $query->where(function($query){
+                        $query->where('paid',1);
+                    })->whereOr(function($query){
+                        $query->where('paid',0)->where('is_del',0);
                     });
                 });
                 break;
             case 1: //秒杀
-                $query->where(function ($query) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1);
-                    })->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
+                $query->where(function($query){
+                    $query->where(function($query){
+                        $query->where('paid',1);
+                    })->whereOr(function($query){
+                        $query->where('paid',0)->where('is_del',0);
                     });
                 })->when(isset($data['day']), function ($query) use ($data) {
                     $query->whereDay('StoreOrder.create_time', $data['day']);
@@ -624,28 +581,28 @@ class StoreOrderDao extends BaseDao
                  * 第二阶段参与人数：支付了第一阶段
                  */
                 //第二阶段
-                if ($data['type'] == 1) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1)->whereOr(function ($query) {
-                            $query->where('paid', 0)->where('is_del', 0);
+                if($data['type'] == 1){
+                    $query->where(function($query){
+                        $query->where('paid',1)->whereOr(function($query){
+                            $query->where('paid',0)->where('is_del',0);
                         });
                     });
                 }
-                if ($data['type'] == 2) $query->where('paid', 1)->where('status', 'in', [0, 1, 2, 3, -1]);
+                if($data['type'] == 2) $query->where('paid',1)->where('status','in',[0,1,2,3,-1]);
                 break;
             case 3: //助力
-                $query->where(function ($query) {
-                    $query->where('paid', 1)->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
+                $query->where(function($query){
+                    $query->where('paid',1)->whereOr(function($query){
+                        $query->where('paid',0)->where('is_del',0);
                     });
                 });
                 break;
             case 4: //
-                $query->where(function ($query) {
-                    $query->where('paid', 1)->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
+                $query->where(function($query){
+                    $query->where('paid',1)->whereOr(function($query){
+                        $query->where('paid',0)->where('is_del',0);
                     })
-                        ->where('status', '>', -1);
+                    ->where('status','>',-1);
                 });
                 break;
         }
@@ -662,20 +619,20 @@ class StoreOrderDao extends BaseDao
      * @author Qinii
      * @day 2020-10-30
      */
-    public function getTattendSuccessCount($data, ?int $uid)
+    public function getTattendSuccessCount($data,?int $uid)
     {
-        $query = StoreOrder::hasWhere('orderProduct', function ($query) use ($data, $uid) {
-            $query->when(isset($data['activity_id']), function ($query) use ($data) {
-                $query->where('activity_id', $data['activity_id']);
-            })
-                ->when(isset($data['product_sku']), function ($query) use ($data) {
-                    $query->where('product_sku', $data['product_sku']);
+        $query = StoreOrder::hasWhere('orderProduct',function($query)use($data,$uid){
+            $query->when(isset($data['activity_id']),function ($query)use($data){
+                    $query->where('activity_id',$data['activity_id']);
                 })
-                ->when(isset($data['product_id']), function ($query) use ($data) {
-                    $query->where('product_id', $data['product_id']);
+                ->when(isset($data['product_sku']),function ($query)use($data){
+                    $query->where('product_sku',$data['product_sku']);
                 })
-                ->when(isset($data['exsits_id']), function ($query) use ($data) {
-                    switch ($data['product_type']) {
+                ->when(isset($data['product_id']),function ($query)use($data){
+                    $query->where('product_id',$data['product_id']);
+                })
+                ->when(isset($data['exsits_id']),function ($query)use ($data){
+                    switch ($data['product_type']){
                         case 3:
                             $make = app()->make(ProductAssistSetRepository::class);
                             $id = 'product_assist_id';
@@ -687,33 +644,34 @@ class StoreOrderDao extends BaseDao
                     }
                     $where = [$id => $data['exsits_id']];
                     $activity_id = $make->getSearch($where)->column($make->getPk());
-                    if ($activity_id) {
+                    if($activity_id) {
                         $id = array_unique($activity_id);
-                        $query->where('activity_id', 'in', $id);
-                    } else {
-                        $query->where('activity_id', '<', 0);
+                        $query->where('activity_id','in',$id);
+                    }else{
+                        $query->where('activity_id','<',0);
                     }
                 })
-                ->where('product_type', $data['product_type']);
-            if ($uid) $query->where('uid', $uid);
+                ->where('product_type',$data['product_type']);
+            if($uid) $query->where('uid',$uid);
         });
-        $query->where('activity_type', $data['product_type'])->where('paid', 1);
+        $query->where('activity_type',$data['product_type'])->where('paid',1);
 
-        switch ($data['product_type']) {
+        switch($data['product_type'])
+        {
             case 1: //秒杀
-                $query->where(function ($query) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1);
+                $query->where(function($query){
+                    $query->where(function($query){
+                        $query->where('paid',1);
                     });
                 })->when(isset($data['day']), function ($query) use ($data) {
                     $query->whereDay('StoreOrder.create_time', $data['day']);
                 });
                 break;
             case 2: //预售
-                if ($data['type'] == 1) {    //第一阶段
-                    $query->where('status', 'in', [0, 1, 2, 3, 10]);
+                if($data['type'] == 1){    //第一阶段
+                    $query->where('status','in',[0,1,2,3,10]);
                 } else {        //第二阶段
-                    $query->where('status', 'in', [0, 1, 2, 3]);
+                    $query->where('status','in',[0,1,2,3]);
                 }
                 break;
             case 3: //助力
@@ -732,26 +690,26 @@ class StoreOrderDao extends BaseDao
      * @author Qinii
      * @day 1/4/21
      */
-    public function getSeckillRefundCount($where, $type = 1)
+    public function getSeckillRefundCount($where,$type = 1)
     {
-        $query = StoreOrderProduct::getDB()->alias('P')->join('StoreRefundOrder R', 'P.order_id = R.order_id');
-        $query->join('StoreOrder O', 'O.order_id = P.order_id');
+        $query = StoreOrderProduct::getDB()->alias('P')->join('StoreRefundOrder R','P.order_id = R.order_id');
+        $query->join('StoreOrder O','O.order_id = P.order_id');
         $query
-            ->when(isset($where['activity_id']), function ($query) use ($where) {
-                $query->where('P.activity_id', $where['activity_id']);
+            ->when(isset($where['activity_id']),function ($query)use($where){
+                $query->where('P.activity_id',$where['activity_id']);
             })
-            ->when(isset($where['product_sku']), function ($query) use ($where) {
-                $query->where('P.product_sku', $where['product_sku']);
+            ->when(isset($where['product_sku']),function ($query)use($where){
+                $query->where('P.product_sku',$where['product_sku']);
             })
             ->when(isset($where['day']), function ($query) use ($where) {
                 $query->whereDay('P.create_time', $where['day']);
             })
             ->when($type == 1, function ($query) use ($where) {
-                $query->where('O.verify_time', null)->where('O.delivery_type', null);
-            }, function ($query) {
-                $query->where('R.refund_type', 2);
+                $query->where('O.verify_time',null)->where('O.delivery_type',null);
+            },function ($query){
+                $query ->where('R.refund_type',2);
             })
-            ->where('P.product_type', 1)->where('R.status', 3);
+            ->where('P.product_type',1)->where('R.status',3);
         return $query->count();
     }
 
@@ -766,13 +724,14 @@ class StoreOrderDao extends BaseDao
      */
     public function getMaxCountNumber(int $uid, int $productId)
     {
-        return StoreOrder::hasWhere('orderProduct', function ($query) use ($productId) {
+        return StoreOrder::hasWhere('orderProduct',function($query) use($productId){
             $query->where('product_id', $productId);
         })
-            ->where(function ($query) {
-                $query->where('is_del', 0)->whereOr(function ($query) {
-                    $query->where('is_del', 1)->where('paid', 1);
-                });
-            })->where('StoreOrder.uid', $uid)->count();
+        ->where(function($query) {
+            $query->where('is_del',0)->whereOr(function($query){
+                $query->where('is_del',1)->where('paid',1);
+            });
+        })->where('StoreOrder.uid',$uid)->count()
+       ;
     }
 }

app/common/dao/store/order/StoreOrderOtherDao.php

@@ -1,869 +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\common\dao\store\order;
-
-
-use app\common\dao\BaseDao;
-use app\common\dao\system\financial\FinancialDao;
-use app\common\model\store\order\StoreGroupOrderOther;
-use app\common\model\store\order\StoreOrderOther;
-use app\common\model\store\order\StoreOrderProductOther;
-use app\common\model\store\order\StoreOrderStatusOther;
-use app\common\model\store\order\StoreRefundOrder;
-use app\common\model\store\order\StoreRefundOrderOther;
-use app\common\model\store\order\StoreRefundProductOther;
-use app\common\model\system\merchant\FinancialRecord;
-use app\common\repositories\store\order\StoreOrderStatusRepository;
-use app\common\repositories\store\product\ProductAssistSetRepository;
-use app\common\repositories\store\product\ProductGroupBuyingRepository;
-
-use app\common\repositories\system\merchant\MerchantRepository;
-use think\db\BaseQuery;
-use think\db\exception\DataNotFoundException;
-use think\db\exception\DbException;
-use think\db\exception\ModelNotFoundException;
-use think\exception\ValidateException;
-use think\facade\Db;
-use think\Model;
-
-/**
- * Class StoreOrderDao
- * @package app\common\dao\store\order
- * @author xaboy
- * @day 2020/6/8
- */
-class StoreOrderOtherDao extends BaseDao
-{
-    //订单状态（0：待发货；1：待收货；2：待评价；3：已完成； 9: 拼团中 10:  待付尾款 11:尾款超时未付 -1：已退款）
-    const ORDER_STATUS_BE_SHIPPED = 0;
-    const ORDER_STATUS_BE_RECEIVE = 1;
-    const ORDER_STATUS_REPLY = 2;
-    const ORDER_STATUS_SUCCESS = 3;
-    const ORDER_STATUS_SPELL = 9;
-    const ORDER_STATUS_TAIL = 10;
-    const ORDER_STATUS_TAIL_FAIL = 11;
-    const ORDER_STATUS_REFUND = -1;
-
-
-    /**
-     * @return string
-     * @author xaboy
-     * @day 2020/6/8
-     */
-    protected function getModel(): string
-    {
-        return StoreOrderOther::class;
-    }
-
-    /**
-     * @param array $where
-     * @param int $sysDel
-     * @return BaseQuery
-     * @author xaboyCRMEB
-     * @day 2020/6/16
-     */
-    public function search(array $where, $sysDel = 0)
-    {
-        $query = StoreOrderOther::hasWhere('merchant', function ($query) use ($where) {
-            if (isset($where['is_trader']) && $where['is_trader'] !== '') {
-                $query->where('is_trader', $where['is_trader']);
-            }
-            $query->where('is_del', 0);
-        });
-
-        $query->when(($sysDel !== null), function ($query) use ($sysDel) {
-            $query->where('is_system_del', $sysDel);
-        })
-            ->when(isset($where['order_type']) && $where['order_type'] >= 0 && $where['order_type'] !== '', function ($query) use ($where) {
-                if ($where['order_type'] == 2) {
-                    $query->where('is_virtual', 1);
-                } else if ($where['order_type'] == 0) { //实体发货订单
-                    $query->where('order_type', 0)->where('is_virtual', 0);
-                } else if ($where['order_type'] == 3) { //发货订单
-                    $query->where('order_type', 0);
-                } else {
-                    $query->where('order_type', $where['order_type']);
-                }
-            })
-            ->when(isset($where['activity_type']) && $where['activity_type'] != '', function ($query) use ($where) {
-                $query->where('activity_type', $where['activity_type']);
-            })
-            ->when(isset($where['product_type']) && $where['product_type'] != '', function ($query) use ($where) {
-                $query->where('activity_type', $where['product_type']);
-            })
-            ->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
-                // 12表示信用购 先货后款
-                switch ($where['status']) {
-                    case 0:
-                        $query->whereIn('StoreOrderOther.status', [0, 9, 12]);
-                        break;
-                    case -2:
-                        $query->where('StoreOrderOther.paid', 1)->whereNotIn('StoreOrderOther.status', [10, 11]);
-                        break;
-                    case 10:
-                        $query->where('StoreOrderOther.paid', 1)->whereIn('StoreOrderOther.status', [10, 11]);
-                        break;
-                    case 2:
-                        $query->where('StoreOrderOther.paid', 1)->where('StoreOrderOther.status', $where['status'])->where('pay_type', '<>', StoreGroupOrderOther::PAY_TYPE_CREDIT_BUY);
-                        break;
-                    case 20:
-                        $query->where('StoreOrderOther.paid', 1)->whereIn('StoreOrderOther.status', [2, 3]);
-                        break;
-                    default:
-                        $query->where('StoreOrderOther.status', $where['status']);
-                        break;
-                }
-            })
-            ->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
-                $query->where('StoreOrderOther.uid', $where['uid']);
-            })
-            ->when(isset($where['source']) && $where['source'] !== '', function ($query) use ($where) {
-                $query->where('StoreOrderOther.source', $where['source']);
-            })
-            ->when(isset($where['is_user']) && $where['is_user'] !== 0, function ($query) use ($where) {
-                $query->where(function ($query) {
-                    $query->where('order_type', 0)->whereOr(function ($query) {
-                        $query->where('order_type', 1)->where('main_id', 0);
-                    });
-                });
-            })
-            //待核销订单
-            ->when(isset($where['is_verify']) && $where['is_verify'], function ($query) use ($where) {
-                $query->where('StoreOrderOther.order_type', 1)->where('StoreOrderOther.status', 0);
-            })
-            ->when(isset($where['pay_type']) && $where['pay_type'] !== '', function ($query) use ($where) {
-                $query->where('StoreOrderOther.pay_type', $where['pay_type']);
-            })
-            ->when(isset($where['order_ids']) && $where['order_ids'] !== '', function ($query) use ($where) {
-                $query->whereIn('order_id', $where['order_ids']);
-            })
-            ->when(isset($where['order_id']) && $where['order_id'] !== '', function ($query) use ($where) {
-                if (is_array($where['order_id'])) {
-                    $query->whereIn('order_id', $where['order_id']);
-                } else {
-                    $query->where('order_id', $where['order_id']);
-                }
-            })
-            ->when(isset($where['take_order']) && $where['take_order'] != '', function ($query) use ($where) {
-                $query->where('order_type', 1)->whereNotNull('verify_time');
-            })
-            ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
-                $query->where('StoreOrderOther.mer_id', $where['mer_id']);
-            })
-            ->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
-                getModelTime($query, $where['date'], 'StoreOrderOther.create_time');
-            })
-            ->when(isset($where['pay_time']) && $where['pay_time'] !== '', function ($query) use ($where) {
-                getModelTime($query, $where['pay_time'], 'StoreOrderOther.pay_time');
-            })
-            ->when(isset($where['verify_date']) && $where['verify_date'] !== '', function ($query) use ($where) {
-                getModelTime($query, $where['verify_date'], 'verify_time');
-            })
-            ->when(isset($where['order_sn']) && $where['order_sn'] !== '', function ($query) use ($where) {
-                $query->where('order_sn', 'like', '%' . $where['order_sn'] . '%');
-            })
-            ->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
-                $query->where('StoreOrderOther.paid', $where['paid']);
-            })
-            ->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
-                $query->where('StoreOrderOther.is_del', $where['is_del']);
-            })
-            ->when(isset($where['service_id']) && $where['service_id'] !== '', function ($query) use ($where) {
-                $query->where('service_id', $where['service_id']);
-            })
-            ->when(isset($where['username']) && $where['username'] !== '', function ($query) use ($where) {
-                $query->join('User U', 'StoreOrderOther.uid = U.uid')
-                    ->where(function ($query) use ($where) {
-                        $query->where('nickname', 'like', "%{$where['username']}%")
-                            ->whereOr('phone', 'like', "%{$where['username']}%")
-                            ->whereOr('user_phone', 'like', "%{$where['username']}%");
-                    });
-            })
-            ->when(isset($where['store_name']) && $where['store_name'] !== '', function ($query) use ($where) {
-                $orderId = StoreOrderProductOther::alias('op')
-                    ->join('storeProduct sp', 'op.product_id = sp.product_id')
-                    ->whereLike('store_name', "%{$where['store_name']}%")
-                    ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''), function ($query) use ($where) {
-                        $query->where('mer_id', $where['mer_id']);
-                    })->column('order_id');
-                $query->whereIn('order_id', $orderId ?: '');
-            })
-            ->when(isset($where['search']) && $where['search'] !== '', function ($query) use ($where) {
-                $orderId = StoreOrderProductOther::alias('op')
-                    ->join('storeProduct sp', 'op.product_id = sp.product_id')
-                    ->whereLike('store_name', "%{$where['search']}%")
-                    ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''), function ($query) use ($where) {
-                        $query->where('mer_id', $where['mer_id']);
-                    })->column('order_id');
-                $query->where(function ($query) use ($orderId, $where) {
-                    $query->whereIn('order_id', $orderId ? $orderId : '')
-                        ->whereOr('order_sn', 'like', "%{$where['search']}%")
-                        ->whereOr('user_phone', 'like', "%{$where['search']}%");
-                });
-            })
-            ->when(isset($where['order_search']) && $where['order_search'] !== '', function ($query) use ($where) {
-                $query->where('order_sn', 'like', '%' . $where['order_search'] . '%')->whereOr('user_phone', $where['order_search']);
-            })
-            ->when(isset($where['group_order_sn']) && $where['group_order_sn'] !== '', function ($query) use ($where) {
-                $query->join('StoreGroupOrderOther GO', 'StoreOrderOther.group_order_id = GO.group_order_id')->where('group_order_sn', $where['group_order_sn']);
-            })
-            ->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) {
-                $query->where(function ($query) use ($where) {
-                    $query->whereLike('StoreOrderOther.real_name|StoreOrderOther.user_phone|order_sn', "%" . $where['keywords'] . "%");
-                });
-            })
-            ->when(isset($where['reconciliation_type']) && $where['reconciliation_type'] !== '', function ($query) use ($where) {
-                $query->when($where['reconciliation_type'], function ($query) use ($where) {
-                    $query->where('reconciliation_id', '<>', 0);
-                }, function ($query) use ($where) {
-                    $query->where('reconciliation_id', 0);
-                });
-            })->order('StoreOrderOther.create_time DESC');
-
-        return $query;
-    }
-
-
-    /**
-     * @param $id
-     * @param $uid
-     * @return array|Model|null
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     * @author xaboy
-     * @day 2020/6/11
-     */
-    public function userOrder($id, $uid)
-    {
-        return StoreOrderOther::getDB()->where('order_id', $id)->where('uid', $uid)->where('is_del', 0)->where('paid', 1)->where('is_system_del', 0)->find();
-    }
-
-    /**
-     * @param array $where
-     * @param $ids
-     * @return BaseQuery
-     * @author xaboy
-     * @day 2020/6/26
-     */
-    public function usersOrderQuery(array $where, $ids, $uid)
-    {
-        return StoreOrderOther::getDB()->where(function ($query) use ($uid, $ids) {
-            $query->whereIn('uid', $ids)->whereOr(function ($query) use ($uid) {
-                if ($uid) {
-                    $query->where('uid', $uid)->where('is_selfbuy', 1);
-                }
-            });
-        })->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
-            getModelTime($query, $where['date'], 'pay_time');
-        })->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) {
-            $query->whereLike('order_id|order_sn', "%{$where['keyword']}%");
-        })->where('paid', 1)->order('pay_time DESC');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param int|null $except
-     * @return bool
-     * @author xaboy
-     * @day 2020/6/11
-     */
-    public function fieldExists($field, $value, ?int $except = null): bool
-    {
-        return ($this->getModel()::getDB())->when($except, function ($query) use ($field, $except) {
-                $query->where($field, '<>', $except);
-            })->where($field, $value)->count() > 0;
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/12
-     */
-    public function getMerId($id)
-    {
-        return StoreOrderOther::getDB()->where('order_id', $id)->value('mer_id');
-    }
-
-    /**
-     * @param array $where
-     * @return bool
-     * @author Qinii
-     * @day 2020-06-12
-     */
-    public function merFieldExists(array $where)
-    {
-        return ($this->getModel()::getDB())->where($where)->count() > 0;
-    }
-
-    /**
-     * TODO
-     * @param $reconciliation_id
-     * @return mixed
-     * @author Qinii
-     * @day 2020-06-15
-     */
-    public function reconciliationUpdate($reconciliation_id)
-    {
-        return ($this->getModel()::getDB())->whereIn('reconciliation_id', $reconciliation_id)->update(['reconciliation_id' => 0]);
-    }
-
-    public function dayOrderNum($day, $merId = null)
-    {
-        return StoreOrderOther::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($day, function ($query, $day) {
-            getModelTime($query, $day, 'pay_time');
-        })->count();
-    }
-
-    public function dayOrderPrice($day, $merId = null)
-    {
-        return getModelTime(StoreOrderOther::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        }), $day, 'pay_time')->sum('pay_price');
-    }
-
-    public function dateOrderPrice($date, $merId = null)
-    {
-        return StoreOrderOther::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($date, function ($query, $date) {
-            getModelTime($query, $date, 'pay_time');
-        })->sum('pay_price');
-    }
-
-    public function dateOrderNum($date, $merId = null)
-    {
-        return StoreOrderOther::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($date, function ($query, $date) {
-            getModelTime($query, $date, 'pay_time');
-        })->count();
-    }
-
-    public function dayOrderUserNum($day, $merId = null)
-    {
-        return StoreOrderOther::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($day, function ($query, $day) {
-            getModelTime($query, $day, 'pay_time');
-        })->group('uid')->count();
-    }
-
-    public function orderUserNum($date, $paid = null, $merId = null)
-    {
-        return StoreOrderOther::getDB()->when($paid, function ($query, $paid) {
-            $query->where('paid', $paid);
-        })->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($date, function ($query, $date) use ($paid) {
-            if (!$paid) {
-                getModelTime($query, $date);
-                //                $query->where(function ($query) use ($date) {
-                //                    $query->where(function ($query) use ($date) {
-                //                        $query->where('paid', 1);
-                //                        getModelTime($query, $date, 'pay_time');
-                //                    })->whereOr(function ($query) use ($date) {
-                //                        $query->where('paid', 0);
-                //                        getModelTime($query, $date);
-                //                    });
-                //                });
-            } else
-                getModelTime($query, $date, 'pay_time');
-        })->group('uid')->count();
-    }
-
-    public function orderUserGroup($date, $paid = null, $merId = null)
-    {
-        return StoreOrderOther::getDB()->when($paid, function ($query, $paid) {
-            $query->where('paid', $paid);
-        })->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($date, function ($query, $date) {
-            getModelTime($query, $date, 'pay_time');
-        })->group('uid')->field(Db::raw('uid,sum(pay_price) as pay_price,count(order_id) as total'))->select();
-    }
-
-    public function oldUserNum(array $ids, $merId = null)
-    {
-        return StoreOrderOther::getDB()->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->whereIn('uid', $ids)->where('paid', 1)->group('uid')->count();
-    }
-
-    public function oldUserIds(array $ids, $merId = null)
-    {
-        return StoreOrderOther::getDB()->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->whereIn('uid', $ids)->where('paid', 1)->group('uid')->column('uid');
-    }
-
-    public function orderPrice($date, $paid = null, $merId = null)
-    {
-        return StoreOrderOther::getDB()->when($paid, function ($query, $paid) {
-            $query->where('paid', $paid);
-        })->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->when($date, function ($query, $date) use ($paid) {
-            if (!$paid) {
-                $query->where(function ($query) use ($date) {
-                    $query->where(function ($query) use ($date) {
-                        $query->where('paid', 1);
-                        getModelTime($query, $date, 'pay_time');
-                    })->whereOr(function ($query) use ($date) {
-                        $query->where('paid', 0);
-                        getModelTime($query, $date);
-                    });
-                });
-            } else
-                getModelTime($query, $date, 'pay_time');
-        })->sum('pay_price');
-    }
-
-    public function orderGroupNum($date, $merId = null)
-    {
-        $field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`');
-        if ($date == 'year') {
-            $field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m\') as `day`');
-        }
-        $query = StoreOrderOther::getDB()->field($field)
-            ->where('paid', 1)->when($date, function ($query, $date) {
-                getModelTime($query, $date, 'pay_time');
-            })->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            });
-        return $query->order('pay_time ASC')->group('day')->select();
-    }
-
-    public function orderGroupNumPage($where, $page, $limit, $merId = null)
-    {
-        return StoreOrderOther::getDB()->when(isset($where['dateRange']), function ($query) use ($where) {
-            getModelTime($query, date('Y/m/d 00:00:00', $where['dateRange']['start']) . '-' . date('Y/m/d 00:00:00', $where['dateRange']['stop']), 'pay_time');
-        })->field(
-            Db::raw('status,sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`')
-        )
-            ->where('paid', 1)->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            })->order('pay_time DESC')->page($page, $limit)->group('day')->select()->each(function ($item) use ($merId) {
-                $pay_time = explode(' ', $item['pay_time']);
-                $item->settlement_price = Db::name('store_order')
-                    ->whereIn('status', [2, 3])
-                    ->where('mer_id', $merId)
-                    ->whereDay('pay_time', $pay_time[0])
-                    ->sum('pay_price');
-            });
-    }
-
-    public function dayOrderPriceGroup($date, $merId = null)
-    {
-        return StoreOrderOther::getDB()->field(Db::raw('sum(pay_price) as price, from_unixtime(unix_timestamp(pay_time),\'%H:%i\') as time'))
-            ->where('paid', 1)->when($date, function ($query, $date) {
-                getModelTime($query, $date, 'pay_time');
-            })->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            })->group('time')->select();
-    }
-
-    public function dayOrderNumGroup($date, $merId = null)
-    {
-        return StoreOrderOther::getDB()->field(Db::raw('count(*) as total, from_unixtime(unix_timestamp(pay_time),\'%H:%i\') as time'))
-            ->where('paid', 1)->when($date, function ($query, $date) {
-                getModelTime($query, $date, 'pay_time');
-            })->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            })->group('time')->select();
-    }
-
-    public function dayOrderUserGroup($date, $merId = null)
-    {
-        return StoreOrderOther::getDB()->field(Db::raw('count(DISTINCT uid) as total, from_unixtime(unix_timestamp(pay_time),\'%H:%i\') as time'))
-            ->where('paid', 1)->when($date, function ($query, $date) {
-                getModelTime($query, $date, 'pay_time');
-            })->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            })->group('time')->select();
-    }
-
-    /**
-     * 获取当前时间到指定时间的支付金额 管理员
-     * @param string $start 开始时间
-     * @param string $stop 结束时间
-     * @return mixed
-     */
-    public function chartTimePrice($start, $stop, $merId = null)
-    {
-        return StoreOrderOther::getDB()->where('paid', 1)
-            ->where('pay_time', '>=', $start)
-            ->where('pay_time', '<', $stop)
-            ->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            })
-            ->field('sum(pay_price) as num,FROM_UNIXTIME(unix_timestamp(pay_time), \'%Y-%m-%d\') as time')
-            ->group('time')
-            ->order('pay_time ASC')->select()->toArray();
-    }
-
-    /**
-     * @param $date
-     * @param null $merId
-     * @return mixed
-     */
-    public function chartTimeNum($date, $merId = null)
-    {
-        return StoreOrderOther::getDB()->where('paid', 1)->when($date, function ($query) use ($date) {
-            getModelTime($query, $date, 'pay_time');
-        })->when($merId, function ($query, $merId) {
-            $query->where('mer_id', $merId);
-        })->field('count(order_id) as num,FROM_UNIXTIME(unix_timestamp(pay_time), \'%Y-%m-%d\') as time')
-            ->group('time')
-            ->order('pay_time ASC')->select()->toArray();
-    }
-
-    /**
-     * @param $end
-     * @return mixed
-     * @author xaboy
-     * @day 2020/9/16
-     */
-    public function getFinishTimeoutIds($end)
-    {
-        return StoreOrderStatusOther::getDB()->alias('A')->leftJoin('StoreOrderOther B', 'A.order_id = B.order_id')
-            ->where('A.change_type', 'take')
-            ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2)->where('B.pay_type', '<>', StoreGroupOrderOther::PAY_TYPE_CREDIT_BUY)
-            ->column('A.order_id');
-    }
-
-
-    /**
-     * TODO 参与人数
-     * @param array $data
-     * @param int|null $uid
-     * @return BaseQuery
-     * @author Qinii
-     * @day 2020-11-11
-     */
-    public function getTattendCount(array $data, ?int $uid)
-    {
-        $query = StoreOrderOther::hasWhere('orderProduct', function ($query) use ($data, $uid) {
-            $query->when(isset($data['activity_id']), function ($query) use ($data) {
-                $query->where('activity_id', $data['activity_id']);
-            })
-                ->when(isset($data['product_sku']), function ($query) use ($data) {
-                    $query->where('product_sku', $data['product_sku']);
-                })
-                ->when(isset($data['product_id']), function ($query) use ($data) {
-                    $query->where('product_id', $data['product_id']);
-                })
-                ->when(isset($data['exsits_id']), function ($query) use ($data) {
-                    switch ($data['product_type']) {
-                        case 3:
-                            $make = app()->make(ProductAssistSetRepository::class);
-                            $id = 'product_assist_id';
-                            break;
-                        case 4:
-                            $make = app()->make(ProductGroupBuyingRepository::class);
-                            $id = 'product_group_id';
-                            break;
-                    }
-                    $where = [$id => $data['exsits_id']];
-                    $activity_id = $make->getSearch($where)->column($make->getPk());
-                    if ($activity_id) {
-                        $id = array_unique($activity_id);
-                        $query->where('activity_id', 'in', $id);
-                    } else {
-                        $query->where('activity_id', '<', 0);
-                    }
-                })
-                ->where('product_type', $data['product_type']);
-            if ($uid) $query->where('uid', $uid);
-        });
-        $query->where('activity_type', $data['product_type']);
-        switch ($data['product_type']) {
-            case 0:
-                $query->where(function ($query) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1);
-                    })->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
-                    });
-                });
-                break;
-            case 1: //秒杀
-                $query->where(function ($query) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1);
-                    })->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
-                    });
-                })->when(isset($data['day']), function ($query) use ($data) {
-                    $query->whereDay('StoreOrderOther.create_time', $data['day']);
-                });
-                break;
-            case 2: //预售
-
-                /**
-                 * 第一阶段参与人数：所有人
-                 * 第二阶段参与人数：支付了第一阶段
-                 */
-                //第二阶段
-                if ($data['type'] == 1) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1)->whereOr(function ($query) {
-                            $query->where('paid', 0)->where('is_del', 0);
-                        });
-                    });
-                }
-                if ($data['type'] == 2) $query->where('paid', 1)->where('status', 'in', [0, 1, 2, 3, -1]);
-                break;
-            case 3: //助力
-                $query->where(function ($query) {
-                    $query->where('paid', 1)->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
-                    });
-                });
-                break;
-            case 4: //
-                $query->where(function ($query) {
-                    $query->where('paid', 1)->whereOr(function ($query) {
-                        $query->where('paid', 0)->where('is_del', 0);
-                    })
-                        ->where('status', '>', -1);
-                });
-                break;
-        }
-        return $query;
-    }
-
-    /**
-     *  未使用
-     * TODO 成功支付人数
-     * @param int $productType
-     * @param int $activityId
-     * @param int|null $uid
-     * @param int|null $status
-     * @author Qinii
-     * @day 2020-10-30
-     */
-    public function getTattendSuccessCount($data, ?int $uid)
-    {
-        $query = StoreOrderOther::hasWhere('orderProduct', function ($query) use ($data, $uid) {
-            $query->when(isset($data['activity_id']), function ($query) use ($data) {
-                $query->where('activity_id', $data['activity_id']);
-            })
-                ->when(isset($data['product_sku']), function ($query) use ($data) {
-                    $query->where('product_sku', $data['product_sku']);
-                })
-                ->when(isset($data['product_id']), function ($query) use ($data) {
-                    $query->where('product_id', $data['product_id']);
-                })
-                ->when(isset($data['exsits_id']), function ($query) use ($data) {
-                    switch ($data['product_type']) {
-                        case 3:
-                            $make = app()->make(ProductAssistSetRepository::class);
-                            $id = 'product_assist_id';
-                            break;
-                        case 4:
-                            $make = app()->make(ProductGroupBuyingRepository::class);
-                            $id = 'product_group_id';
-                            break;
-                    }
-                    $where = [$id => $data['exsits_id']];
-                    $activity_id = $make->getSearch($where)->column($make->getPk());
-                    if ($activity_id) {
-                        $id = array_unique($activity_id);
-                        $query->where('activity_id', 'in', $id);
-                    } else {
-                        $query->where('activity_id', '<', 0);
-                    }
-                })
-                ->where('product_type', $data['product_type']);
-            if ($uid) $query->where('uid', $uid);
-        });
-        $query->where('activity_type', $data['product_type'])->where('paid', 1);
-
-        switch ($data['product_type']) {
-            case 1: //秒杀
-                $query->where(function ($query) {
-                    $query->where(function ($query) {
-                        $query->where('paid', 1);
-                    });
-                })->when(isset($data['day']), function ($query) use ($data) {
-                    $query->whereDay('StoreOrderOther.create_time', $data['day']);
-                });
-                break;
-            case 2: //预售
-                if ($data['type'] == 1) {    //第一阶段
-                    $query->where('status', 'in', [0, 1, 2, 3, 10]);
-                } else {        //第二阶段
-                    $query->where('status', 'in', [0, 1, 2, 3]);
-                }
-                break;
-            case 3: //助力
-                break;
-            case 4:
-                break;
-        }
-        return $query;
-    }
-
-
-    /**
-     * TODO 获取退款单数量
-     * @param $where
-     * @return mixed
-     * @author Qinii
-     * @day 1/4/21
-     */
-    public function getSeckillRefundCount($where, $type = 1)
-    {
-        $query = StoreOrderProductOther::getDB()->alias('P')->join('StoreRefundOrder R', 'P.order_id = R.order_id');
-        $query->join('StoreOrder O', 'StoreOrderOther.order_id = P.order_id');
-        $query
-            ->when(isset($where['activity_id']), function ($query) use ($where) {
-                $query->where('P.activity_id', $where['activity_id']);
-            })
-            ->when(isset($where['product_sku']), function ($query) use ($where) {
-                $query->where('P.product_sku', $where['product_sku']);
-            })
-            ->when(isset($where['day']), function ($query) use ($where) {
-                $query->whereDay('P.create_time', $where['day']);
-            })
-            ->when($type == 1, function ($query) use ($where) {
-                $query->where('StoreOrderOther.verify_time', null)->where('StoreOrderOther.delivery_type', null);
-            }, function ($query) {
-                $query->where('R.refund_type', 2);
-            })
-            ->where('P.product_type', 1)->where('R.status', 3);
-        return $query->count();
-    }
-
-
-    /**
-     * TODO 用户的某个商品购买数量
-     * @param int $uid
-     * @param int $productId
-     * @return int
-     * @author Qinii
-     * @day 2022/9/26
-     */
-    public function getMaxCountNumber(int $uid, int $productId)
-    {
-        return StoreOrderOther::hasWhere('orderProduct', function ($query) use ($productId) {
-            $query->where('product_id', $productId);
-        })
-            ->where(function ($query) {
-                $query->where('is_del', 0)->whereOr(function ($query) {
-                    $query->where('is_del', 1)->where('paid', 1);
-                });
-            })->where('StoreOrderOther.uid', $uid)->count();
-    }
-
-    /**
-     * 供应链订单退款
-     * @param $refundOrder
-     * @return void
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     */
-    public function refund($refundOrder)
-    {
-        $refundProducts = [];
-        foreach ($refundOrder->refundProduct->toArray() as $item) {
-            $refundProducts[$item['product']['product_source_id']] = ['num' => $item['refund_num']];
-        }
-        $order = StoreOrderOther::where('order_sn', $refundOrder->order['order_sn'])->find();
-        if (empty($order)) {
-            return;
-        }
-        $refundOrderArray = $refundOrder->toArray();
-        unset($refundOrderArray['refund_order_id'], $refundOrderArray['refundProduct'], $refundOrderArray['order']);
-        Db::startTrans();
-        try {
-            $products = [];
-            $refundTotal = 0.00;
-            $orderProducts = StoreOrderProductOther::where('order_id', $order['order_id'])->select();
-            foreach ($orderProducts as $orderProduct) {
-                $refundProduct = $refundProducts[$orderProduct['product_id']] ?? [];
-                if (empty($refundProduct)) {
-                    continue;
-                }
-                $price = bcdiv($orderProduct['total_price'], $orderProduct['product_num'], 2);
-                $refundPrice = bcmul($price, $refundProduct['num'], 2);
-                $refundTotal = bcadd($refundTotal, $refundPrice, 2);
-                $products[] = [
-                    'order_product_id' => $orderProduct['order_product_id'],
-                    'refund_price' => $refundPrice,
-                    'refund_consumption' => 0,
-                    'platform_refund_price' => 0,
-                    'refund_postage' => 0,
-                    'refund_integral' => 0,
-                    'refund_num' => $refundProduct['num'],
-                ];
-                $orderProduct->refund_num -= $refundProduct['num'];
-                $orderProduct->is_refund = 1;
-                $orderProduct->save();
-            }
-            $model = new StoreRefundOrderOther();
-            $model->setAttrs($refundOrderArray);
-            $model->order_id = $order['order_id'];
-            $model->uid = $order['uid'];
-            $model->mer_id = $order['mer_id'];
-            $model->refund_price = $refundTotal;
-            $model->save();
-
-            foreach ($products as &$product) {
-                $product['refund_order_id'] = $model->refund_order_id;
-            }
-            if (count($products) > 0) {
-                StoreRefundProductOther::getDB()->insertAll($products);
-            }
-
-            $financeDao = new FinancialDao();
-            $financeDao->user = $order->user;
-            $financeDao->order = $order;
-            $financeDao->order->order_id = $model->refund_order_id;
-            $financeDao->platformIn($refundTotal, 'supply_chain_refund', $model->mer_id);
-
-            $marginRecord = FinancialRecord::where('order_id', $refundOrder['order_id'])
-                ->where('mer_id', $model->mer_id)
-                ->where('financial_type', 'auto_margin')
-                ->value('number');
-            $marginRefunded = FinancialRecord::where('order_id', $refundOrder['order_id'])
-                ->where('mer_id', $model->mer_id)
-                ->where('financial_type', 'auto_margin_refund')
-                ->sum('number');
-            if ($marginRecord > $marginRefunded) {
-                /** @var MerchantRepository $merchantRepo */
-                $merchantRepo = app()->make(MerchantRepository::class);
-                $merchantRepo->forceMargin = false;
-                $merchantRepo->merId = $model->mer_id;
-                [$margin, $financeDao] = $merchantRepo->refundDeposit($refundTotal, $financeDao);
-                $merchantRepo->addLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $margin);
-            }
-
-            $financeDao->save();
-
-            app()->make(MerchantRepository::class)->subLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $refundTotal);
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-            throw new ValidateException($e->getMessage());
-        }
-    }
-
-}

app/common/dao/store/order/StoreOrderStatusOtherDao.php

@@ -1,72 +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\common\dao\store\order;
-
-
-use app\common\dao\BaseDao;
-use app\common\model\BaseModel;
-use app\common\model\store\order\StoreOrderStatus;
-use app\common\model\store\order\StoreOrderStatusOther;
-
-/**
- * Class StoreOrderStatusDao
- * @package app\common\dao\store\order
- * @author xaboy
- * @day 2020/6/12
- */
-class StoreOrderStatusOtherDao extends BaseDao
-{
-
-    /**
-     * @return string
-     * @author xaboy
-     * @day 2020/6/12
-     */
-    protected function getModel(): string
-    {
-        return StoreOrderStatusOther::class;
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/12
-     */
-    public function search($where)
-    {
-        $query = ($this->getModel()::getDB())
-            ->when(isset($where['id']) && $where['id'] !== '', function($query) use($where){
-                $query->where('order_id', $where['id']);
-            })
-            ->when(isset($where['type']) && $where['type'] !== '', function($query) use($where){
-                $query->where('type', $where['type']);
-            })
-            ->when(isset($where['user_type']) && $where['user_type'] !== '', function($query) use($where){
-                $query->where('user_type', $where['user_type']);
-            })
-            ->when(isset($where['date']) && $where['date'] !== '', function($query) use($where){
-                getModelTime($query, $where['date'],'change_time');
-            });
-        return $query;
-    }
-
-    public function getTimeoutDeliveryOrder($end)
-    {
-        return StoreOrderStatusOther::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id')
-            ->whereIn('A.change_type', ['delivery_0', 'delivery_1', 'delivery_2'])
-            ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 1)
-            ->column('A.order_id');
-    }
-}

app/common/dao/store/order/StoreRefundOrderDao.php

@@ -50,9 +50,6 @@ class StoreRefundOrderDao extends BaseDao
         })->when(isset($where['order_sn']) && $where['order_sn'] !== '', function ($query) use ($where) {
             $ids = StoreOrder::where('order_sn','like','%'.$where['order_sn'].'%')->column('order_id');
             $query->where('order_id','in',$ids);
-        })->when(isset($where['product_type']) && $where['product_type'] !== '', function ($query) use ($where) {
-            $ids = StoreOrder::where('uid', $where['uid'])->where('activity_type', $where['product_type'])->column('order_id');
-            $query->where('order_id','in',$ids);
         })->when(isset($where['refund_order_sn']) && $where['refund_order_sn'] !== '', function ($query) use ($where) {
             $query->where('refund_order_sn', 'like', '%' . $where['refund_order_sn'] . '%');
         })->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {

app/common/dao/store/order/StoreRefundProductDao.php

@@ -40,7 +40,7 @@ class StoreRefundProductDao extends BaseDao
         $lst = $this->getModel()::getDB()->alias('A')->leftJoin('StoreRefundOrder B', 'A.refund_order_id = B.refund_order_id')
             ->where('B.status', '>', -1)
             ->whereIn('A.order_product_id', $ids)->group('A.order_product_id')
-            ->field('A.order_product_id, SUM(A.refund_price) as refund_price, SUM(A.platform_refund_price) as platform_refund_price, SUM(A.refund_postage) as refund_postage, SUM(A.refund_integral) as refund_integral, SUM(A.refund_consumption) as refund_consumption')
+            ->field('A.order_product_id, SUM(A.refund_price) as refund_price, SUM(A.platform_refund_price) as platform_refund_price, SUM(A.refund_postage) as refund_postage, SUM(A.refund_integral) as refund_integral')
             ->select()->toArray();
         $data = [];
         foreach ($lst as $item) {

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

@@ -27,27 +27,4 @@ class CloudProductDao extends BaseDao
     {
     }
 
-    /**
-     * 按距离获取云仓商品列表
-     * @param $lat
-     * @param $lng
-     * @param $limit
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function getByDistance($lat, $lng, $where = [], $limit = 10)
-    {
-        $query = CloudProduct::where('status', 1)
-            ->where($where)
-            ->whereIn('store_name', ['耶贝尔柔韧布质竹纸特惠装（10包）', '家家宜除菌洗衣液阳光清香1千克', '家家宜除菌洗衣粉阳光清香1千克-New版', '家家宜柠檬高效除油洗洁精1.12千克', '蔺艺挂面1.5千克'])
-            ->whereIn('type_id', [10, 17])
-            ->whereNotNull('lat')
-            ->whereNotNull('long')
-            ->field("product_id,mer_id,store_name,mer_labels,st_distance_sphere(point(`long`,`lat`), point({$lng}, {$lat})) as distance");
-        $query->order('distance')->limit($limit);
-        return $query->select()->toArray();
-    }
-
 }

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

@@ -155,18 +155,6 @@ class ProductAttrValueDao extends BaseDao
         ]);
     }
 
-    public function incSales(int $productId, string $unique, int $number)
-    {
-        return model::getDB()->where('product_id', $productId)->where('unique', $unique)->update([
-            'sales' => Db::raw('sales+' . $number)
-        ]);
-    }
-
-    public function descSales(int $productId, string $unique, int $number)
-    {
-        model::getDB()->where('product_id', $productId)->where('unique', $unique)->where('sales', '>=', $number)->dec('sales', $number)->update();
-    }
-
     /**
      * @param int $productId
      * @param string $sku

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

@@ -171,11 +171,7 @@ class ProductDao extends BaseDao
                     }
                     $query->order($where['order'] . ',rank DESC ,create_time DESC ');
                 } else if($where['order'] !== ''){
-                    if($where['order'] == 'check'){
-                        $query->order('Product.update_time DESC');
-                    }else{
-                        $query->order('U.'.$where['order'].' DESC,U.create_time DESC');
-                    }
+                    $query->order('U.'.$where['order'].' DESC,U.create_time DESC');
                 } else {
                     $query->order('U.create_time DESC');
                 }
@@ -242,7 +238,7 @@ class ProductDao extends BaseDao
         }
         app()->make(SpuRepository::class)->getSearch(['product_id' => $id])->update(['is_del' => 1, 'status' => 0]);
         event('product.delete',compact('id'));
-        event('product.sell', ['product_id' => [$id], 'status' => 0]);
+        event('product.sell', ['product_id' => [$id]]);
     }
 
     /**
@@ -322,18 +318,6 @@ class ProductDao extends BaseDao
         ]);
     }
 
-    public function incSales(int $productId, int $number)
-    {
-        return model::getDB()->where('product_id', $productId)->update([
-            'sales' => Db::raw('sales+' . $number)
-        ]);
-    }
-
-    public function descSales(int $productId, int $number)
-    {
-        model::getDB()->where('product_id', $productId)->where('sales', '>=', $number)->dec('sales', $number)->update();
-    }
-
     /**
      * @param int $productId
      * @param int $inc