diff --git a/app/Admin/Controllers/LeadyController.php b/app/Admin/Controllers/LeadyController.php new file mode 100644 index 0000000..a790c76 --- /dev/null +++ b/app/Admin/Controllers/LeadyController.php @@ -0,0 +1,17 @@ +price); + dd(111); + } +} diff --git a/modules/Mall/Http/Controllers/Admin/GoodsController.php b/modules/Mall/Http/Controllers/Admin/GoodsController.php index e5e6918..1acf480 100644 --- a/modules/Mall/Http/Controllers/Admin/GoodsController.php +++ b/modules/Mall/Http/Controllers/Admin/GoodsController.php @@ -9,6 +9,9 @@ use Encore\Admin\Grid; use Illuminate\Support\Arr; use Illuminate\Support\MessageBag; use Illuminate\Support\Str; +use Modules\Mall\Http\Controllers\Admin\Action\Goods\Down; +use Modules\Mall\Http\Controllers\Admin\Action\Goods\SkuAction; +use Modules\Mall\Http\Controllers\Admin\Action\Goods\Up; use Modules\Mall\Models\Brand; use Modules\Mall\Models\Category; use Modules\Mall\Models\Delivery; @@ -49,6 +52,20 @@ class GoodsController extends AdminController }); }); + $grid->actions(function (Grid\Displayers\Actions $actions) { + $actions->disableView(); + $actions->disableDelete(); + + if ($actions->row->status == Goods::STATUS_UP) { + $actions->add(new Down()); + } + if ($actions->row->status == Goods::STATUS_DOWN) { + $actions->add(new Up()); + } + if ($actions->row->type == Goods::TYPE_MULTIPLE) { + $actions->add(new SkuAction()); + } + }); $grid->model() ->with(['category', 'shop', 'delivery']) ->withCount(['specs', 'skus']) diff --git a/modules/Mall/Models/Goods.php b/modules/Mall/Models/Goods.php index 8b22036..8be5189 100644 --- a/modules/Mall/Models/Goods.php +++ b/modules/Mall/Models/Goods.php @@ -31,8 +31,8 @@ class Goods extends Model const TYPE_SINGLE = 1; const TYPE_MULTIPLE = 2; const TYPE_MAP = [ - self::TYPE_SINGLE => '单规格', - // self::TYPE_MULTIPLE => '多规格', + self::TYPE_SINGLE => '单规格', + self::TYPE_MULTIPLE => '多规格', ]; /** * 状态 diff --git a/modules/Mall/Models/GoodsSku.php b/modules/Mall/Models/GoodsSku.php index 2732a27..ec1040c 100644 --- a/modules/Mall/Models/GoodsSku.php +++ b/modules/Mall/Models/GoodsSku.php @@ -59,4 +59,25 @@ class GoodsSku extends Model return false; } + /** + * @Notes : 检测商品价格，给出最低售价 + * + * @Date : 2022/6/30 11:41 + * @param float $cost + * @param float $price + * @return float + * @author : Mr.wang + */ + public static function verifyPrice(float $cost, float $price): float + { + return 0; + $costPercent = app('Conf_mall')['cost_percent'] ?? 70; + $up = ceil(bcdiv($cost, bcdiv($costPercent, 100, 4), 2)); + if ($price < $up) { + return $up; + } else { + return 0; + } + } + } diff --git a/modules/Mall/Routes/admin.php b/modules/Mall/Routes/admin.php index 1c395d4..fb90742 100644 --- a/modules/Mall/Routes/admin.php +++ b/modules/Mall/Routes/admin.php @@ -41,6 +41,8 @@ Route::group([ /** * 商品管理 */ + $router->get('goods/{goods}/multiple', 'SkuMultipleController@index'); + $router->post('goods/{goods}/multiple', 'SkuMultipleController@store'); $router->resource('goods', 'GoodsController'); $router->resource('goods.skus', 'SkuController'); $router->resource('goods.specs', 'SpecController'); diff --git a/modules/User/Config/config.php b/modules/User/Config/config.php index df3b2b0..3a606c2 100644 --- a/modules/User/Config/config.php +++ b/modules/User/Config/config.php @@ -57,6 +57,14 @@ return [ 'length' => 10, ], + 'experience' => [ + 'end_at' => '2023-08-31',//截止时间 + 'service' => [ + 'bank' => '中国银行深圳证券交易所支行', + 'bank_no' => '762773656978', + ], + ], + /* |-------------------------------------------------------------------------- | 社会化登录平台配置(暂时加入支付宝，微信，抖音的配置信息) diff --git a/modules/User/Config/identity.php b/modules/User/Config/identity.php index c2d11e2..210da69 100644 --- a/modules/User/Config/identity.php +++ b/modules/User/Config/identity.php @@ -12,4 +12,15 @@ return [ 'rules' => [ 'give_crystal' => '开通赠水滴', ], + 'rules' => [ + 'give_crystal' => '开通会员送水滴', + 'open_nk' => '开通年卡折扣', + ], + 'show_rules' => [ + 'give_crystal' => '尊贵标识', + 'open_get_goods' => '会员价', + 'vips' => '会员福利', + 'recommend_coupon' => '饮水知识', + 'open_nk' => '专属身份', + ], ]; \ No newline at end of file diff --git a/modules/User/Http/Controllers/Api/Identity/IndexController.php b/modules/User/Http/Controllers/Api/Identity/IndexController.php index 370293d..a2f18e6 100644 --- a/modules/User/Http/Controllers/Api/Identity/IndexController.php +++ b/modules/User/Http/Controllers/Api/Identity/IndexController.php @@ -116,7 +116,7 @@ class IndexController extends Controller $price = $request->price ?? 0; $validator = \Validator::make($request->all(), [ - 'name' => 'required', + // 'name' => 'required', // 'card_no' => 'required|numeric', 'cover' => 'required', 'price' => 'required', diff --git a/modules/User/Models/Identity.php b/modules/User/Models/Identity.php index 3588f41..ab8ecf1 100644 --- a/modules/User/Models/Identity.php +++ b/modules/User/Models/Identity.php @@ -118,12 +118,15 @@ class Identity extends Model public function getRules() { $rules = $this->ruleshows; - foreach ($rules as $key => $rule) { - if (isset($rule['icon'])) { - $rules[$key]['cover'] = $this->parseImageUrl($rule['icon']); + if ($rules) { + foreach ($rules as $key => $rule) { + if (isset($rule['icon'])) { + $rules[$key]['cover'] = $this->parseImageUrl($rule['icon']); + } + $rules[$key]['text'] = Arr::get(config('identity.show_rules'), $rule['name']); } - $rules[$key]['text'] = Arr::get(config('identity.show_rules'), $rule['name']); } + return $rules; } diff --git a/modules/User/Models/Traits/HasStock.php b/modules/User/Models/Traits/HasStock.php index 2b38912..8adbffb 100644 --- a/modules/User/Models/Traits/HasStock.php +++ b/modules/User/Models/Traits/HasStock.php @@ -4,12 +4,6 @@ namespace Modules\User\Models\Traits; use Illuminate\Database\Eloquent\Relations\HasOne; -use Illuminate\Support\Arr; -use Modules\Mall\Facades\Item; -use Modules\Mall\Facades\Order as OrderFacade; -use Modules\Mall\Models\Address; -use Modules\Mall\Models\Goods; -use Modules\Mall\Models\GoodsSku; use Modules\Mall\Models\Order; use Modules\Mall\Models\OrderItem; use Modules\User\Models\Identity;