diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index a37ab3b..b2d0296 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -132,20 +132,19 @@ class GoodsActivityController extends AdminController // 店铺 $storeList = StoreModel::getStoreArray(); //市场 - // $marketList = MarketModel::getMarketArray(); + $marketList = MarketModel::getMarketArray(); - $form->column(6, function (Form $form) use($storeList,$categoryList ){ + $form->column(6, function (Form $form) use($marketList,$storeList,$categoryList ){ $form->text('goods_id')->default(0)->help('输入正常商品id，用于关联商品。'); $form->hidden('market_id')->default(0); + $form->multipleSelect('market_ids')->options($marketList)->help('不选则适用所有市场'); $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list'); $form->select('goods_category_id'); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); $form->image('cover_img')->required()->uniqueName(); $form->select('type')->options(GoodsActivityModel::$_type)->default('flash_sale'); - $form->datetime('expire_time')->value($form->model()->expire_time_text); - $form->number('time_limit_days'); - + $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->help($form->model()->expire_time_text); }); $form->column(6, function (Form $form) { $form->currency('price')->required()->floatTwo()->symbol('￥'); @@ -154,9 +153,10 @@ class GoodsActivityController extends AdminController $form->text('goods_unit')->help('如：斤，个，盒，500克，1000克，1500克等'); $form->radio('is_infinite')->options(['关闭','开启'])->default(1); $form->number('inventory')->required()->attribute('min', 1)->default(1); - $form->number('restrict_num')->attribute('min', 0)->default(0)->help('0表示不限购'); + $form->number('restrict_num')->attribute('min', 0)->default(0)->help('0表示不限购，单笔订单限购数量'); $form->number('start_num')->attribute('min', 1)->default(1); - $form->number('time_limit_num'); + $form->number('time_limit_days')->help('A时间段内限购'); + $form->number('time_limit_num')->help('A时间段内限购的数量'); $form->switch('can_use_coupon'); }); $form->column(12, function (Form $form) { @@ -191,11 +191,49 @@ class GoodsActivityController extends AdminController }); $form->saving(function (Form $form){ $storeId = $form->input('store_id'); + $marketIds = $form->input('market_ids'); + $tags = $form->input('tags'); + $spec = $form->input('spec'); + $detailsImgs = $form->input('details_imgs'); + $goodsCategoryId = $form->input('goods_category_id'); if(!empty($storeId)){ // 商品所属市场，根据店铺查询市场 $info = StoreModel::getStoreInfo($storeId,'market_id'); $form->market_id = $info->market_id; } + + $marketIdsArr = []; + if(!empty($marketIds)){ + foreach($marketIds as $km => $marketId){ + if(empty($marketId)){ + unset($marketIds[$km]); + continue; + } + $marketIdsArr[] = $marketId; + } + } + $form->marketIds = json_encode($marketIdsArr); + + $tagsArr = []; + if(!empty($tags)){ + foreach($tags as $kt => $tag){ + if(empty($tag)){ + unset($tags[$kt]); + continue; + } + $tagsArr[] = $tag; + } + }; + $form->tags = json_encode($tagsArr); + if($storeId && empty($spec)){ + $form->spec = []; + } + if($storeId && empty($detailsImgs)){ + $form->details_imgs = []; + } + if($storeId && empty($goodsCategoryId)){ + $form->goods_category_id = 0; + } }); $form->disableResetButton(); $form->disableViewCheck(); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 0b0cd36..a788312 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -12,6 +12,7 @@ use App\Models\v3\Category as CategoryModel; use App\Models\v3\Store as StoreModel; use Dcat\Admin\Form\NestedForm; use App\Models\v3\Goods as GoodsModel; +use App\Models\v3\GoodsBanners as GoodsBannersModel; use App\Models\v3\Market as MarketModel; use Dcat\Admin\Grid\Displayers\Actions; use App\Models\v3\GoodsCategory as GoodsCategoryModel; @@ -181,7 +182,7 @@ class GoodsController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->width(2)->uniqueName(); + $form->image('path')->required()->width(2)->uniqueName(); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); @@ -216,23 +217,39 @@ class GoodsController extends AdminController $form->disableCreatingCheck(); }); $form->saving(function (Form $form){ + $id = $form->getKey; $storeId = $form->input('store_id'); - + $tags = $form->input('tags'); + $spec = $form->input('spec'); + $detailsImgs = $form->input('details_imgs'); + $goodsCategoryId = $form->input('goods_category_id'); + if(!empty($storeId)){ // 商品所属市场，根据店铺查询市场 $info = StoreModel::getStoreInfo($storeId,'market_id'); $form->market_id = $info->market_id; } - $tags = $form->input('tags'); + $tagsArr = []; - foreach($tags as $kt => $tag){ - if(empty($tag)){ - unset($tags[$kt]); - continue; + if(!empty($tags)){ + foreach($tags as $kt => $tag){ + if(empty($tag)){ + unset($tags[$kt]); + continue; + } + $tagsArr[] = $tag; } - $tagsArr[] = $tag; - } + }; $form->tags = json_encode($tagsArr); + if($storeId && empty($spec)){ + $form->spec = []; + } + if($storeId && empty($detailsImgs)){ + $form->details_imgs = []; + } + if($storeId && empty($goodsCategoryId)){ + $form->goods_category_id = 0; + } }); }); } diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index a32cfa8..40af02a 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -233,8 +233,12 @@ class GoodsNewController extends AdminController $form->disableCreatingCheck(); }); $form->saving(function (Form $form){ - // $storeId = $form->input('store_id'); + $storeId = $form->input('store_id'); + $tags = $form->input('tags'); + $spec = $form->input('spec'); + $detailsImgs = $form->input('details_imgs'); + $goodsCategoryId = $form->input('goods_category_id'); // 商品所属市场，根据店铺查询市场 // $info = StoreModel::getStoreInfo($storeId,'market_id'); // $form->market_id = $info->market_id; @@ -252,6 +256,16 @@ class GoodsNewController extends AdminController $form->tags = json_encode($tagsArr); } + + if($storeId && empty($spec)){ + $form->spec = []; + } + if($storeId && empty($detailsImgs)){ + $form->details_imgs = []; + } + if($storeId && empty($goodsCategoryId)){ + $form->goods_category_id = 0; + } }); }); } diff --git a/app/Console/Commands/MigrateFePrint.php b/app/Console/Commands/MigrateFePrint.php index ff4cda1..121bef0 100644 --- a/app/Console/Commands/MigrateFePrint.php +++ b/app/Console/Commands/MigrateFePrint.php @@ -40,7 +40,7 @@ class MigrateFePrint extends Command public function handle() { $oldTableName = 'ims_cjdc_feprint'; - $newTableName = 'lanzu_feprint_copy'; + $newTableName = 'lanzu_feprint'; // 判断表是否存在 if(!Schema::hasTable($oldTableName)){ var_dump('旧表不存在'); @@ -58,14 +58,14 @@ class MigrateFePrint extends Command foreach ($oldData as $key => $value) { $newData[] = [ 'id' => $value->id, - 'name' => $value->name, - 'sn' => $value->sn, - 'market_id' => $value->market_id , - 'simnum' => $value->simnum, - 'addtime' => $value->addtime, - 'status' => $value->status, + 'name' => $value->name ?? '', + 'sn' => $value->sn ?? '', + 'market_id' => $value->market_id ?? 0, + 'simnum' => $value->simnum ?? 0 , + 'addtime' => $value->addtime ?? 0, + 'status' => $value->status ?? 0, - 'created_at' => strtotime($value->addtime), + 'created_at' => $value->addtime ? strtotime($value->addtime) : 0, 'updated_at' => time(), ]; diff --git a/app/Console/Commands/MigrateMarketData.php b/app/Console/Commands/MigrateMarketData.php index f36d224..d5ecae8 100644 --- a/app/Console/Commands/MigrateMarketData.php +++ b/app/Console/Commands/MigrateMarketData.php @@ -40,7 +40,7 @@ class MigrateMarketData extends Command { // get old data from old table - $oldData = DB::table('ims_cjdc_market_new')->get(); + $oldData = DB::table('ims_cjdc_market')->get(); $bar = $this->output->createProgressBar(count($oldData)); $bar->start(); @@ -65,7 +65,7 @@ class MigrateMarketData extends Command 'status' => $value->status ?? 1, 'sort' => $value->sort ?? 1, 'created_at' => $value->addtime ? strtotime($value->addtime) : 0, - 'updated_at' => $value->addtime ? strtotime($value->addtime) : 0, + 'updated_at' => time(), ]; $bar->advance(); diff --git a/app/Console/Commands/MigrateOrder.php b/app/Console/Commands/MigrateOrder.php index 7151b18..ecefbac 100644 --- a/app/Console/Commands/MigrateOrder.php +++ b/app/Console/Commands/MigrateOrder.php @@ -82,7 +82,7 @@ class MigrateOrder extends Command 'total_refund_note' => $main->total_refund_note ?? '', 'note' => $main->note ?? '', 'created_at' => $main->time_add ?? 0, - 'updated_at' => 0, + 'updated_at' => time(), ]; $newMainId = DB::table('lanzu_order_main')->insertGetId($dataMain); @@ -103,7 +103,7 @@ class MigrateOrder extends Command '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, + 'updated_at' => time(), ]; $newChildId = DB::table('lanzu_order')->insertGetId($dataChild); @@ -128,6 +128,7 @@ class MigrateOrder extends Command 'created_at' => time(), 'updated_at' => time(), 'refuse_refund_note' => '', + 'note' => '', ]; } DB::table('lanzu_order_goods')->insert($dataGoods); diff --git a/app/Console/Commands/MigrateStoreBalance.php b/app/Console/Commands/MigrateStoreBalance.php index 84a99b2..0d3464c 100644 --- a/app/Console/Commands/MigrateStoreBalance.php +++ b/app/Console/Commands/MigrateStoreBalance.php @@ -70,16 +70,15 @@ class MigrateStoreBalance extends Command foreach($newData as $store_id => $money){ $exist = DB::table($newBalanceTableName)->where('source_id',$store_id)->where('user_type',5)->exists(); if($exist){ - $saveData = [ - 'balance' => number_format($money,2,'.',''), - 'updated_at' => time() - ]; - // var_dump($saveData); - // return 0; - $res = DB::table($newBalanceTableName)->where('source_id',$store_id)->where('user_type',5)->update($saveData); - if(!$res){ - $error[] = ['store_id'=>$store_id,'money'=>$money]; - } + $error[] = ['store_id'=>$store_id,'money'=>$money,'msg'=>'已存在']; + // $saveData = [ + // 'balance' => number_format($money,2,'.',''), + // 'updated_at' => time() + // ]; + // $res = DB::table($newBalanceTableName)->where('source_id',$store_id)->where('user_type',5)->increment('balance',$saveData['balance']); + // if(!$res){ + // $error[] = ['store_id'=>$store_id,'money'=>$money]; + // } }else{ $saveData = [ 'source_id' => $store_id, @@ -87,8 +86,6 @@ class MigrateStoreBalance extends Command 'balance' => number_format($money,2,'.',''), 'updated_at' => time() ]; - // var_dump($saveData); - // return 0; $res = DB::table($newBalanceTableName)->insert($saveData); if(!$res){ $error[] = ['store_id'=>$store_id,'money'=>$money]; diff --git a/app/Console/Commands/MigrateUserAddr.php b/app/Console/Commands/MigrateUserAddr.php index 930e526..d724190 100644 --- a/app/Console/Commands/MigrateUserAddr.php +++ b/app/Console/Commands/MigrateUserAddr.php @@ -74,7 +74,7 @@ class MigrateUserAddr extends Command 'tel' => $value->tel == 'undefined'? '': $value->tel, 'doorplate' => $doorplate, 'is_default' => $value->is_default ?? 0, - 'tags' => json_encode(''), + 'tags' => json_encode([]), 'created_at' => time(), 'updated_at' => time(), ]; diff --git a/app/Models/v3/GoodsActivity.php b/app/Models/v3/GoodsActivity.php index 7bcf306..2a2aa45 100644 --- a/app/Models/v3/GoodsActivity.php +++ b/app/Models/v3/GoodsActivity.php @@ -23,7 +23,8 @@ class GoodsActivity extends Model protected $casts = [ 'details_imgs'=>'array', - 'tags'=>'array', + // 'tags'=>'array', + // 'market_ids'=>'array', 'spec'=>'array', ]; diff --git a/resources/lang/zh-CN/goods-activity.php b/resources/lang/zh-CN/goods-activity.php index af1f1f8..ae43209 100644 --- a/resources/lang/zh-CN/goods-activity.php +++ b/resources/lang/zh-CN/goods-activity.php @@ -9,7 +9,8 @@ return [ 'type' => '活动类型', 'type_text' => '活动类型', 'goods_id' => '原始商品', - 'market_id' => '市场', + 'market_id' => '所属市场', + 'market_ids' => '适用市场', 'store_id' => '商家', 'category_id' => '分类', 'goods_category_id' => '商品类目',