From 0103fca1605fe91ec9d1dfab18e11cada43b7790 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Thu, 16 Mar 2023 13:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=AE=A2=E6=9C=8D=E8=81=8A=E5=A4=A9=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common.php | 42 ++++ .../model/merchant/system/admin/Admin.php | 2 +- .../merchant/system/financial/Financial.php | 5 +- .../merchant/system/merchant/Merchant.php | 196 +++++++++++++++++- .../system/merchant/MerchantIntention.php | 4 +- 5 files changed, 240 insertions(+), 9 deletions(-) diff --git a/app/common.php b/app/common.php index 43eacd4..11597f6 100644 --- a/app/common.php +++ b/app/common.php @@ -599,4 +599,46 @@ if (!function_exists('getStartModelTime')) { return date('Y-m-d H:i:s'); } } +} + + +/** -------------------------- crmeb 商城移植 方法---------------------- */ +if (!function_exists('merchantConfig')) { + /** + * 获取商户配置 + * + * @param int $merId + * @param string|string[] $key + * @return mixed + * @author xaboy + * @day 2020-05-08 + */ + function merchantConfig(int $merId, $key) + { + $request = request(); + $make = app()->make(ConfigValueRepository::class); + if (is_array($key)) { + $_key = []; + $cacheData = []; + foreach ($key as $v) { + if ($request->hasCache($merId, $v)) { + $cacheData[$v] = $request->getCache($merId, $v); + } else { + $_key[] = $v; + } + } + if (!count($_key)) return $cacheData; + $data = $make->more($_key, $merId); + $request->setCache($merId, $data); + $data += $cacheData; + } else { + if ($request->hasCache($merId, $key)) { + $data = $request->getCache($merId, $key); + } else { + $data = $make->get($key, $merId); + $request->setCache($merId, $key, $data); + } + } + return $data; + } } \ No newline at end of file diff --git a/app/common/model/merchant/system/admin/Admin.php b/app/common/model/merchant/system/admin/Admin.php index 5be5004..9e4fc29 100644 --- a/app/common/model/merchant/system/admin/Admin.php +++ b/app/common/model/merchant/system/admin/Admin.php @@ -18,7 +18,7 @@ use app\common\model\merchant\system\auth\Role; class Admin extends Model { protected $connection = 'shop'; - protected $table = 'system_admin'; + protected $table = 'eb_system_admin'; protected $pk = 'admin_id'; public function getRolesAttr($value) diff --git a/app/common/model/merchant/system/financial/Financial.php b/app/common/model/merchant/system/financial/Financial.php index 025f57a..49bd57e 100644 --- a/app/common/model/merchant/system/financial/Financial.php +++ b/app/common/model/merchant/system/financial/Financial.php @@ -24,6 +24,8 @@ class Financial extends Model protected $table = 'eb_financial'; protected $pk = 'financial_id'; + + // -------------- public function getFinancialAccountAttr($value) { @@ -32,7 +34,8 @@ class Financial extends Model public function getImageAttr($value) { - return explode(',',$value); + if (is_string($value)) + return explode(',',$value); } public function getAdminIdAttr($value) diff --git a/app/common/model/merchant/system/merchant/Merchant.php b/app/common/model/merchant/system/merchant/Merchant.php index 16bae86..1cfc643 100644 --- a/app/common/model/merchant/system/merchant/Merchant.php +++ b/app/common/model/merchant/system/merchant/Merchant.php @@ -11,17 +11,25 @@ declare (strict_types = 1); namespace app\common\model\merchant\system\merchant; use think\Model; +use think\facade\Db; +use think\exception\ValidateException; + use app\common\model\merchant\user\UserBill as UserBillModel; use app\common\model\merchant\store\ShippingTemplate; use app\common\model\merchant\Common; use app\common\model\merchant\system\merchant\MerchantAddress; use app\common\model\merchant\store\product\ProductCopy; -use think\exception\ValidateException; -use think\facade\Db; +use app\common\model\merchant\system\serve\ServeOrder; +use app\common\model\merchant\system\financial\Financial; +use app\common\model\merchant\system\config\SystemConfigValue; +use app\common\model\merchant\store\product\Spu; +use app\common\model\merchant\store\product\Product; +use app\common\model\merchant\store\coupon\StoreCouponUser; +use app\common\model\merchant\store\StoreActivityRepository; /** - * @mixin \think\Model + * 商户model */ class Merchant extends Model { @@ -29,6 +37,131 @@ class Merchant extends Model protected $table = 'eb_merchant'; protected $pk = 'mer_id'; + /** ------------------- 依赖 ------------------- */ + public function getDeliveryWayAttr($value) + { + if (!$value) return []; + return explode(',',$value); + } + + public function product() + { + return $this->hasMany(Product::class, 'mer_id', 'mer_id'); + } + + public function config() + { + return $this->hasMany(SystemConfigValue::class, 'mer_id', 'mer_id'); + } + + public function showProduct() + { + return $this->hasMany(Product::class, 'mer_id', 'mer_id') + ->where((new ProductDao())->productShow()) + ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good') + ->order('is_good DESC,sort DESC'); + } + + /** + * TODO 商户列表下的推荐 + * @return \think\Collection + * @author Qinii + * @day 4/20/22 + */ + public function getAllRecommendAttr() + { + $list = Product::where('mer_id', $this['mer_id']) + ->where((new ProductDao())->productShow()) + ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,cate_id,unit_name') + ->order('sort DESC, create_time DESC') + ->limit(3) + ->select()->append(['show_svip_info']); + if ($list) { + $data = []; + $make = app()->make(StoreActivityRepository::class); + foreach ($list as $item) { + $spu_id = Spu::where('product_id',$item->product_id)->where('product_type' ,0)->value('spu_id'); + $act = $make->getActivityBySpu(StoreActivityRepository::ACTIVITY_TYPE_BORDER,$spu_id,$item['cate_id'],$item['mer_id']); + $item['border_pic'] = $act['pic'] ?? ''; + $data[] = $item; + } + return $data; + } + return []; + } + + public function getCityRecommendAttr() + { + $list = Product::where('mer_id', $this['mer_id']) + ->where((new ProductDao())->productShow()) + ->whereLike('delivery_way',"%1%") + ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,cate_id') + ->order('sort DESC, create_time DESC') + ->limit(3) + ->select(); + if ($list) { + $data = []; + $make = app()->make(StoreActivityRepository::class); + foreach ($list as $item) { + $spu_id = Spu::where('product_id',$item->product_id)->where('product_type' ,0)->value('spu_id'); + $act = $make->getActivityBySpu(StoreActivityRepository::ACTIVITY_TYPE_BORDER,$spu_id,$item['cate_id'],$item['mer_id']); + $item['border_pic'] = $act['pic'] ?? ''; + $data[] = $item; + } + return $data; + } + return []; + } + + + public function recommend() + { + return $this->hasMany(Product::class, 'mer_id', 'mer_id') + ->where((new ProductDao())->productShow()) + ->where('is_good', 1) + ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time') + ->order('is_good DESC,sort DESC,create_time DESC') + ->limit(3); + } + + + public function coupon() + { + $time = date('Y-m-d H:i:s'); + return $this->hasMany(StoreCouponUser::class, 'mer_id', 'mer_id')->where('start_time', '<', $time)->where('end_time', '>', $time) + ->where('is_fail', 0)->where('status', 0)->order('coupon_price DESC, coupon_user_id ASC') + ->with(['product' => function ($query) { + $query->field('coupon_id,product_id'); + }, 'coupon' => function ($query) { + $query->field('coupon_id,type'); + }]); + } + + public function getServicesTypeAttr() + { + return merchantConfig($this->mer_id,'services_type'); + } + + + public function marginOrder() + { + return $this->hasOne(ServeOrder::class, 'mer_id','mer_id')->where('type', 10)->order('create_time DESC'); + } + + public function refundMarginOrder() + { + return $this->hasOne(Financial::class, 'mer_id', 'mer_id') + ->where('type',1) + ->where('status', -1) + ->order('create_time DESC') + ->limit(1); + } + + public function merchantCategory() + { + return $this->hasOne(MerchantCategory::class, 'merchant_category_id', 'category_id'); + } + public function merchantType() { return $this->hasOne(MerchantType::class, 'mer_type_id', 'type_id'); @@ -39,10 +172,63 @@ class Merchant extends Model return $this->merchantType()->bind(['type_name']); } + public function getMerCommissionRateAttr() + { + return $this->commission_rate > 0 ? $this->commission_rate : bcmul($this->merchantCategory->commission_rate, 100, 4); + } + + public function getOpenReceiptAttr() + { + return merchantConfig($this->mer_id, 'mer_open_receipt'); + } + + public function admin() + { + return $this->hasOne(MerchantAdmin::class, 'mer_id', 'mer_id')->where('level', 0); + } + + + public function searchKeywordAttr($query, $value) + { + $query->whereLike('mer_name|mer_keyword', "%{$value}%"); + } + + public function getFinancialAlipayAttr($value) + { + return $value ? json_decode($value) : $value; + } + + public function getFinancialWechatAttr($value) + { + return $value ? json_decode($value) : $value; + } + + public function getFinancialBankAttr($value) + { + return $value ? json_decode($value) : $value; + } + + public function getMerCertificateAttr() + { + return merchantConfig($this->mer_id, 'mer_certificate'); + } + + public function getIssetCertificateAttr() + { + return count(merchantConfig($this->mer_id, 'mer_certificate') ?: []) > 0; + } + + public function searchMerIdsAttr($query, $value) + { + $query->whereIn('mer_id',$value); + } + /** -----------------------依赖 end ------------------------------- */ + + /** ----------------------- controller 调用入口------------ */ + + /** * @param array $data - * @author xaboy - * @day 2020-04-17 */ public function createMerchant(array $data) { diff --git a/app/common/model/merchant/system/merchant/MerchantIntention.php b/app/common/model/merchant/system/merchant/MerchantIntention.php index bc03a24..5c60b03 100644 --- a/app/common/model/merchant/system/merchant/MerchantIntention.php +++ b/app/common/model/merchant/system/merchant/MerchantIntention.php @@ -214,7 +214,7 @@ class MerchantIntention extends Model $store_service_data['is_goods'] = 1; $store_service_data['phone'] = $intention['phone']; $store_service_data['create_time'] = date('Y-m-d H:i:s'); - Db::name('store_service')->insert($store_service_data); + Db::table('eb_store_service')->insert($store_service_data); // topservice $top_store_service['mer_id'] = 0; $top_store_service['uid'] = $intention['uid']; @@ -226,7 +226,7 @@ class MerchantIntention extends Model $top_store_service['is_open'] = 1; $top_store_service['phone'] = $intention['phone']; $top_store_service['create_time'] = date('Y-m-d H:i:s'); - Db::name('store_service')->insert($top_store_service); + Db::table('eb_store_service')->insert($top_store_service); // 暂不开通通知 // Queue::push(SendSmsJob::class, ['tempId' => 'APPLY_MER_SUCCESS', 'id' => $smsData]);