From 35e17ce0d0787411b1449367bd4049e67bbf2124 Mon Sep 17 00:00:00 2001 From: weigang Date: Fri, 4 Sep 2020 09:09:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/MigrateOrder.php | 119 ++++++++++++++++----- app/Console/Commands/MigrateOrderGoods.php | 80 -------------- app/Console/Commands/MigrateOrderMain.php | 96 ----------------- 3 files changed, 95 insertions(+), 200 deletions(-) delete mode 100644 app/Console/Commands/MigrateOrderGoods.php delete mode 100644 app/Console/Commands/MigrateOrderMain.php diff --git a/app/Console/Commands/MigrateOrder.php b/app/Console/Commands/MigrateOrder.php index 8acef0f..ff806c3 100644 --- a/app/Console/Commands/MigrateOrder.php +++ b/app/Console/Commands/MigrateOrder.php @@ -39,35 +39,106 @@ class MigrateOrder extends Command public function handle() { - // get old data from old table - $oldData = DB::table('ims_cjdc_order')->get(); + // main order + $orderMain = DB::table('ims_cjdc_order_main')->get(); - $bar = $this->output->createProgressBar(count($oldData)); + $bar = $this->output->createProgressBar(count($orderMain)); $bar->start(); - $newData = []; - foreach ($oldData as $key => $value) { - $newData[] = [ - 'order_main_id' => $value->order_main_id ?? 0, - 'user_id' => $value->user_id ?? 0, - 'store_id' => $value->store_id ?? 0, - 'status' => 1, - 'refund_time' => 0, - 'order_num' => $value->order_num ?? '', - 'money' => $value->money ?? 0, - 'oid' => $value->oid ?? 0, - 'refuse_refund_note' => '', - 'refund_note' => '', - 'note' => $value->note ?? '', - 'created_at' => $value->time_add ? strtotime($value->time_add) : 0, - 'updated_at' => $value->time_add ? strtotime($value->time_add) : 0, - ]; + foreach ($orderMain as $k => $main) { + DB::beginTransaction(); + try { + // 主订单 + $dataMain = [ + 'market_id' => $main->market_id ?? 0, + 'order_num' => $main->order_num ?? '', + 'global_order_id' => $main->global_order_id ?? 0, + 'user_id' => $main->user_id ?? 0, + 'pay_type' => $main->pay_type ?? 0, + 'type' => $main->type ?? 0, + 'order_type' => $main->order_type ?? 0, + 'shipping_type' => $main->dada_status == 0 ? 1 : 2, + 'money' => $main->money ?? 0, + 'total_money' => $main->total_money ?? 0, + 'services_money' => 0, + 'coupon_money' => $main->yhq_money2 ?? 0, + 'delivery_money' => $main->dada_fee ?? 0, + 'state' => $main->state ?? 0, + 'pay_time' => $main->pay_time ? strtotime($main->pay_time) : 0, + 'receive_time' => $main->jd_time ? strtotime($main->jd_time) : 0, + 'delivery_time' => 0, + 'complete_time' => $main->complete_time ? strtotime($main->complete_time) : 0, + 'cancel_time' => $main->complete_time ? strtotime($main->complete_time) : 0, + 'refund_time' => $main->refund_time ?? 0, + 'tel' => $main->tel ?? '', + 'address' => $main->address ?? '', + 'lat' => $main->lat ?? '', + 'lng' => $main->lng ?? '', + 'name' => $main->name ?? '', + 'print_num' => $main->print_num ?? 0, + 'plat' => $main->plat ?? 0, + 'refuse_refund_note' => $main->refuse_refund_note ?? '', + 'delivery_time_note' => $main->delivery_time ?? '', + 'total_refund_note' => $main->total_refund_note ?? '', + 'note' => $main->note ?? '', + 'created_at' => $main->time_add ?? 0, + 'updated_at' => 0, + ]; + $newMainId = DB::table('lanzu_order_main')->insertGetId($dataMain); - $bar->advance(); - } + // 子订单 + $orderChildren = DB::table('ims_cjdc_order')->where(['order_main_id' => $main->id])->get(); + foreach ($orderChildren as $kChild => $child) { + // 子订单 + $dataChild = [ + 'order_main_id' => $newMainId ?? 0, + 'user_id' => $child->user_id ?? 0, + 'store_id' => $child->store_id ?? 0, + 'status' => 1, + 'refund_time' => 0, + 'order_num' => $child->order_num ?? '', + 'money' => $child->money ?? 0, + 'oid' => $child->oid ?? 0, + 'refuse_refund_note' => '', + 'refund_note' => '', + 'note' => $child->note ?? '', + 'created_at' => $child->time_add ? strtotime($child->time_add) : 0, + 'updated_at' => $child->time_add ? strtotime($child->time_add) : 0, + ]; + $newChildId = DB::table('lanzu_order')->insertGetId($dataChild); - // insert new data to new table - DB::table('lanzu_order')->insert($newData); + // 订单商品 + $orderGoods = DB::table('ims_cjdc_order_goods')->where(['order_id' => $child->id])->get(); + $dataGoods = []; + foreach ($orderGoods as $kGoods => $goods) { + // 订单商品 + $dataGoods[] = [ + 'order_id' => $newChildId ?? 0, + 'goods_id' => $goods->good_id ?? 0, + 'number' => $goods->number ?? 0, + 'status' => 1, + 'price' => $goods->money ?? 0, + 'original_price' => $goods->money2 ?? 0, + 'vip_price' => $goods->vip_money ?? 0, + 'name' => $goods->name ?? '', + 'goods_unit' => $goods->good_unit ?? '', + 'cover_img' => $goods->img ?? '', + 'spec' => json_encode([]), + 'refund_time' => 0, + 'created_at' => time(), + 'updated_at' => time(), + 'refuse_refund_note' => '', + ]; + } + DB::table('lanzu_order_goods')->insert($dataGoods); + } + $bar->advance(); + DB::commit(); + } catch (\Exception $e) { + $this->info(json_encode(['order_id' => $main->id, 'exception' => $e->getMessage()])); + DB::rollBack(); + } + } $bar->finish(); return 0; diff --git a/app/Console/Commands/MigrateOrderGoods.php b/app/Console/Commands/MigrateOrderGoods.php deleted file mode 100644 index 855b78a..0000000 --- a/app/Console/Commands/MigrateOrderGoods.php +++ /dev/null @@ -1,80 +0,0 @@ -get(); - - $bar = $this->output->createProgressBar(count($oldData)); - $bar->start(); - - $newData = []; - foreach ($oldData as $key => $value) { - - $goods =DB::table('ims_cjdc_goods')->find($value->good_id); - - $newData[] = [ - 'order_id' => $value->order_id ?? 0, - 'goods_id' => $value->good_id ?? 0, - 'number' => $value->number ?? 0, - 'status' => 1, - 'price' => $value->money ?? 0, - 'original_price' => $goods->money2 ?? 0, - 'vip_price' => $goods->vip_money ?? 0, - 'name' => $value->name ?? '', - 'goods_unit' => $value->good_unit ?? '', - 'cover_img' => $value->img ?? '', - 'spec' => json_encode([]), - 'refund_time' => 0, - 'created_at' => time(), - 'updated_at' => time(), - 'refuse_refund_note' => '', - ]; - - $bar->advance(); - } - - // insert new data to new table - DB::table('lanzu_order_goods')->insert($newData); - - $bar->finish(); - return 0; - } -} diff --git a/app/Console/Commands/MigrateOrderMain.php b/app/Console/Commands/MigrateOrderMain.php deleted file mode 100644 index 7c497d0..0000000 --- a/app/Console/Commands/MigrateOrderMain.php +++ /dev/null @@ -1,96 +0,0 @@ -get(); - - $bar = $this->output->createProgressBar(count($oldData)); - $bar->start(); - - $newData = []; - foreach ($oldData as $key => $value) { - - $newData[] = [ - 'market_id' => $value->market_id ?? 0, - 'order_num' => $value->order_num ?? '', - 'global_order_id' => $value->global_order_id ?? 0, - 'user_id' => $value->user_id ?? 0, - 'pay_type' => $value->pay_type ?? 0, - 'type' => $value->type ?? 0, - 'order_type' => $value->order_type ?? 0, - 'shipping_type' => $value->dada_status==0 ? 1 : 2, - 'money' => $value->money ?? 0, - 'total_money' => $value->total_money ?? 0, - 'services_money' => 0, - 'coupon_money' => $value->yhq_money2 ?? 0, - 'delivery_money' => $value->dada_fee ?? 0, - 'state' => $value->state ?? 0, - 'pay_time' => $value->pay_time ? strtotime($value->pay_time) : 0, - 'receive_time' => $value->jd_time ? strtotime($value->jd_time) : 0, - 'delivery_time' => 0, - 'complete_time' => $value->complete_time ? strtotime($value->complete_time) : 0, - 'cancel_time' => $value->complete_time ? strtotime($value->complete_time) : 0, - 'refund_time' => $value->refund_time ?? 0, - 'tel' => $value->tel ?? '', - 'address' => $value->address ?? '', - 'lat' => $value->lat ?? '', - 'lng' => $value->lng ?? '', - 'name' => $value->name ?? '', - 'print_num' => $value->print_num ?? 0, - 'plat' => $value->plat ?? 0, - 'refuse_refund_note' => $value->refuse_refund_note ?? '', - 'delivery_time_note' => $value->delivery_time ?? '', - 'total_refund_note' => $value->total_refund_note ?? '', - 'note' => $value->note ?? '', - 'created_at' => $value->time_add ?? 0, - 'updated_at' => 0, - ]; - - $bar->advance(); - } - - // insert new data to new table - DB::table('lanzu_order_main')->insert($newData); - - $bar->finish(); - return 0; - } -} From 6c38a975e384b5cce547a8c5f4d4a6dd0cb757e1 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Fri, 4 Sep 2020 10:20:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?banner=E5=A4=9A=E5=AD=97=E6=AE=B5market=5Fi?= =?UTF-8?q?ds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/BannerController.php | 6 ++++-- app/Admin/Controllers/CategoryController.php | 4 +++- app/Admin/Controllers/GoodsController.php | 16 ++++++++-------- app/Admin/Controllers/StoreController.php | 5 +++-- app/Admin/routes.php | 5 +++-- app/Models/Banner.php | 3 +++ app/Models/Category.php | 12 ++++++++++++ resources/lang/zh-CN/banner.php | 1 + 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/app/Admin/Controllers/BannerController.php b/app/Admin/Controllers/BannerController.php index d020705..f6d7856 100644 --- a/app/Admin/Controllers/BannerController.php +++ b/app/Admin/Controllers/BannerController.php @@ -84,7 +84,9 @@ class BannerController extends AdminController $form->hidden('id'); // 市场 $marketList = MarketModel::getMarket(); - $form->select('market_id')->width(4)->options($marketList); + $form->select('market_id')->width(4)->options($marketList)->default(0); + // 多个市场 + $form->multipleSelect('market_ids')->options($marketList); $form->select('type')->options(BannerModel::$_type)->required(); $form->text('title')->required(); $form->text('sub_title'); @@ -92,7 +94,7 @@ class BannerController extends AdminController $form->select('cover_type')->options(BannerModel::$_coverType)->required(); $form->text('path')->default(''); $form->select('path_type')->options(BannerModel::$_pathType)->default(''); - $form->text('sort'); + $form->number('sort')->width(2)->default(0); $form->disableResetButton(); diff --git a/app/Admin/Controllers/CategoryController.php b/app/Admin/Controllers/CategoryController.php index 67b2537..ab0ffe9 100644 --- a/app/Admin/Controllers/CategoryController.php +++ b/app/Admin/Controllers/CategoryController.php @@ -21,8 +21,10 @@ class CategoryController extends AdminController $tree->branch(function ($branch) { $src = $branch['cover_img_url']; $logo = ""; + + $actions = '绑定'; - return "{$branch['id']} - {$branch['title']} $logo"; + return "{$branch['id']} - {$branch['title']} $logo $actions"; }); $row->column(12, $tree); diff --git a/app/Admin/Controllers/GoodsController.php b/app/Admin/Controllers/GoodsController.php index 31acc64..a37f175 100644 --- a/app/Admin/Controllers/GoodsController.php +++ b/app/Admin/Controllers/GoodsController.php @@ -7,7 +7,7 @@ use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; -use App\Models\GoodsType as GoodsTypeModel; +use App\Models\Category as CategoryModel; use App\Models\Store as StoreModel; use Dcat\Admin\Form\NestedForm; use App\Models\Goods as GoodsModel; @@ -26,9 +26,9 @@ class GoodsController extends AdminController $grid->id->sortable(); $grid->cover_img_url->image('',50); $grid->name; - $grid->goods_type_id->display(function ($goodsTypeId){ - $goodsType = GoodsTypeModel::getGoodsInfo($goodsTypeId,'type_name'); - return empty($goodsType) ? '' : $goodsType->type_name; + $grid->category_id->display(function ($categoryId){ + $category = CategoryModel::getCategoryInfo($categoryId,'title'); + return empty($category) ? '' : $category->title; }); $grid->store_id->display(function ($storeId){ $store = StoreModel::getStoreInfo($storeId,'name'); @@ -96,16 +96,16 @@ class GoodsController extends AdminController return Form::make($builder, function (Form $form) { $form->hidden('id'); - // 二级分类（商品分类） - $goodsTypeList = GoodsTypeModel::getGoodsTypeArray(); + // 二级分类 + $categoryList = CategoryModel::getCategoryArray([['parent_id','>',0]]); // 店铺 $storeList = StoreModel::getStoreArray(); //市场 $marketList = MarketModel::getMarket(); - $form->column(6, function (Form $form) use($marketList,$storeList,$goodsTypeList ){ + $form->column(6, function (Form $form) use($marketList,$storeList,$categoryList ){ $form->select('market_id')->required()->options($marketList); - $form->select('goods_type_id')->required()->options($goodsTypeList); + $form->select('category_id')->required()->options($categoryList); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); $form->image('cover_img')->required(); diff --git a/app/Admin/Controllers/StoreController.php b/app/Admin/Controllers/StoreController.php index ef89eb4..2c4420b 100644 --- a/app/Admin/Controllers/StoreController.php +++ b/app/Admin/Controllers/StoreController.php @@ -14,6 +14,7 @@ use App\Admin\Common\StoreQRCode; use App\Admin\Repositories\StoreType; use App\Models\Store as StoreModel; use App\Models\ImsCjdcUser as UserModel; +use App\Models\Category as CategoryModel; class StoreController extends AdminController { @@ -113,8 +114,8 @@ class StoreController extends AdminController $mmList = MminfoModel::getMmInfoArray(); // 查询市场 $marketList = MarketModel::getMarket(); - // 查询一级分类（店铺分类） - $storeTypeList = StoreTypeModel::getStoreTypeArray(); + // 查询一级分类 + $storeTypeList = CategoryModel::getCategoryArray([['parent_id','=',0]]); // 用户 $userList = UserModel::getUserArray(); diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 10bd6ef..1e6ddf4 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -45,13 +45,14 @@ Route::group([ $router->resource('/storeUserReport', 'StoreUserReportController'); // 分类 - $router->resource('/storeType', 'StoreTypeController'); - $router->resource('/goodsType', 'GoodsTypeController'); $router->resource('/category', 'CategoryController'); + $router->get('/category/TieForm', 'CategoryTieController@CategoryTieForm'); + // 店铺 $router->resource('/store', 'StoreController'); // 商品 $router->resource('/goods', 'GoodsController'); // banner $router->resource('/banner', 'BannerController'); + }); diff --git a/app/Models/Banner.php b/app/Models/Banner.php index d2f64ae..3237a3a 100644 --- a/app/Models/Banner.php +++ b/app/Models/Banner.php @@ -17,6 +17,9 @@ class Banner extends Model protected $appends = [ 'cover_url', ]; + protected $casts = [ + 'market_ids'=>'array', + ]; public static $_coverType = [1=>'图片', 2=>'视频']; public static $_pathType = ['page'=>'page','webview'=>'webview','applet'=>'applet']; diff --git a/app/Models/Category.php b/app/Models/Category.php index fbb3aba..8c2d07e 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -31,6 +31,18 @@ class Category extends Model $value = $value ? $value : $this->cover_img; return $this->imageUrl($value); } + + /** + * 获取单个信息 + * @param int $id + * @param string $field + * @return string + */ + public static function getCategoryInfo($id,$field = '*') + { + return self::select($field)->find($id); + } + /** * 获取二级分类数组 * id为键，name为值 diff --git a/resources/lang/zh-CN/banner.php b/resources/lang/zh-CN/banner.php index 5f696a0..102e020 100644 --- a/resources/lang/zh-CN/banner.php +++ b/resources/lang/zh-CN/banner.php @@ -6,6 +6,7 @@ return [ ], 'fields' => [ 'market_id' => '市场', + 'market_ids' => '多选市场', 'title' => '标题', 'sub_title' => '副标题', 'cover' => '封面图', From 9370157064c8c7d07ca3af484db7ecd9127657b3 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Fri, 4 Sep 2020 10:26:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=B0v3=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/{ => v3}/BannerController.php | 0 .../{ => v3}/CategoryController.php | 0 .../Controllers/{ => v3}/GoodsController.php | 0 .../Controllers/{ => v3}/StoreController.php | 0 app/Admin/Repositories/{ => v3}/Banner.php | 0 app/Admin/Repositories/{ => v3}/Goods.php | 0 app/Admin/Repositories/{ => v3}/Store.php | 0 app/Models/{ => v3}/Banner.php | 0 app/Models/{ => v3}/Category.php | 0 app/Models/v3/CouponSetting.php | 16 ++++++ app/Models/v3/CouponTie.php | 15 +++++ app/Models/{ => v3}/Goods.php | 0 app/Models/{ => v3}/GoodsBanners.php | 0 app/Models/v3/ImsCjdcMarket.php | 57 +++++++++++++++++++ app/Models/v3/ImsCjdcUser.php | 48 ++++++++++++++++ app/Models/v3/LanzuMmInfo.php | 46 +++++++++++++++ app/Models/{ => v3}/Store.php | 0 17 files changed, 182 insertions(+) rename app/Admin/Controllers/{ => v3}/BannerController.php (100%) rename app/Admin/Controllers/{ => v3}/CategoryController.php (100%) rename app/Admin/Controllers/{ => v3}/GoodsController.php (100%) rename app/Admin/Controllers/{ => v3}/StoreController.php (100%) rename app/Admin/Repositories/{ => v3}/Banner.php (100%) rename app/Admin/Repositories/{ => v3}/Goods.php (100%) rename app/Admin/Repositories/{ => v3}/Store.php (100%) rename app/Models/{ => v3}/Banner.php (100%) rename app/Models/{ => v3}/Category.php (100%) create mode 100644 app/Models/v3/CouponSetting.php create mode 100644 app/Models/v3/CouponTie.php rename app/Models/{ => v3}/Goods.php (100%) rename app/Models/{ => v3}/GoodsBanners.php (100%) create mode 100644 app/Models/v3/ImsCjdcMarket.php create mode 100644 app/Models/v3/ImsCjdcUser.php create mode 100644 app/Models/v3/LanzuMmInfo.php rename app/Models/{ => v3}/Store.php (100%) diff --git a/app/Admin/Controllers/BannerController.php b/app/Admin/Controllers/v3/BannerController.php similarity index 100% rename from app/Admin/Controllers/BannerController.php rename to app/Admin/Controllers/v3/BannerController.php diff --git a/app/Admin/Controllers/CategoryController.php b/app/Admin/Controllers/v3/CategoryController.php similarity index 100% rename from app/Admin/Controllers/CategoryController.php rename to app/Admin/Controllers/v3/CategoryController.php diff --git a/app/Admin/Controllers/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php similarity index 100% rename from app/Admin/Controllers/GoodsController.php rename to app/Admin/Controllers/v3/GoodsController.php diff --git a/app/Admin/Controllers/StoreController.php b/app/Admin/Controllers/v3/StoreController.php similarity index 100% rename from app/Admin/Controllers/StoreController.php rename to app/Admin/Controllers/v3/StoreController.php diff --git a/app/Admin/Repositories/Banner.php b/app/Admin/Repositories/v3/Banner.php similarity index 100% rename from app/Admin/Repositories/Banner.php rename to app/Admin/Repositories/v3/Banner.php diff --git a/app/Admin/Repositories/Goods.php b/app/Admin/Repositories/v3/Goods.php similarity index 100% rename from app/Admin/Repositories/Goods.php rename to app/Admin/Repositories/v3/Goods.php diff --git a/app/Admin/Repositories/Store.php b/app/Admin/Repositories/v3/Store.php similarity index 100% rename from app/Admin/Repositories/Store.php rename to app/Admin/Repositories/v3/Store.php diff --git a/app/Models/Banner.php b/app/Models/v3/Banner.php similarity index 100% rename from app/Models/Banner.php rename to app/Models/v3/Banner.php diff --git a/app/Models/Category.php b/app/Models/v3/Category.php similarity index 100% rename from app/Models/Category.php rename to app/Models/v3/Category.php diff --git a/app/Models/v3/CouponSetting.php b/app/Models/v3/CouponSetting.php new file mode 100644 index 0000000..cf3889c --- /dev/null +++ b/app/Models/v3/CouponSetting.php @@ -0,0 +1,16 @@ +attributes['imgs'] = implode(',',$imgs); + } + } + + public function getImgsAttribute($imgs) + { + return explode(',',$imgs); + } + + public function mp(){ + return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id'); + } + + /** + * 获取市场信息 + * @return \Illuminate\Http\JsonResponse + */ + public static function getMarket() + { + $markets = self::select('id','name') + ->where('status',1) + ->whereNull('deleted_at') + ->get(); + $item = []; + foreach ($markets as $market) { + $item[$market->id] = $market->name; + } + return $item; + } + + /** + * 获取单个市场信息 + */ + public static function getMarketInfo($id,$field = '*') + { + return self::select($field)->find($id); + } + +} diff --git a/app/Models/v3/ImsCjdcUser.php b/app/Models/v3/ImsCjdcUser.php new file mode 100644 index 0000000..8a4a844 --- /dev/null +++ b/app/Models/v3/ImsCjdcUser.php @@ -0,0 +1,48 @@ +find($id); + } + + /** + * 获取用户数组 + * id为键，name为值 + * @return array + */ + public static function getUserArray() + { + $list = self::select('id','nick_name') + ->where('status',1) + ->whereNull('deleted_at') + ->get(); + $array = []; + if(count($list) > 0){ + foreach ($list as $value) { + $array[$value->id] = $value->nick_name; + } + } + + return $array; + } +} diff --git a/app/Models/v3/LanzuMmInfo.php b/app/Models/v3/LanzuMmInfo.php new file mode 100644 index 0000000..58af3f5 --- /dev/null +++ b/app/Models/v3/LanzuMmInfo.php @@ -0,0 +1,46 @@ +hasOne('\App\Models\LanzuMmWithdraw','mm_id','id'); + } + + /** + * 获取市场经理(只搜索状态为正常的经理) + * id为键，name为值 + */ + public static function getMmInfoArray() + { + $list = self::select('id','name') + ->where('status',2) + ->whereNull('deleted_at') + ->get(); + $array = []; + if(count($list) > 0){ + foreach ($list as $key => $value){ + $array[$value->id] = $value->name; + } + } + return $array; + } + + /** + * 根据id获取单条记录 + */ + public static function getMmInfo($id,$field = '*') + { + return self::select($field)->find($id); + } +} diff --git a/app/Models/Store.php b/app/Models/v3/Store.php similarity index 100% rename from app/Models/Store.php rename to app/Models/v3/Store.php From 14ed81440e7bb91d64ba138b11030cdd4cf4f14b Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Fri, 4 Sep 2020 11:07:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E6=96=87=E4=BB=B6=E6=8D=A2?= =?UTF-8?q?=E5=88=B0=E6=96=87=E4=BB=B6=E5=A4=B9v3-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=92=8C=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/StoreQRCode.php | 14 +++--- app/Admin/Controllers/v3/BannerController.php | 9 ++-- .../Controllers/v3/CategoryController.php | 4 +- app/Admin/Controllers/v3/GoodsController.php | 12 ++--- app/Admin/Controllers/v3/StoreController.php | 20 ++++---- app/Admin/Repositories/v3/Banner.php | 4 +- app/Admin/Repositories/v3/Goods.php | 4 +- app/Admin/Repositories/v3/Store.php | 4 +- app/Admin/routes.php | 12 ++--- app/Models/v3/Banner.php | 2 +- app/Models/v3/Category.php | 2 +- app/Models/v3/CouponSetting.php | 16 ------- app/Models/v3/CouponTie.php | 15 ------ app/Models/v3/Goods.php | 7 ++- app/Models/v3/GoodsBanners.php | 2 +- app/Models/v3/LanzuMmInfo.php | 46 ------------------- .../v3/{ImsCjdcMarket.php => Market.php} | 4 +- app/Models/v3/Store.php | 4 +- app/Models/v3/{ImsCjdcUser.php => User.php} | 9 +--- resources/lang/zh-CN/goods.php | 2 +- resources/lang/zh-CN/store.php | 4 +- 21 files changed, 55 insertions(+), 141 deletions(-) delete mode 100644 app/Models/v3/CouponSetting.php delete mode 100644 app/Models/v3/CouponTie.php delete mode 100644 app/Models/v3/LanzuMmInfo.php rename app/Models/v3/{ImsCjdcMarket.php => Market.php} (95%) rename app/Models/v3/{ImsCjdcUser.php => User.php} (93%) diff --git a/app/Admin/Common/StoreQRCode.php b/app/Admin/Common/StoreQRCode.php index bb40c95..7f639bb 100644 --- a/app/Admin/Common/StoreQRCode.php +++ b/app/Admin/Common/StoreQRCode.php @@ -48,16 +48,16 @@ class StoreQRCode extends AdminController */ public function SetPayWeChatCode($id) { - $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1); - if($isCREATE == 0){ + // $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1); + // if($isCREATE == 0){ $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/seller/fukuan'); $storeImgPath = 'QR_code/code_minipay_img/wx_minipay_'.$id.'.jpg'; - }else{ - $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan'); - $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg'; - // 裁剪 + // }else{ + // $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan'); + // $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg'; + // // 裁剪 - } + // } // 裁剪测试 // $this->imageManager->make()->resize(270,270)->insert($codeStore); diff --git a/app/Admin/Controllers/v3/BannerController.php b/app/Admin/Controllers/v3/BannerController.php index f6d7856..2ab494c 100644 --- a/app/Admin/Controllers/v3/BannerController.php +++ b/app/Admin/Controllers/v3/BannerController.php @@ -1,14 +1,14 @@ column('sort')->sortable(); - $grid->column('status')->using(BannerModel::$_status)->label(['default' => 'primary',1 => 'primary', 0 => 'danger']); + $grid->column('status')->switch(); + // ->using(BannerModel::$_status)->label(['default' => 'primary',1 => 'primary', 0 => 'danger']); $grid->filter(function (Grid\Filter $filter) { $filter->equal('id'); diff --git a/app/Admin/Controllers/v3/CategoryController.php b/app/Admin/Controllers/v3/CategoryController.php index ab0ffe9..3d61bca 100644 --- a/app/Admin/Controllers/v3/CategoryController.php +++ b/app/Admin/Controllers/v3/CategoryController.php @@ -1,8 +1,8 @@ column(6, function (Form $form) use($mmList,$marketList,$storeTypeList){ + $form->column(6, function (Form $form) use($mmList,$marketList,$categoryList){ $form->hidden('id'); $form->select('mm_user_id')->options($mmList); $form->select('market_id')->required()->options($marketList); - $form->select('store_type_id')->required()->options($storeTypeList); + $form->select('category_id')->options($categoryList); $form->text('name')->required()->maxLength(50); $form->image('logo')->required(); $form->mobile('tel'); diff --git a/app/Admin/Repositories/v3/Banner.php b/app/Admin/Repositories/v3/Banner.php index 18d3ba7..7f2bb8c 100644 --- a/app/Admin/Repositories/v3/Banner.php +++ b/app/Admin/Repositories/v3/Banner.php @@ -1,8 +1,8 @@ resource('/storeUserReport', 'StoreUserReportController'); // 分类 - $router->resource('/category', 'CategoryController'); - $router->get('/category/TieForm', 'CategoryTieController@CategoryTieForm'); + $router->resource('/category', 'v3\CategoryController'); + $router->get('/category/TieForm', 'v3\CategoryTieController@CategoryTieForm'); // 店铺 - $router->resource('/store', 'StoreController'); + $router->resource('/store', 'v3\StoreController'); // 商品 - $router->resource('/goods', 'GoodsController'); + $router->resource('/goods', 'v3\GoodsController'); // banner - $router->resource('/banner', 'BannerController'); - + $router->resource('/banner', 'v3\BannerController'); }); + diff --git a/app/Models/v3/Banner.php b/app/Models/v3/Banner.php index 3237a3a..7631409 100644 --- a/app/Models/v3/Banner.php +++ b/app/Models/v3/Banner.php @@ -1,6 +1,6 @@ hasMany('\App\Models\GoodsBanners','goods_id','id')->where('type',1); + return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',1); } public function VideoBanners(){ - return $this->hasMany('\App\Models\GoodsBanners','goods_id','id')->where('type',2); + return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',2); } diff --git a/app/Models/v3/GoodsBanners.php b/app/Models/v3/GoodsBanners.php index 8afe7fd..21dfc7d 100644 --- a/app/Models/v3/GoodsBanners.php +++ b/app/Models/v3/GoodsBanners.php @@ -1,6 +1,6 @@ hasOne('\App\Models\LanzuMmWithdraw','mm_id','id'); - } - - /** - * 获取市场经理(只搜索状态为正常的经理) - * id为键，name为值 - */ - public static function getMmInfoArray() - { - $list = self::select('id','name') - ->where('status',2) - ->whereNull('deleted_at') - ->get(); - $array = []; - if(count($list) > 0){ - foreach ($list as $key => $value){ - $array[$value->id] = $value->name; - } - } - return $array; - } - - /** - * 根据id获取单条记录 - */ - public static function getMmInfo($id,$field = '*') - { - return self::select($field)->find($id); - } -} diff --git a/app/Models/v3/ImsCjdcMarket.php b/app/Models/v3/Market.php similarity index 95% rename from app/Models/v3/ImsCjdcMarket.php rename to app/Models/v3/Market.php index 91bee9e..e4a1788 100644 --- a/app/Models/v3/ImsCjdcMarket.php +++ b/app/Models/v3/Market.php @@ -1,12 +1,12 @@ [ 'name' => '商品名称', - 'goods_type_id' => '商品所属分类', + 'category_id' => '商品所属分类', 'store_id' => '所属商家', 'cover_img' => '封面图', 'cover_img_url' => '封面图', diff --git a/resources/lang/zh-CN/store.php b/resources/lang/zh-CN/store.php index e7954f0..06158de 100644 --- a/resources/lang/zh-CN/store.php +++ b/resources/lang/zh-CN/store.php @@ -21,8 +21,8 @@ return [ 'introduction' => '商家简介', 'coordinates' => '经纬度', 'business_license' => '营业资质', - 'store_type_id' => '店铺所属分类', - 'store_type_name' => '店铺分类', + 'category_id' => '店铺所属分类', + 'category_name' => '店铺分类', 'is_open' => '开启门店', 'sort' => '排序', 'user_id' => '提现用户',