diff --git a/app/admin/controller/merchant/system/merchant/Merchant.php b/app/admin/controller/merchant/system/merchant/Merchant.php index 66c8241..6961c20 100644 --- a/app/admin/controller/merchant/system/merchant/Merchant.php +++ b/app/admin/controller/merchant/system/merchant/Merchant.php @@ -6,25 +6,48 @@ * * @ 商户管理 */ -namespace app\admin\controller\merchant\system; +namespace app\admin\controller\merchant\system\merchant; +use think\App; use app\admin\BaseController; use app\common\model\merchant\system\merchant\Merchant as MerchantModel; class Merchant extends BaseController{ protected $model; + protected $path = [ + 'index' => 'merchant/system/merchant/merchant/lst', + 'read' => 'merchant/system/merchant/merchant/read', + 'add' => 'merchant/system/merchant/merchant/add', + 'edit' => 'merchant/system/merchant/merchant/edit', + 'descr'=>'merchant/system/merchant/merchant/index', + 'mark' => 'merchant/system/merchant/merchant/mark' + ]; - public function __construct() + public function __construct(App $app) { + parent::__construct($app); } - function classify(){ - + public function index() + { + return View($this->path['index']); } - public function system() { - + /** + * 商户列表数据 + */ + public function lst() + { + [$page, $limit] = $this->getPage(); + $where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']); + return app('json')->success($this->repository->lst($where, $page, $limit)); + } + + public function count() + { + $where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']); + return app('json')->success($this->repository->count($where)); } } \ No newline at end of file diff --git a/app/admin/controller/product/Product.php b/app/admin/controller/product/Product.php index 8f44d77..bafee0e 100644 --- a/app/admin/controller/product/Product.php +++ b/app/admin/controller/product/Product.php @@ -88,7 +88,7 @@ class Product extends BaseController if (isset($params['keywords']) && !empty($params['keywords'])){ // $where[]= ['sotre_name','like','%'.$params['keywords'].'%']; - $where['keywords'] = $where['store_name'] = $params['keywords']; + $where['keyword'] = $where['store_name'] = $params['keywords']; } $page = empty($params['page'])?1:$params['page']; diff --git a/app/admin/model/EbStoreProduct.php b/app/admin/model/EbStoreProduct.php index 7ed73f9..a956f00 100644 --- a/app/admin/model/EbStoreProduct.php +++ b/app/admin/model/EbStoreProduct.php @@ -10,6 +10,8 @@ namespace app\admin\model; use think\Model; use app\admin\model\store\ProductCate; +use app\common\model\merchant\system\merchant\Merchant; +use think\facade\Db; class EbStoreProduct extends Model @@ -46,7 +48,134 @@ class EbStoreProduct extends Model { return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name'); } - + /* + * ----------------------------------------------------------------------------------------------------------------- + * 搜索器 + * ----------------------------------------------------------------------------------------------------------------- + */ + public function searchMerCateIdAttr($query, $value) + { + $cate_ids = (StoreCategory::where('path','like','%/'.$value.'/%'))->column('store_category_id'); + $cate_ids[] = intval($value); + $product_id = ProductCate::whereIn('mer_cate_id',$cate_ids)->column('product_id'); + $query->whereIn('Product.product_id',$product_id); + } + public function searchKeywordAttr($query, $value) + { + if (!$value) return; + if (is_numeric($value)) { + $query->whereLike("Product.store_name|Product.keyword|bar_code|Product.product_id", "%{$value}%"); + } + // else { + // // $word = app()->make(VicWordService::class)->getWord($value); + // $word = $value; + // $query->where(function ($query) use ($word, $value) { + // foreach ($word as $item) { + // $query->whereOr('Product.store_name|Product.keyword', 'LIKE', "%$item%"); + // } + // $query->order(Db::raw('REPLACE(Product.store_name,\'' . $value . '\',\'\')')); + // }); + // } + } + public function searchStatusAttr($query, $value) + { + if($value === -1){ + $query->where('Product.status', 'in',[-1,-2]); + }else { + $query->where('Product.status',$value); + } + } + public function searchCateIdAttr($query, $value) + { + $query->where('cate_id',$value); + } + public function searchCateIdsAttr($query, $value) + { + $query->whereIn('cate_id',$value); + } + public function searchIsShowAttr($query, $value) + { + $query->where('is_show',$value); + } + public function searchPidAttr($query, $value) + { + $cateId = app()->make(StoreCategoryRepository::class)->allChildren(intval($value)); + $query->whereIn('cate_id', $cateId); + } + public function searchStockAttr($query, $value) + { + $value ? $query->where('stock','<=', $value) : $query->where('stock', $value); + } + public function searchIsNewAttr($query, $value) + { + $query->where('is_new',$value); + } + public function searchPriceAttr($query, $value) + { + if(empty($value[0]) && !empty($value[1])) + $query->where('price','<',$value[1]); + if(!empty($value[0]) && empty($value[1])) + $query->where('price','>',$value[0]); + if(!empty($value[0]) && !empty($value[1])) + $query->whereBetween('price',[$value[0],$value[1]]); + } + public function searchBrandIdAttr($query, $value) + { + $query->whereIn('brand_id',$value); + } + public function searchIsGiftBagAttr($query, $value) + { + $query->where('is_gift_bag',$value); + } + public function searchIsGoodAttr($query, $value) + { + $query->where('is_good',$value); + } + public function searchIsUsedAttr($query, $value) + { + $query->where('is_used',$value); + } + public function searchProductTypeAttr($query, $value) + { + $query->where('Product.product_type',$value); + } + // public function searchSeckillStatusAttr($query, $value) + // { + // $product_id = (new StoreSeckillActiveDao())->getStatus($value)->column('product_id'); + // $query->whereIn('Product.product_id',$product_id); + // } + public function searchStoreNameAttr($query, $value) + { + $query->where('Product.store_name','like','%'.$value.'%'); + } + public function searchMerStatusAttr($query, $value) + { + $query->where('mer_status',$value); + } + public function searchProductIdAttr($query, $value) + { + $query->where('Product.product_id',$value); + } + public function searchPriceOnAttr($query, $value) + { + $query->where('price','>=',$value); + } + public function searchPriceOffAttr($query, $value) + { + $query->where('price','<=',$value); + } + public function searchisFictiAttr($query, $value) + { + $query->where('type',$value); + } + public function searchGuaranteeTemplateIdAttr($query, $value) + { + $query->whereIn('guarantee_template_id',$value); + } + public function searchTempIdAttr($query, $value) + { + $query->whereIn('Product.temp_id',$value); + } /** * TODO 商户商品列表 diff --git a/app/admin/route/merchant.php b/app/admin/route/merchant.php index 775ecbf..d1eb832 100644 --- a/app/admin/route/merchant.php +++ b/app/admin/route/merchant.php @@ -43,6 +43,78 @@ Route::group(function(){ '_auth' => true, ]); + //商户管理 + Route::group('system/merchant', function () { + Route::get('index', '.Merchant/index')->name('systemMerchantLst')->option([ + '_alias' => '商户列表页', + ]); + Route::get('lst', '.Merchant/list')->name('systemMerchantLst')->option([ + '_alias' => '商户列表', + ]); + Route::get('count', '.Merchant/count')->name('systemMerchantCount')->option([ + '_alias' => '商户列表统计', + ]); + Route::get('add', '.Merchant/add')->name('systemMerchantCreateForm')->option([ + '_alias' => '商户添加表单页', + ]); + Route::post('add', '.Merchant/add')->name('systemMerchantCreate')->option([ + '_alias' => '商户添加', + ]); + Route::get('edit', '.Merchant/edit')->name('systemMerchantUpdateForm')->option([ + '_alias' => '商户编辑表单页', + '_auth' => false, + '_form' => 'systemMerchantUpdate', + ]); + Route::post('edit', '.Merchant/edit')->name('systemMerchantUpdate')->option([ + '_alias' => '商户编辑', + ]); + Route::post('status', '.Merchant/switchStatus')->name('systemMerchantStatus')->option([ + '_alias' => '商户修改推荐', + ]); + Route::post('close', '.Merchant/switchClose')->name('systemMerchantClose')->option([ + '_alias' => '商户开启/关闭', + ]); + Route::delete('del', '.Merchant/del')->name('systemMerchantDelete')->option([ + '_alias' => '商户删除', + ]); + Route::post('password', '.MerchantAdmin/password')->name('systemMerchantAdminPassword')->option([ + '_alias' => '商户修改密码', + ]); + Route::get('password', '.MerchantAdmin/passwordForm')->name('systemMerchantAdminPasswordForm')->option([ + '_alias' => '商户修改密码表单页', + '_auth' => false, + '_form' => 'systemMerchantAdminPassword', + ]); + Route::post('login', '.Merchant/login')->name('systemMerchantLogin')->option([ + '_alias' => '商户登录', + ]); + Route::get('changecopy', '/changeCopyNumForm')->name('systemMerchantChangeCopyForm')->option([ + '_alias' => '修改采集商品次数表单页', + '_auth' => false, + '_form' => 'systemMerchantChangeCopy', + ]); + Route::post('changecopy', '.Merchant/changeCopyNum')->name('systemMerchantChangeCopy')->option([ + '_alias' => '修改采集商品次数', + ]); + })->prefix('merchant.system.merchant')->option([ + '_path' => '/merchant/list', + '_auth' => true, + '_append'=> [ + [ + '_name' =>'uploadImage', + '_path' =>'/merchant/list', + '_alias' => '上传图片', + '_auth' => true, + ], + [ + '_name' =>'systemAttachmentLst', + '_path' =>'/merchant/list', + '_alias' => '图片列表', + '_auth' => true, + ], + ] + ]); + //入驻申请列表 Route::group('merchant/intention', function () { Route::get('index', '/index')->name('systemMerchantIntentionLst')->option([ diff --git a/app/admin/view/merchant/system/merchant/merchant/lst.html b/app/admin/view/merchant/system/merchant/merchant/lst.html new file mode 100644 index 0000000..d28a978 --- /dev/null +++ b/app/admin/view/merchant/system/merchant/merchant/lst.html @@ -0,0 +1,691 @@ +{extend name="common/base"/} + +{block name="body"} + + +
+ + + +
+ +
+
+ +
+ +
+
+ + + + + + + + + +
+
+
+ +
+ +
+
+ +
+
-
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ + +
+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ + +
+ +
+ +
+
+
+ + + + +
+
+ + + + + +
+ +
+ + +
+ +
+
+ + +
+
+ +
+
+ +
+
+
+ + + + +
+ + + + + + + + + +{/block} + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/common/model/merchant/system/financial/FinancialRecord.php b/app/common/model/merchant/system/financial/FinancialRecord.php new file mode 100644 index 0000000..b2a8e84 --- /dev/null +++ b/app/common/model/merchant/system/financial/FinancialRecord.php @@ -0,0 +1,14 @@ +hasOneThrough(SupplyChainLinkMerchant::class, SupplyChain::class); + } + public function getDeliveryWayAttr($value) { if (!$value) return []; diff --git a/app/common/model/merchant/system/merchant/MerchantIntention.php b/app/common/model/merchant/system/merchant/MerchantIntention.php index 5c60b03..662ab1f 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::table('eb_store_service')->insert($store_service_data); + Db::connect('shop')->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::table('eb_store_service')->insert($top_store_service); + Db::connect('shop')->table('eb_store_service')->insert($top_store_service); // 暂不开通通知 // Queue::push(SendSmsJob::class, ['tempId' => 'APPLY_MER_SUCCESS', 'id' => $smsData]);