+
+
+
+
+
diff --git a/resources/frontend/src/api/goods.js b/resources/frontend/src/api/goods.js
new file mode 100644
index 0000000..9a05dc4
--- /dev/null
+++ b/resources/frontend/src/api/goods.js
@@ -0,0 +1,10 @@
+import http from '@/util/http.js'
+
+// 商品管理列表
+export function goods (data) {
+ return http({
+ url: '/api/goods',
+ method: 'get',
+ data
+ })
+}
\ No newline at end of file
diff --git a/resources/frontend/src/api/menu.js b/resources/frontend/src/api/menu.js
new file mode 100644
index 0000000..29068f0
--- /dev/null
+++ b/resources/frontend/src/api/menu.js
@@ -0,0 +1,9 @@
+import http from '@/util/http.js'
+
+// 商品管理列表
+export function getMenu () {
+ return http({
+ url: '/api/menus',
+ method: 'get'
+ })
+}
diff --git a/resources/frontend/src/api/rankingData.js b/resources/frontend/src/api/rankingData.js
new file mode 100644
index 0000000..0fe9b1a
--- /dev/null
+++ b/resources/frontend/src/api/rankingData.js
@@ -0,0 +1,109 @@
+/*
+ * @Description: 排名
+ * @Author: chenzhiwei (725551805@qq.com)
+ * @Date: 2021-08-02 16:09:41
+ * @LastEditors: czw (725551805@qq.com)
+ * @LastEditTime: 2022-03-03 22:17:09
+ * @FilePath: /glxt/src/api/rankingData.js
+ */
+
+import http from '@/util/http.js'
+// export function rankingData(data) {
+// // 传递参数
+// return http({
+// url: "newh5app/api/mobile/v1/music/rank/16/",
+// method: "get",
+// params: data // 传递参数
+// });
+// }
+
+export function postadd (params) {
+ // 传递id
+ return http({
+ url: '/api/admin/auth/login', // 传递id
+ method: 'post',
+ params: params
+ })
+}
+
+// 列表
+export function store_list (params) {
+ return http({
+ url: '/api/admin/shopGroups',
+ method: 'get',
+ params: params
+ })
+}
+
+export function storeDetail (params) {
+ return http({
+ url: '/storess/show',
+ method: 'get',
+ params: params
+ })
+}
+// 鲜花项目接口从这里开始
+// 商品种类列表
+export function goods_types (data) {
+ return http({
+ url: '/api/goods_types',
+ method: 'get',
+ data
+ })
+}
+// 商品种类列表删除
+export function Delgoods_types (id) {
+ return http({
+ url: `/api/goods_types/${id}`,
+ method: 'delete',
+
+ })
+}
+// 新增种类
+export function Addgoods_types (data) {
+ return http({
+ url: `/api/goods_types/`,
+ method: 'post',
+ data
+ })
+}
+// 编辑种类
+export function editGoods_types (id,data) {
+ return http({
+ url: `/api/goods_types/${id}`,
+ method: 'patch',
+ data
+ })
+}
+// 商品品牌列表
+export function Brand_goods_types (data) {
+ return http({
+ url: '/api/goods_brands',
+ method: 'get',
+ data
+ })
+}
+// 商品品牌列表删除
+export function DelBrand_goods_types (id) {
+ return http({
+ url: `/api/goods_brands/${id}`,
+ method: 'delete',
+
+ })
+}
+// 新增品牌
+export function AddBrandgoods_types (data) {
+ return http({
+ url: '/api/goods_brands',
+ method: 'post',
+ data
+ })
+}
+// 编辑品牌
+export function editBrand_types(id,data) {
+ return http({
+ url: `/api/goods_brands/${id}`,
+ method: 'patch',
+ data
+ })
+}
\ No newline at end of file
diff --git a/resources/frontend/src/assets/logo.png b/resources/frontend/src/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43
GIT binary patch
literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s
+
+
+
+
+
+
diff --git a/resources/frontend/src/css/style.css b/resources/frontend/src/css/style.css
new file mode 100644
index 0000000..ec6bae8
--- /dev/null
+++ b/resources/frontend/src/css/style.css
@@ -0,0 +1,12 @@
+* {
+ padding: 0 0;
+ margin: 0 0;
+}
+body,html {
+ width: 100%;
+ height: 100%;
+ overflow-y: hidden;
+}
+ul {
+ list-style: none;
+}
\ No newline at end of file
diff --git a/resources/frontend/src/main.js b/resources/frontend/src/main.js
new file mode 100644
index 0000000..047ff6a
--- /dev/null
+++ b/resources/frontend/src/main.js
@@ -0,0 +1,25 @@
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
+import store from './store'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+import '@/css/style.css'
+import './router/index2'
+
+
+// import Router from 'vue-router'
+// const routerPush = Router.prototype.push
+// Router.prototype.push = function push(location) {
+// return routerPush.call(this, location).catch(error=> error)
+// }
+
+Vue.use(ElementUI)
+
+Vue.config.productionTip = false
+
+new Vue({
+ router,
+ store,
+ render: h => h(App)
+}).$mount('#app')
diff --git a/resources/frontend/src/router/index.js b/resources/frontend/src/router/index.js
new file mode 100644
index 0000000..b9b8f45
--- /dev/null
+++ b/resources/frontend/src/router/index.js
@@ -0,0 +1,12 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+
+Vue.use(VueRouter)
+
+const createRouter = () =>
+ new VueRouter({
+ scrollBehavior: () => ({ y: 0 })
+ })
+
+const router = createRouter()
+export default router
diff --git a/resources/frontend/src/router/index1.js b/resources/frontend/src/router/index1.js
new file mode 100644
index 0000000..96e376b
--- /dev/null
+++ b/resources/frontend/src/router/index1.js
@@ -0,0 +1,77 @@
+/*
+ * @Description:
+ * @Author: czw (725551805@qq.com)
+ * @Date: 2022-02-25 10:40:17
+ * @LastEditors: czw (725551805@qq.com)
+ * @LastEditTime: 2022-03-01 20:29:32
+ * @FilePath: /glxt/src/router/index1.js
+ */
+
+const list = [
+ {
+ path: '/logo',
+ name: 'logo',
+ component: () => import('../views/logo.vue')
+ },
+ {
+ path: '/',
+ component: () => import('../views/index.vue'),
+ children: [
+ {
+ path: 'GOODS_LIST',
+ name: '商品列表',
+ component: () => import('../views/yingyeting/yingyeting.vue')
+ },
+ {
+ path: 'GOODS_TYPE',
+ name: '商品种类',
+ component: () => import('../views/home/home.vue')
+ },
+ {
+ path: 'GOODS_BRAND',
+ name: '商品品牌',
+ component: () => import('../views/brand/brand.vue')
+ },
+ {
+ path: 'SHOP_MANAGE',
+ name: '店铺管理',
+ component: () => import('../views/store/store.vue')
+ },
+ {
+ path: 'USER_MANAGE',
+ name: '用户管理',
+ component: () => import('../views/users/users.vue')
+ },
+ {
+ path: 'ROLE_MANAGE',
+ name: '角色管理',
+ component: () => import('../views/system/role.vue')
+ },
+ {
+ path: 'PERMISSION_MANAGE',
+ name: '权限管理',
+ component: () => import('../views/system/authority.vue')
+ },
+ {
+ path: 'SYSTEM_LOG',
+ name: '商品记录',
+ component: () => import('../views/shuju/shuju.vue')
+ },
+ {
+ path: '/index/yingyeting/addgoods',
+ name: '新建商品',
+ component: () => import('../views/yingyeting/addgoods/addgoods.vue')
+ },
+ {
+ path: '/',
+ redirect: 'GOODS_LIST'
+ }
+ ]
+ },
+ {
+ path: '/',
+ redirect: '/index'
+ }
+]
+
+export default list
diff --git a/resources/frontend/src/router/index2.js b/resources/frontend/src/router/index2.js
new file mode 100644
index 0000000..a9ef295
--- /dev/null
+++ b/resources/frontend/src/router/index2.js
@@ -0,0 +1,18 @@
+/*
+ * @Description:
+ * @Author: czw (725551805@qq.com)
+ * @Date: 2022-02-25 10:40:25
+ * @LastEditors: czw (725551805@qq.com)
+ * @LastEditTime: 2022-02-25 12:18:31
+ * @FilePath: /glxt/src/router/index2.js
+ */
+
+import router from './index'
+import Home from './index1'
+// console.log(...Home);
+
+Home.forEach(element => {
+ router.addRoute(element) // 动态添加更多的路由规则
+})
+
+// 菜单路由数据
diff --git a/resources/frontend/src/store/index.js b/resources/frontend/src/store/index.js
new file mode 100644
index 0000000..332b916
--- /dev/null
+++ b/resources/frontend/src/store/index.js
@@ -0,0 +1,15 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+ state: {
+ },
+ mutations: {
+ },
+ actions: {
+ },
+ modules: {
+ }
+})
diff --git a/resources/frontend/src/util/auth.js b/resources/frontend/src/util/auth.js
new file mode 100644
index 0000000..9f228e9
--- /dev/null
+++ b/resources/frontend/src/util/auth.js
@@ -0,0 +1,13 @@
+const TokenKey = 'admin_token'
+// 获取token
+export function getToken () {
+ return localStorage.getItem(TokenKey)
+}
+// 设置token
+export function setToken (token) {
+ return localStorage.setItem(TokenKey, token)
+}
+// 删除token
+export function removeToken () {
+ return localStorage.removeItem(TokenKey)
+}
diff --git a/resources/frontend/src/util/http.js b/resources/frontend/src/util/http.js
new file mode 100644
index 0000000..01b9817
--- /dev/null
+++ b/resources/frontend/src/util/http.js
@@ -0,0 +1,82 @@
+/*
+ * @Description: api请求
+ * @Author: chenzhiwei (725551805@qq.com)
+ * @Date: 2021-08-02 15:52:34
+ * @LastEditors: czw (725551805@qq.com)
+ * @LastEditTime: 2022-03-13 11:05:08
+ * @FilePath: /glxt/src/util/http.js
+ */
+import axios from 'axios'
+import { getToken } from '@/util/auth'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import { Message } from 'element-ui'
+import router from '@/router'
+var instance = axios.create({
+
+ timeout: 10000
+})
+
+instance.interceptors.request.use(
+ config => {
+ // config.headers['content-type'] = 'application/json'
+
+ // config.headers['Shop-Id'] = localStorage.getItem('shopId') || 1
+
+ // 在发送请求之前做些什么
+ // config.headers.Authorization = 'Bearer' + getToken() // 请求头
+ // config.headers['content-type'] = 'application/json'
+ config.headers.Authorization = 'Bearer ' + getToken() // 请求头
+ NProgress.start()
+ console.log(config, '1111') // for debug
+
+ return config
+ },
+ error => {
+ // 对请求错误做些什么
+ console.log(error, '222222') // for debug
+ return Promise.reject(error)
+ }
+)
+
+// 添加响应拦截器
+instance.interceptors.response.use(
+ response => {
+ NProgress.done()
+ const res = response.status
+ // 对响应数据做点什么
+ console.log(response, '33333') // for debug
+ if (res === 200 || res === 201) {
+ return response
+ } else {
+ Message({
+ message: 'Error',
+ type: 'error'
+
+ })
+ }
+ },
+ error => {
+ // 对响应错误做点什么
+
+ console.log(error, '44444') // for debug
+ // if (error.response.status === 401) {
+ // Message({
+ // message: '账户登录过期,请重新登录',
+ // type: 'error'
+
+ // })
+ // router.push('/login')
+ // } else {
+ // Message({
+ // message: error.response || 'Error',
+ // type: 'error'
+
+ // })
+ // }
+
+ return Promise.reject(error)
+ }
+)
+
+export default instance
diff --git a/resources/frontend/src/util/remoteLoad.js b/resources/frontend/src/util/remoteLoad.js
new file mode 100644
index 0000000..cbf3257
--- /dev/null
+++ b/resources/frontend/src/util/remoteLoad.js
@@ -0,0 +1,64 @@
+/*
+ * @Author: 陈智伟 9459156+chen-kaitao@user.noreply.gitee.com
+ * @Date: 2021-10-05 11:34:34
+ * @LastEditors: 陈智伟 9459156+chen-kaitao@user.noreply.gitee.com
+ * @LastEditTime: 2022-07-23 10:20:28
+ * @FilePath: /glxt/src/util/remoteLoad.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+export default function remoteLoad (url, hasCallback) {
+ return createScript(url)
+ /**
+ * 创建script
+ * @param url
+ * @returns {Promise}
+ */
+ function createScript (url) {
+ const scriptElement = document.createElement('script')
+ document.body.appendChild(scriptElement)
+ const promise = new Promise((resolve, reject) => {
+ scriptElement.addEventListener(
+ 'load',
+ (e) => {
+ removeScript(scriptElement)
+ if (!hasCallback) {
+ resolve(e)
+ }
+ },
+ false
+ )
+
+ scriptElement.addEventListener(
+ 'error',
+ (e) => {
+ removeScript(scriptElement)
+ reject(e)
+ },
+ false
+ )
+
+ if (hasCallback) {
+ window.____callback____ = function () {
+ resolve()
+ window.____callback____ = null
+ }
+ }
+ })
+
+ if (hasCallback) {
+ url += '&callback=____callback____'
+ }
+
+ scriptElement.src = url
+
+ return promise
+ }
+
+ /**
+ * 移除script标签
+ * @param scriptElement script dom
+ */
+ function removeScript (scriptElement) {
+ document.body.removeChild(scriptElement)
+ }
+}
diff --git a/resources/frontend/src/views/brand/brand.vue b/resources/frontend/src/views/brand/brand.vue
new file mode 100644
index 0000000..d30fe53
--- /dev/null
+++ b/resources/frontend/src/views/brand/brand.vue
@@ -0,0 +1,199 @@
+
+
+
+
+ 正在加载数据 ...
+
+
+ 新增
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/home/home.vue b/resources/frontend/src/views/home/home.vue
new file mode 100644
index 0000000..2c66ceb
--- /dev/null
+++ b/resources/frontend/src/views/home/home.vue
@@ -0,0 +1,206 @@
+
+
+
+ 新增
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/frontend/src/views/home/home/cesi.vue b/resources/frontend/src/views/home/home/cesi.vue
new file mode 100644
index 0000000..d04f4e2
--- /dev/null
+++ b/resources/frontend/src/views/home/home/cesi.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/home/home/index.vue b/resources/frontend/src/views/home/home/index.vue
new file mode 100644
index 0000000..d8293ed
--- /dev/null
+++ b/resources/frontend/src/views/home/home/index.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/index.vue b/resources/frontend/src/views/index.vue
new file mode 100644
index 0000000..b2a0c56
--- /dev/null
+++ b/resources/frontend/src/views/index.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+{{list}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/logo.vue b/resources/frontend/src/views/logo.vue
new file mode 100644
index 0000000..55ed68f
--- /dev/null
+++ b/resources/frontend/src/views/logo.vue
@@ -0,0 +1,74 @@
+
+
+
+
+ {{item.name}}
+
+
+
+ {{item.name}}
+
+ {{items.name}}
+
+
+
+
+ -
+
-
+ + + ++++
+ +{{item.name}} +
+ -
+ + 退出 ++
+
+
+ -
+
- +
- + + + + +
- +
+
+
+
+
+
+
+
+
+ 登录
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/shuju/shuju.vue b/resources/frontend/src/views/shuju/shuju.vue
new file mode 100644
index 0000000..b23f4be
--- /dev/null
+++ b/resources/frontend/src/views/shuju/shuju.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/store/store.vue b/resources/frontend/src/views/store/store.vue
new file mode 100644
index 0000000..49c5006
--- /dev/null
+++ b/resources/frontend/src/views/store/store.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 历史记录
+ （共800条）
+ ——玫瑰花
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/system/role.vue b/resources/frontend/src/views/system/role.vue
new file mode 100644
index 0000000..5dccecb
--- /dev/null
+++ b/resources/frontend/src/views/system/role.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/users/users.vue b/resources/frontend/src/views/users/users.vue
new file mode 100644
index 0000000..637d61d
--- /dev/null
+++ b/resources/frontend/src/views/users/users.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue b/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue
new file mode 100644
index 0000000..48010a3
--- /dev/null
+++ b/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/src/views/yingyeting/yingyeting.vue b/resources/frontend/src/views/yingyeting/yingyeting.vue
new file mode 100644
index 0000000..62f9e95
--- /dev/null
+++ b/resources/frontend/src/views/yingyeting/yingyeting.vue
@@ -0,0 +1,363 @@
+
+
+
+
+
+
+
+
+
+ 商品图片：
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i+1}}.
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/frontend/vue.config.js b/resources/frontend/vue.config.js
new file mode 100644
index 0000000..c43d458
--- /dev/null
+++ b/resources/frontend/vue.config.js
@@ -0,0 +1,22 @@
+module.exports = {
+ lintOnSave: false,
+ publicPath: './', // 配置打包之后的相对路径
+ devServer: {
+ open: true, // 设置浏览器自动打开项目
+ port: 8080, // 开发服务器运行端口号
+ overlay: {
+ warnings: false,
+ errors: true
+ },
+ proxy: { // 配置代理
+ '/api': {
+ // target: 'http://doc.ii090.com/mock/267/',
+ target: 'http://erp.staging.miaoxuan66.cn',
+ changeOrigin: true, // 开启代理
+ pathRewrite: { // 重命名
+ '^/api': 'api'
+ }
+ }
+ }
+ }
+}
From ec7ef4969e391453b80d4e9f23f9bcd5dbf855f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 11:43:46 +0800
Subject: [PATCH 15/68] =?UTF-8?q?feat:=20#20220802=20=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Goods/GoodsSkusController.php | 104 ++++++++++++++++++
app/Http/Controllers/Shop/ShopsController.php | 45 ++++++++
app/Http/Resources/ShopsResource.php | 19 ++++
app/Models/Shop.php | 42 +++++++
.../2014_10_12_000000_create_users_table.php | 1 +
.../2022_08_02_022448_create_shops_table.php | 45 ++++++++
database/seeds/MenusTableSeeder.php | 2 +-
7 files changed, 257 insertions(+), 1 deletion(-)
create mode 100644 app/Http/Controllers/Shop/ShopsController.php
create mode 100644 app/Http/Resources/ShopsResource.php
create mode 100644 app/Models/Shop.php
create mode 100644 database/migrations/2022_08_02_022448_create_shops_table.php
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index edf81ce..cf40820 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -8,6 +8,8 @@ use Illuminate\Http\Request;
use App\Models\GoodsSku;
use App\Http\Resources\GoodsSkuResource;
use App\Imports\GoodsSkusImport;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
use Maatwebsite\Excel\Facades\Excel;
@@ -35,7 +37,109 @@ class GoodsSkusController extends Controller
public function update($id, Request $request)
{
+ $data = $request->all();
+ $this->validateUpdate($data);
+ $sku = GoodsSku::query()->find($id);
+ $this->setBeforeUpdate($sku->toArray());
+ $sku->save($data);
+ $this->setAfterUpdate($sku->toArray());
+ $this->addLog($id, 'update');
+ return new GoodsSkuResource($sku);
+ }
+
+ public function batchUpdate(Request $request)
+ {
+ $appendRules = [
+ '*.id' => [
+ 'required',
+ Rule::exists('goods_skus', 'id'),
+ ],
+ ];
+ }
+
+ public function updateField($id, Request $request)
+ {
+ $appendRules = [
+ 'updateField' => [
+ 'required',
+ Rule::in(['reference_price', 'reserve', 'loss_num', 'status'])
+ ],
+ ];
+ if ($request->has('loss_num')) {
+ $appendRules['reason'] = ['required', 'string'];
+ }
+ $this->validateUpdate($request->all(), $appendRules);
+ $updateField = \request('updateField');
+ $sku = GoodsSku::query()->find($id);
+ $this->setBeforeUpdate($sku->$updateField);
+ $sku->$updateField = $request->$updateField;
+ $sku->save();
+ $this->setAfterUpdate($sku->$updateField);
+ $this->addLog($id, $updateField);
+
+ return new GoodsSkuResource($sku);
+ }
+
+ public function updateStock($id, Request $request)
+ {
+ $this->validateUpdate($request->all());
+ $sku = GoodsSku::query()->where('id', $id)->get(['id', 'two_days_ago_num', 'yesterday_num']);
+ if ($sku->two_days_ago_num != \request('t wo_days_ago_num') || $sku->yesterday_num != \request('yesterday_num')) {
+ $this->setBeforeUpdate($sku->toArray());
+ }
+
+ }
+
+ private function validateUpdate($data, $appendRules = [])
+ {
+ $rules = [
+ '*.two_days_ago_num' => [
+ 'sometimes',
+ 'integer',
+ ],
+ '*.yesterday_num' => [
+ 'sometimes',
+ 'integer',
+ ],
+ '*.arrived_today_num' => [
+ 'sometimes',
+ 'integer',
+ ],
+ '*.cost' => [
+ 'sometimes',
+ 'numeric',
+ 'gt:0'
+ ],
+ '*.reference_price' => [
+ 'sometimes',
+ 'numeric',
+ 'gt:0'
+ ],
+ '*.reserve' => [
+ 'sometimes',
+ 'integer',
+ ],
+ '*.loss_num' => [
+ 'sometimes',
+ 'integer',
+ ],
+ '*.inventory' => [
+ 'sometimes',
+ 'integer',
+ ],
+ '*.status' => [
+ 'sometimes',
+ 'integer',
+ Rule::in([0, 1, 2])
+ ],
+ ];
+ $validator = Validator::make($data, array_merge($rules, $appendRules));
+ if ($validator->fails()) {
+ $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
+
+ return response($this->res, $this->res['httpCode']);
+ }
}
public function store(Request $request)
diff --git a/app/Http/Controllers/Shop/ShopsController.php b/app/Http/Controllers/Shop/ShopsController.php
new file mode 100644
index 0000000..f4fd384
--- /dev/null
+++ b/app/Http/Controllers/Shop/ShopsController.php
@@ -0,0 +1,45 @@
+paginate();
+
+ return ShopsResource::collection($shops);
+ }
+
+ public function getPlatList()
+ {
+ $shop = new Shop();
+
+ return new ShopsResource($shop->getPlatList());
+ }
+
+ public function store(Request $request)
+ {
+ $validator = Validator::make($request->all(), [
+ 'name' => 'required|string|max:255|unique:shops,name',
+ 'plat_id' => 'required|integer',
+ ]);
+ if ($validator->fails()) {
+ $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
+
+ return response($this->res, $this->res['httpCode']);
+ }
+ $shop = new Shop();
+ $shop->name = $request->name;
+ $shop->plat_id = $request->plat_id;
+ $shop->save();
+
+ return response($this->res, $this->res['httpCode']);
+ }
+}
diff --git a/app/Http/Resources/ShopsResource.php b/app/Http/Resources/ShopsResource.php
new file mode 100644
index 0000000..33fdcbf
--- /dev/null
+++ b/app/Http/Resources/ShopsResource.php
@@ -0,0 +1,19 @@
+ '未授权',
+ 1 => '已授权',
+ 2 => '无需授权',
+ 3 => '停用',
+ ];
+
+ return $map[$value];
+ }
+
+ public function getPlatList()
+ {
+ return ['妙选', '快团团'];
+ }
+
+ public function getPlatIdAttribute($value)
+ {
+ $map = $this->getPlatList();
+
+ return $map[$value];
+ }
+}
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index fc36207..03b4dc9 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -20,6 +20,7 @@ class CreateUsersTable extends Migration
$table->timestamp('email_verified_at')->nullable();
$table->string('password');
$table->string('api_token', 80)->unique()->nullable(false);
+ $table->softDeletes();
$table->rememberToken();
$table->timestamps();
});
diff --git a/database/migrations/2022_08_02_022448_create_shops_table.php b/database/migrations/2022_08_02_022448_create_shops_table.php
new file mode 100644
index 0000000..7fddb77
--- /dev/null
+++ b/database/migrations/2022_08_02_022448_create_shops_table.php
@@ -0,0 +1,45 @@
+bigIncrements('id');
+ $table->string('name')->unique();
+ $table->unsignedTinyInteger('plat_id')->comment('平台id');
+ $table->string('access_token')->nullable();
+ $table->unsignedMediumInteger('expires_at')->nullable()->comment('access_token过期时间点');
+ $table->unsignedInteger('expires_in')->nullable()->comment('access_token过期时间段，10（表示10秒后过期）');
+ $table->string('owner_id')->nullable()->comment('商家店铺id');
+ $table->string('owner_name')->nullable()->comment('商家账号名称');
+ $table->string('refresh_token')->nullable()->comment('refresh token，可用来刷新access_token');
+ $table->unsignedMediumInteger('refresh_token_expires_at')->nullable()->comment('Refresh token过期时间点');
+ $table->unsignedInteger('refresh_token_expires_in')->nullable()->comment('refresh_token过期时间段，10表示10秒后过期');
+ $table->text('scope')->nullable()->comment('接口列表');
+ $table->text('pop_auth_token_create_response')->nullable()->comment('授权认证信息');
+ $table->string('status')->default(0)->comment('状态');
+ $table->softDeletes();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('shops');
+ }
+}
diff --git a/database/seeds/MenusTableSeeder.php b/database/seeds/MenusTableSeeder.php
index 3aff505..d968742 100644
--- a/database/seeds/MenusTableSeeder.php
+++ b/database/seeds/MenusTableSeeder.php
@@ -30,6 +30,6 @@ class MenusTableSeeder extends Seeder
['parent_id' => $id,'code' => 'PERMISSION_MANAGE', 'name' => '权限管理', 'seq' => 1],
]);
// 系统日志
- DB::table('menus')->insertGetId(['parent_id' => 0,'code' => 'SYSTEM_LOG', 'name' => '系统管理', 'seq' => 4]);
+ DB::table('menus')->insertGetId(['parent_id' => 0,'code' => 'SYSTEM_LOG', 'name' => '系统日志', 'seq' => 4]);
}
}
From ad4f38fcbe45729c1fdd4b099e5dd7e1aedf0038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 16:28:22 +0800
Subject: [PATCH 16/68] =?UTF-8?q?feat:=20#20220802=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/User/UsersController.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/Http/Controllers/User/UsersController.php b/app/Http/Controllers/User/UsersController.php
index f2f4f30..dd69dc0 100644
--- a/app/Http/Controllers/User/UsersController.php
+++ b/app/Http/Controllers/User/UsersController.php
@@ -35,6 +35,7 @@ class UsersController extends Controller
'name' => 'required|string|unique:users,name|max:255',
'password' => 'required|string|min:8|confirmed',
'email' => 'email',
+ 'role_name' => 'required|string|exists:roles,name'
]);
if ($validator->fails()) {
$this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
@@ -49,6 +50,7 @@ class UsersController extends Controller
$user->save();
$this->setAfterUpdate($user->toArray());
$this->addLog($user->id, 'add');
+ $user->assignRole($request->role_name);
return new UsersResource($user);
}
From e83421ea5b6dee5db3b6ec7ee7d0332a75bf2bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 18:20:06 +0800
Subject: [PATCH 17/68] =?UTF-8?q?feat:=20#20220802=20=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Role/RolesController.php | 2 +-
app/Http/Controllers/User/UsersController.php | 46 +++++++++++++++++--
2 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/app/Http/Controllers/Role/RolesController.php b/app/Http/Controllers/Role/RolesController.php
index caca780..93ecc3d 100644
--- a/app/Http/Controllers/Role/RolesController.php
+++ b/app/Http/Controllers/Role/RolesController.php
@@ -45,7 +45,7 @@ class RolesController extends Controller
$this->setAfterUpdate($role->name);
$this->addLog($role->id, 'add');
- return response($this->res, $this->res['httpCode']);
+ return new RolesResource($role);
}
public function addPermissions($id, Request $request)
diff --git a/app/Http/Controllers/User/UsersController.php b/app/Http/Controllers/User/UsersController.php
index dd69dc0..e341bae 100644
--- a/app/Http/Controllers/User/UsersController.php
+++ b/app/Http/Controllers/User/UsersController.php
@@ -10,6 +10,7 @@ use Faker\Generator as Faker;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use App\Http\Resources\UsersResource;
+use Illuminate\Validation\Rule;
class UsersController extends Controller
{
@@ -24,7 +25,7 @@ class UsersController extends Controller
public function index()
{
- $users = User::query()->where('id', '<>', 1)->paginate();
+ $users = User::query()->where('id', '<>', 1)->with('roles:id,name,guard_name')->paginate();
return UsersResource::collection($users);
}
@@ -32,7 +33,7 @@ class UsersController extends Controller
public function store(Request $request, Faker $faker)
{
$validator = Validator::make($request->all(), [
- 'name' => 'required|string|unique:users,name|max:255',
+ 'name' => 'required|string|max:255|unique:users,name',
'password' => 'required|string|min:8|confirmed',
'email' => 'email',
'role_name' => 'required|string|exists:roles,name'
@@ -57,16 +58,51 @@ class UsersController extends Controller
public function show($id)
{
- return new UsersResource(User::query()->find($id));
+ return new UsersResource(User::query()->with('roles:id,name,guard_name')->find($id));
}
- public function update()
+ public function update($id, Request $request)
{
+ $validator = Validator::make($request->all(), [
+ 'name' => [
+ 'required',
+ 'string',
+ 'max:255',
+ Rule::unique('users')->ignore($id),
+ ],
+// 'old_password' => 'sometimes|required|string|min:8',
+ 'password' => 'sometimes|string|min:8|confirmed',
+ 'email' => 'sometimes|email',
+ 'role_name' => 'sometimes|required|string|exists:roles,name'
+ ]);
+ if ($validator->fails()) {
+ $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
+ return response($this->res, $this->res['httpCode']);
+ }
+ $user = User::query()->find($id);
+ $user->update($request->toArray());
+ if ($request->has('role_name')) {
+ $user->syncRoles($request->role_name);
+ }
+
+ return new UsersResource($user);
}
- public function destory()
+ public function destory($id)
{
+ $user = User::query()->find($id);
+ try {
+ $user->delete();
+ $this->addLog($id, 'status');
+ } catch (\Exception $e) {
+ $this->res = [
+ 'httpCode' => 500,
+ 'errorCode' => 500416,
+ 'errorMessage' => $e->getMessage(),
+ ];
+ }
+ return response($this->res, $this->res['httpCode']);
}
}
From 1ae21f041f170d63aad8a01d3974facf4936ff59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 18:56:04 +0800
Subject: [PATCH 18/68] =?UTF-8?q?feat:=20#20220802=20=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/UploadController.php | 33 +++
app/Utils/UploadUtils.php | 123 +++++++++
composer.json | 2 +
composer.lock | 290 +++++++++++++++++++++-
config/filesystems.php | 13 +-
routes/api.php | 2 +
6 files changed, 461 insertions(+), 2 deletions(-)
create mode 100644 app/Http/Controllers/UploadController.php
create mode 100644 app/Utils/UploadUtils.php
diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php
new file mode 100644
index 0000000..59773ce
--- /dev/null
+++ b/app/Http/Controllers/UploadController.php
@@ -0,0 +1,33 @@
+log = new LogModel([
+ 'module' => 'file',
+ 'action' => $request->getMethod(),
+ 'target_type' => 'upload',
+ ]);
+ }
+
+ public function store(Request $request)
+ {
+ if (!$request->hasFile('uploadFile')) {
+ $this->res = [
+ 'httpCode' => 404,
+ 'errorCode' => 404404,
+ 'errorMessage' => 'not found file',
+ ];
+ }
+ $this->addLog(0, 'add');
+
+ return UploadUtils::putForUploadedFile('image', $request->uploadFile);
+ }
+}
diff --git a/app/Utils/UploadUtils.php b/app/Utils/UploadUtils.php
new file mode 100644
index 0000000..caaba2c
--- /dev/null
+++ b/app/Utils/UploadUtils.php
@@ -0,0 +1,123 @@
+extension() != 'gif') {
+ // 压缩图片
+ $originalName = static::randomFileName($extension ?: $upload->getClientOriginalExtension());
+ $storagePath = storage_path('app/public/file/') . $originalName;
+ $img = Image::make($upload->getRealPath());
+
+ // 未传宽度 大于800压缩至800 否则按照原宽度
+ $width = $img->width() >= 800 ? 800 : $img->width();
+ // 高度自适应
+ $img->resize($width, null, function ($constraint) {
+ $constraint->aspectRatio();
+ });
+ $img->save($storagePath);
+ $upload = new UploadedFile($storagePath, $originalName);
+ }
+
+ // 上传并删除压缩图片
+ try {
+ $filePath = static::put($bucketPath, $upload->getRealPath(), $upload->getClientOriginalExtension());
+ } catch (OssException $e) {
+ throw $e;
+ } finally {
+ if (isset($storagePath)) {
+ unlink($storagePath);
+ }
+ }
+
+ return $filePath;
+ }
+
+ //上传图片
+ public static function putForUploadedFile($bucketPath, UploadedFile $upload)
+ {
+ return static::put($bucketPath, $upload->getRealPath(), $upload->getClientOriginalExtension());
+ }
+
+ public static function put($bucketPath, $filepath, $ext)
+ {
+ static::init();
+ try {
+ $filePath = static::$prefix . $bucketPath . '/' . static::randomFileName($ext);
+ static::$ossClient->uploadFile(static::$bucket, $filePath, $filepath);
+ } catch (OssException $e) {
+ throw $e;
+ }
+ return $filePath;
+ }
+
+ public static function buildFilePath()
+ {
+ return date('Y') . '/' . date('m') . '/' . date('d');
+ }
+
+ public static function randomFileName($ext, $len = 40)
+ {
+ return Str::random($len) . '.' . $ext;
+ }
+
+ //删除修改前，上传修改后图片
+ public static function delAndUploadImage($file, $filePath, UploadedFile $upload)
+ {
+ static::delFile($file);
+ return static::putForUploadedFile($filePath, $upload);
+ }
+
+ //删除修改前，上传修改后视频
+ public static function delAndUploadVideo($file, $filePath, UploadedFile $upload)
+ {
+ static::delFile($file);
+ return static::putForUploadedFile($filePath, $upload);
+ }
+
+ public static function delFile($file)
+ {
+ static::init();
+ if (static::exist($file)) {
+ return static::$ossClient->deleteObject(static::$bucket, $file);
+ }
+ return false;
+ }
+
+ public static function exist($file)
+ {
+ static::init();
+ return static::$ossClient->doesObjectExist(static::$bucket, $file);
+ }
+
+ public static function getFullImgUrl($filePath)
+ {
+ return config('filesystems.disks.aliyun.url') . $filePath;
+ }
+
+}
diff --git a/composer.json b/composer.json
index 63a511a..e442ecc 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,9 @@
"license": "MIT",
"require": {
"php": "^7.2.5|^8.0",
+ "aliyuncs/oss-sdk-php": "^2.5",
"fideloper/proxy": "^4.4",
+ "intervention/image": "^2.7",
"laravel/framework": "^6.20.26",
"laravel/tinker": "^2.5",
"maatwebsite/excel": "^3.1",
diff --git a/composer.lock b/composer.lock
index 6c4e88e..b66292d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,53 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "486f251784470138e7bd835f6ea84ce3",
+ "content-hash": "87b78d5c6e1dfc1285abb501c7eb8372",
"packages": [
+ {
+ "name": "aliyuncs/oss-sdk-php",
+ "version": "v2.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git",
+ "reference": "f0413667d765855eb0aaa728b596801464ffdb06"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/f0413667d765855eb0aaa728b596801464ffdb06",
+ "reference": "f0413667d765855eb0aaa728b596801464ffdb06",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*",
+ "satooshi/php-coveralls": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "OSS\\": "src/OSS"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Aliyuncs",
+ "homepage": "http://www.aliyun.com"
+ }
+ ],
+ "description": "Aliyun OSS SDK for PHP",
+ "homepage": "http://www.aliyun.com/product/oss/",
+ "support": {
+ "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues",
+ "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.5.0"
+ },
+ "time": "2022-05-13T07:41:28+00:00"
+ },
{
"name": "doctrine/inflector",
"version": "2.0.4",
@@ -414,6 +459,205 @@
},
"time": "2022-02-09T13:33:34+00:00"
},
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "2.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "13388f00956b1503577598873fffb5ae994b5737"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
+ "reference": "13388f00956b1503577598873fffb5ae994b5737",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0",
+ "ralouphie/getallheaders": "^3.0"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "bamarni/composer-bin-plugin": "^1.4.1",
+ "http-interop/http-factory-tests": "^0.9",
+ "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+ },
+ "suggest": {
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
+ }
+ ],
+ "description": "PSR-7 message implementation that also provides common utility methods",
+ "keywords": [
+ "http",
+ "message",
+ "psr-7",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "support": {
+ "issues": "https://github.com/guzzle/psr7/issues",
+ "source": "https://github.com/guzzle/psr7/tree/2.4.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-06-20T21:43:11+00:00"
+ },
+ {
+ "name": "intervention/image",
+ "version": "2.7.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Intervention/image.git",
+ "reference": "04be355f8d6734c826045d02a1079ad658322dad"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad",
+ "reference": "04be355f8d6734c826045d02a1079ad658322dad",
+ "shasum": ""
+ },
+ "require": {
+ "ext-fileinfo": "*",
+ "guzzlehttp/psr7": "~1.1 || ^2.0",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9.2",
+ "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15"
+ },
+ "suggest": {
+ "ext-gd": "to use GD library based image processing.",
+ "ext-imagick": "to use Imagick based image processing.",
+ "intervention/imagecache": "Caching extension for the Intervention Image library"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Intervention\\Image\\ImageServiceProvider"
+ ],
+ "aliases": {
+ "Image": "Intervention\\Image\\Facades\\Image"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Intervention\\Image\\": "src/Intervention/Image"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Oliver Vogel",
+ "email": "oliver@intervention.io",
+ "homepage": "https://intervention.io/"
+ }
+ ],
+ "description": "Image handling and manipulation library with support for Laravel integration",
+ "homepage": "http://image.intervention.io/",
+ "keywords": [
+ "gd",
+ "image",
+ "imagick",
+ "laravel",
+ "thumbnail",
+ "watermark"
+ ],
+ "support": {
+ "issues": "https://github.com/Intervention/image/issues",
+ "source": "https://github.com/Intervention/image/tree/2.7.2"
+ },
+ "funding": [
+ {
+ "url": "https://paypal.me/interventionio",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/Intervention",
+ "type": "github"
+ }
+ ],
+ "time": "2022-05-21T17:30:32+00:00"
+ },
{
"name": "laravel/framework",
"version": "v6.20.44",
@@ -2131,6 +2375,50 @@
},
"time": "2022-07-07T13:49:11+00:00"
},
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "3.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^5 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "support": {
+ "issues": "https://github.com/ralouphie/getallheaders/issues",
+ "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+ },
+ "time": "2019-03-08T08:55:37+00:00"
+ },
{
"name": "ramsey/uuid",
"version": "3.9.6",
diff --git a/config/filesystems.php b/config/filesystems.php
index 220c010..9df9941 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -64,7 +64,18 @@ return [
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
],
-
+ 'aliyun' => [
+ 'driver' => 'oss',
+ 'access_id' => 'LTAI6do39W9jINpe',
+ 'access_key' => 'XLhp5w4WnRcqji204GYOm7hZsoXSB6',
+ 'bucket' => 'ct-upimg',
+ 'endpoint' => 'oss-cn-hangzhou.aliyuncs.com', // OSS 外网节点或自定义外部域名
+// 'cdnDomain' => 'cdn-xiangma.yx090.com', // 如果isCName为true, getUrl会判断cdnDomain是否设定来决定返回的url，如果cdnDomain未设置，则使用endpoint来生成url，否则使用cdn
+ 'url' => 'https://ct-upimg.yx090.com/',
+ 'ssl' => true,
+ 'isCName' => false, // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url， false: 则使用外部节点生成url
+ 'debug' => true
+ ],
],
];
diff --git a/routes/api.php b/routes/api.php
index e97d2a3..2ce75fd 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,6 +2,7 @@
use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\Role\RolesController;
+use App\Http\Controllers\UploadController;
/*
|--------------------------------------------------------------------------
@@ -37,6 +38,7 @@ Route::middleware('auth:api')->group(function () {
Route::resource('menus', 'Menu\MenusController', ['only' => ['index',
// 'store', 'show', 'update', 'destroy'
]]);
+ Route::post('upload', [UploadController::class, 'store'])->name('upload.file');
});
Route::post('/auth/login', [LoginController::class, 'login'])->name('auth.login');
From 92c95b529691976931a904234f67e2e15462969e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 19:01:47 +0800
Subject: [PATCH 19/68] =?UTF-8?q?feat:=20#20220802=20=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/UploadController.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php
index 59773ce..38ede3f 100644
--- a/app/Http/Controllers/UploadController.php
+++ b/app/Http/Controllers/UploadController.php
@@ -27,7 +27,8 @@ class UploadController extends Controller
];
}
$this->addLog(0, 'add');
+ $this->res['resource'] = UploadUtils::putForUploadedFile('image', $request->uploadFile);
- return UploadUtils::putForUploadedFile('image', $request->uploadFile);
+ return response($this->res, $this->res['httpCode']);
}
}
From 4e7d24e0151437c83b2fd833b0a7925370b899c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 20:02:48 +0800
Subject: [PATCH 20/68] =?UTF-8?q?feat:=20#20220802=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=BA=97=E9=93=BA=E5=B9=B3=E5=8F=B0=E5=88=97=E8=A1=A8=E8=B7=AF?=
=?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
routes/api.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/routes/api.php b/routes/api.php
index 2ce75fd..7ae0b39 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -3,6 +3,7 @@
use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\Role\RolesController;
use App\Http\Controllers\UploadController;
+use App\Http\Controllers\Shop\ShopsController;
/*
|--------------------------------------------------------------------------
@@ -29,6 +30,7 @@ Route::middleware('auth:api')->group(function () {
Route::resource('goods_skus', 'Goods\GoodsSkusController', ['only' => ['index', 'show', 'update', 'store']]);
// 店铺
Route::resource('shops', 'Shop\ShopsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
+ Route::get('shop_platforms', [ShopsController::class, 'getPlatList'])->name('plat.list');
// 角色
Route::resource('roles', 'Role\RolesController', ['only' => ['index', 'store', 'show', 'update']]);
Route::post('roles/{id}/permissions', [RolesController::class, 'addPermissions'])->name('role.permission');
From 2d59a6f9da9788bf34be9ae9d5defc604e5c7299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Tue, 2 Aug 2022 20:15:57 +0800
Subject: [PATCH 21/68] =?UTF-8?q?feat:=20#20220802=20=E8=A7=84=E6=A0=BC?=
=?UTF-8?q?=E5=95=86=E5=93=81=E6=9F=A5=E7=9C=8B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Goods/GoodsSkusController.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index cf40820..ff4a3fa 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -32,7 +32,11 @@ class GoodsSkusController extends Controller
public function show($id)
{
- return new GoodsSkuResource(GoodsSku::query()->with(['goods', 'brand'])->find($id));
+ return new GoodsSkuResource(GoodsSku::query()
+ ->with(['goods' => function ($query) {
+ $query->with(['type:id,name', 'brand:id,name']);
+ }])
+ ->find($id));
}
public function update($id, Request $request)
@@ -41,7 +45,7 @@ class GoodsSkusController extends Controller
$this->validateUpdate($data);
$sku = GoodsSku::query()->find($id);
$this->setBeforeUpdate($sku->toArray());
- $sku->save($data);
+ $sku->update($data);
$this->setAfterUpdate($sku->toArray());
$this->addLog($id, 'update');
From ada42eaae66641ea3d3d38a438dd4c71e4c20b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 3 Aug 2022 11:14:08 +0800
Subject: [PATCH 22/68] =?UTF-8?q?feat:=20#20220803=20=E5=95=86=E5=93=81?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Goods/GoodsController.php | 53 ++++++++++---------
.../Controllers/Goods/GoodsSkusController.php | 31 ++++++++---
routes/api.php | 2 +
3 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/app/Http/Controllers/Goods/GoodsController.php b/app/Http/Controllers/Goods/GoodsController.php
index 4498091..b50aa0f 100644
--- a/app/Http/Controllers/Goods/GoodsController.php
+++ b/app/Http/Controllers/Goods/GoodsController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Goods;
use App\Http\Controllers\Controller;
+use App\Http\Resources\GoodsResource;
use App\Http\Resources\GoodsSkuResource;
use App\Models\Log as LogModel;
use Illuminate\Http\Request;
@@ -25,39 +26,35 @@ class GoodsController extends Controller
public function index(Request $request)
{
- $goods = Goods::query()->filter()->get()->toArray();
- $goodsIds = array_column($goods, 'id');
- // 状态变更时间查询,日志
- $day = date('Y-m-d'); //早上7点之前是昨天,7点之后是今天
- $goodsSkus = GoodsSku::query()
- ->whereIn('goods_id', $goodsIds)
- ->filter()
- ->with(['goods' => function ($query) {
- $query->with(['type:id,name', 'brand:id,name']);
- }])
- ->with(['daily' => function ($query) use ($day){
- $query->where('day', $day)->with(['daily:id,sku_id,day,arrived_today_num,loss_num,inventory']);
- }])
- ->paginate();
+ $goods = Goods::query()->get(['id', 'title', 'img_url', 'type_id', 'brand_id', 'goods_code']);
- return GoodsSkuResource::collection($goodsSkus);
+ return GoodsResource::collection($goods);
}
public function store(Request $request)
{
- $validator = Validator::make($request->all(), [
+ $goodsRules = [
'title' => ['required', 'string', 'max:255'],
'img_url' => ['required', 'string', 'max:255'],
'type_id' => ['required', 'integer', 'exists:goods_types,id'],
'brand_id' => ['integer', 'exists:goods_brands,id'],
'goods_code' => ['required', 'alpha_dash', 'max:32', 'unique:goods,goods_code'],
+ ];
+
+ if ($useGoods = !empty($request->goods_id)) {
+ $goodsRules = [
+ 'goods_id' => ['required', 'integer', 'exists:goods,id'],
+ ];
+ }
+ $skuRules = [
'skus' => ['required', 'array'],
'skus.*.title' => ['required', 'string', 'max:255'],
'skus.*.sku_code' => ['required', 'distinct', 'alpha_dash', 'max:32'],
'skus.*.status' => ['required', 'integer', Rule::in([0, 1, 2])],
- 'skus.*.num' => ['required', 'integer', 'max:10'],
- 'skus.*.cost' => ['required', 'numeric', 'max:10'],
- ]);
+ 'skus.*.num' => ['required', 'integer'],
+ 'skus.*.cost' => ['required', 'numeric'],
+ ];
+ $validator = Validator::make($request->all(), array_merge($goodsRules, $skuRules));
if ($validator->fails()) {
$this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
@@ -65,13 +62,17 @@ class GoodsController extends Controller
}
DB::beginTransaction();
try {
- $goods = new Goods();
- $goods->title = $request->title;
- $goods->img_url = $request->img_url;
- $goods->type_id = $request->type_id;
- $goods->brand_id = $request->brand_id;
- $goods->goods_code = $request->goods_code;
- $goods->save();
+ if ($useGoods) {
+ $goods = Goods::query()->find($request->goods_id);
+ } else {
+ $goods = new Goods();
+ $goods->title = $request->title;
+ $goods->img_url = $request->img_url;
+ $goods->type_id = $request->type_id;
+ $goods->brand_id = $request->brand_id;
+ $goods->goods_code = $request->goods_code;
+ $goods->save();
+ }
$goodsSkus = [];
foreach ($request->skus as $item) {
$item['goods_id'] = $goods->id;
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index ff4a3fa..fa8af86 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Goods;
use App\Http\Controllers\Controller;
+use App\Models\Goods;
use App\Models\Log as LogModel;
use Illuminate\Http\Request;
use App\Models\GoodsSku;
@@ -27,7 +28,22 @@ class GoodsSkusController extends Controller
public function index(Request $request)
{
- return new GoodsSkuResource(GoodsSku::query()->get(['id', 'title']));
+ $goods = Goods::query()->filter()->get()->toArray();
+ $goodsIds = array_column($goods, 'id');
+ // 状态变更时间查询,日志
+ $day = date('Y-m-d'); //早上7点之前是昨天,7点之后是今天
+ $goodsSkus = GoodsSku::query()
+ ->whereIn('goods_id', $goodsIds)
+ ->filter()
+ ->with(['goods' => function ($query) {
+ $query->with(['type:id,name', 'brand:id,name']);
+ }])
+ ->with(['daily' => function ($query) use ($day){
+ $query->where('day', $day)->with(['daily:id,sku_id,day,arrived_today_num,loss_num,inventory']);
+ }])
+ ->paginate();
+
+ return GoodsSkuResource::collection($goodsSkus);
}
public function show($id)
@@ -55,11 +71,16 @@ class GoodsSkusController extends Controller
public function batchUpdate(Request $request)
{
$appendRules = [
- '*.id' => [
+ 'skus' => ['required', 'array'],
+ 'skus.*.id' => [
'required',
Rule::exists('goods_skus', 'id'),
],
];
+ $data = $request->all();
+ $this->validateUpdate($data, $appendRules);
+ GoodsSku::whereIn('id', array_column($data, 'id'))
+ ->update($data);
}
public function updateField($id, Request $request)
@@ -138,12 +159,8 @@ class GoodsSkusController extends Controller
Rule::in([0, 1, 2])
],
];
+// $validator = Validator::make($data, array_merge($rules, $appendRules))->validate();
$validator = Validator::make($data, array_merge($rules, $appendRules));
- if ($validator->fails()) {
- $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
-
- return response($this->res, $this->res['httpCode']);
- }
}
public function store(Request $request)
diff --git a/routes/api.php b/routes/api.php
index 7ae0b39..c6b756b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -4,6 +4,7 @@ use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\Role\RolesController;
use App\Http\Controllers\UploadController;
use App\Http\Controllers\Shop\ShopsController;
+use App\Http\Controllers\Goods\GoodsSkusController;
/*
|--------------------------------------------------------------------------
@@ -28,6 +29,7 @@ Route::middleware('auth:api')->group(function () {
Route::resource('goods', 'Goods\GoodsController', ['only' => ['index', 'store']]);
// 商品规格
Route::resource('goods_skus', 'Goods\GoodsSkusController', ['only' => ['index', 'show', 'update', 'store']]);
+ Route::patch('batch/goods_skus', [GoodsSkusController::class, 'batchUpdate'])->name('goods_sku.batch_update');
// 店铺
Route::resource('shops', 'Shop\ShopsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
Route::get('shop_platforms', [ShopsController::class, 'getPlatList'])->name('plat.list');
From 1ee5c5eb8571a76c2986fc8939d5e9b451ded581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 3 Aug 2022 16:41:15 +0800
Subject: [PATCH 23/68] =?UTF-8?q?feat:=20#20220803=20=E5=95=86=E5=93=81?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Goods/GoodsController.php | 36 ++++----------
.../Controllers/Goods/GoodsSkusController.php | 43 +++++++++++++----
app/Http/Requests/GoodsRequest.php | 47 ++++++++++++++++++
app/Http/Requests/GoodsSkuPost.php | 30 ------------
app/Http/Requests/GoodsSkuRequest.php | 48 +++++++++++++++++++
app/Models/Goods.php | 2 +
6 files changed, 140 insertions(+), 66 deletions(-)
create mode 100644 app/Http/Requests/GoodsRequest.php
delete mode 100644 app/Http/Requests/GoodsSkuPost.php
create mode 100644 app/Http/Requests/GoodsSkuRequest.php
diff --git a/app/Http/Controllers/Goods/GoodsController.php b/app/Http/Controllers/Goods/GoodsController.php
index b50aa0f..9a114dd 100644
--- a/app/Http/Controllers/Goods/GoodsController.php
+++ b/app/Http/Controllers/Goods/GoodsController.php
@@ -3,15 +3,14 @@
namespace App\Http\Controllers\Goods;
use App\Http\Controllers\Controller;
+use App\Http\Requests\GoodsSkuRequest;
use App\Http\Resources\GoodsResource;
-use App\Http\Resources\GoodsSkuResource;
use App\Models\Log as LogModel;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
use App\Models\Goods;
-use App\Models\GoodsSku;
+use App\Http\Requests\GoodsRequest;
class GoodsController extends Controller
{
@@ -33,28 +32,9 @@ class GoodsController extends Controller
public function store(Request $request)
{
- $goodsRules = [
- 'title' => ['required', 'string', 'max:255'],
- 'img_url' => ['required', 'string', 'max:255'],
- 'type_id' => ['required', 'integer', 'exists:goods_types,id'],
- 'brand_id' => ['integer', 'exists:goods_brands,id'],
- 'goods_code' => ['required', 'alpha_dash', 'max:32', 'unique:goods,goods_code'],
- ];
-
- if ($useGoods = !empty($request->goods_id)) {
- $goodsRules = [
- 'goods_id' => ['required', 'integer', 'exists:goods,id'],
- ];
- }
- $skuRules = [
- 'skus' => ['required', 'array'],
- 'skus.*.title' => ['required', 'string', 'max:255'],
- 'skus.*.sku_code' => ['required', 'distinct', 'alpha_dash', 'max:32'],
- 'skus.*.status' => ['required', 'integer', Rule::in([0, 1, 2])],
- 'skus.*.num' => ['required', 'integer'],
- 'skus.*.cost' => ['required', 'numeric'],
- ];
- $validator = Validator::make($request->all(), array_merge($goodsRules, $skuRules));
+ $goodsRules = (new GoodsRequest())->rules();
+ $skuRules = (new GoodsSkuRequest())->arrayRules('skus.*.');
+ $validator = Validator::make($request->all(), array_merge($goodsRules, ['skus' => ['required', 'array']], $skuRules));
if ($validator->fails()) {
$this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
@@ -62,8 +42,8 @@ class GoodsController extends Controller
}
DB::beginTransaction();
try {
- if ($useGoods) {
- $goods = Goods::query()->find($request->goods_id);
+ if (!empty($request->id)) {
+ $goods = Goods::query()->find($request->id);
} else {
$goods = new Goods();
$goods->title = $request->title;
@@ -79,9 +59,9 @@ class GoodsController extends Controller
$goodsSkus[] = $item;
}
$collection = $goods->skus()->createMany($goodsSkus);
- DB::commit();
$this->setAfterUpdate($collection->toArray());
$this->addLog(0, 'add');
+ DB::commit();
} catch (\Exception $exception) {
DB::rollBack();
$this->res = [
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index fa8af86..d3344c8 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -3,12 +3,15 @@
namespace App\Http\Controllers\Goods;
use App\Http\Controllers\Controller;
+use App\Http\Requests\GoodsRequest;
+use App\Http\Requests\GoodsSkuRequest;
use App\Models\Goods;
use App\Models\Log as LogModel;
use Illuminate\Http\Request;
use App\Models\GoodsSku;
use App\Http\Resources\GoodsSkuResource;
use App\Imports\GoodsSkusImport;
+use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
@@ -57,15 +60,39 @@ class GoodsSkusController extends Controller
public function update($id, Request $request)
{
- $data = $request->all();
- $this->validateUpdate($data);
- $sku = GoodsSku::query()->find($id);
- $this->setBeforeUpdate($sku->toArray());
- $sku->update($data);
- $this->setAfterUpdate($sku->toArray());
- $this->addLog($id, 'update');
+ $goodsRules = (new GoodsRequest())->arrayRules('goods.');
+ $skuRules = (new GoodsSkuRequest())->arrayRules('sku.');
+ $validator = Validator::make($request->all(), array_merge($goodsRules, $skuRules));
+ if ($validator->fails()) {
+ $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
- return new GoodsSkuResource($sku);
+ return response($this->res, $this->res['httpCode']);
+ }
+ DB::beginTransaction();
+ try {
+ // 商品规格更新
+ $sku = GoodsSku::query()->find($id);
+ $this->setBeforeUpdate($sku->toArray());
+ $sku->update($request->sku);
+ $this->setAfterUpdate($sku->toArray());
+ $this->addLog($id, 'update');
+ // 商品更新
+ $goods = Goods::query()->find($sku->goods_id);
+ $this->setBeforeUpdate($goods->toArray());
+ $goods->update($request->goods);
+ $this->setAfterUpdate($goods->toArray());
+ $this->addLog($sku->goods_id, 'update', 'goods');
+ DB::commit();
+ } catch (\Exception $exception) {
+ DB::rollBack();
+ $this->res = [
+ 'httpCode' => 400,
+ 'errorCode' => 400416,
+ 'errorMessage' => $exception->getMessage(),
+ ];
+ }
+
+ return response($this->res, $this->res['httpCode']);
}
public function batchUpdate(Request $request)
diff --git a/app/Http/Requests/GoodsRequest.php b/app/Http/Requests/GoodsRequest.php
new file mode 100644
index 0000000..e0ecc5f
--- /dev/null
+++ b/app/Http/Requests/GoodsRequest.php
@@ -0,0 +1,47 @@
+ ['sometimes', 'required', 'integer', 'exists:goods,id'],
+ 'title' => ['required', 'string', 'max:255'],
+ 'img_url' => ['required', 'string', 'max:255'],
+ 'type_id' => ['required', 'integer', 'exists:goods_types,id'],
+ 'brand_id' => ['integer', 'exists:goods_brands,id'],
+ 'goods_code' => ['required', 'alpha_dash', 'max:32', Rule::unique('goods')->ignore(request('goods_id'))],
+ ];
+ }
+
+ public function arrayRules($arrayName)
+ {
+ $arrayRules = [];
+ $rules = $this->rules();
+ foreach ($rules as $key => $val) {
+ $arrayRules[$arrayName . $key] = $val;
+ }
+
+ return $arrayRules;
+ }
+}
diff --git a/app/Http/Requests/GoodsSkuPost.php b/app/Http/Requests/GoodsSkuPost.php
deleted file mode 100644
index cabbf76..0000000
--- a/app/Http/Requests/GoodsSkuPost.php
+++ /dev/null
@@ -1,30 +0,0 @@
- ['sometimes', 'required', 'integer', 'exists:goods_skus,id'],
+ 'goods_id' => ['sometimes', 'required', 'integer', 'exists:goods,id'],
+ 'title' => ['required', 'string', 'max:255'],
+ 'sku_code' => ['required', 'distinct', 'alpha_dash', 'max:32'],
+ 'status' => ['required', 'integer', Rule::in([0, 1, 2])],
+ 'num' => ['required', 'integer'],
+ 'cost' => ['required', 'numeric'],
+ ];
+ }
+
+ public function arrayRules($arrayName)
+ {
+ $arrayRules = [];
+ $rules = $this->rules();
+ foreach ($rules as $key => $val) {
+ $arrayRules[$arrayName . $key] = $val;
+ }
+
+ return $arrayRules;
+ }
+}
diff --git a/app/Models/Goods.php b/app/Models/Goods.php
index 3498be6..f9f9ff2 100644
--- a/app/Models/Goods.php
+++ b/app/Models/Goods.php
@@ -15,6 +15,8 @@ class Goods extends Model
'brand_id',
];
+ protected $guarded = [];
+
/**
* 多规格
*/
From dc013d9ae5f9b8e604aaa1dc0d873977f4cf199e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 3 Aug 2022 20:28:42 +0800
Subject: [PATCH 24/68] =?UTF-8?q?feat:=20#20220803=20=E5=95=86=E5=93=81?=
=?UTF-8?q?=E8=A7=84=E6=A0=BC=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Goods/GoodsController.php | 20 +-
.../Controllers/Goods/GoodsSkusController.php | 251 +++++++++++++-----
app/Http/Requests/GoodsSkuRequest.php | 17 ++
app/Utils/FormatUtils.php | 21 +-
.../2022_07_26_105818_create_logs_table.php | 1 +
routes/api.php | 1 +
6 files changed, 232 insertions(+), 79 deletions(-)
diff --git a/app/Http/Controllers/Goods/GoodsController.php b/app/Http/Controllers/Goods/GoodsController.php
index 9a114dd..234752e 100644
--- a/app/Http/Controllers/Goods/GoodsController.php
+++ b/app/Http/Controllers/Goods/GoodsController.php
@@ -6,11 +6,13 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\GoodsSkuRequest;
use App\Http\Resources\GoodsResource;
use App\Models\Log as LogModel;
+use App\Utils\FormatUtils;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use App\Models\Goods;
use App\Http\Requests\GoodsRequest;
+use App\Models\DailyStockRecord;
class GoodsController extends Controller
{
@@ -42,8 +44,8 @@ class GoodsController extends Controller
}
DB::beginTransaction();
try {
- if (!empty($request->id)) {
- $goods = Goods::query()->find($request->id);
+ if (!empty($request->goods_id)) {
+ $goods = Goods::query()->find($request->goods_id);
} else {
$goods = new Goods();
$goods->title = $request->title;
@@ -56,11 +58,21 @@ class GoodsController extends Controller
$goodsSkus = [];
foreach ($request->skus as $item) {
$item['goods_id'] = $goods->id;
+ $item['reference_price'] = $item['cost'] * 1.5;
$goodsSkus[] = $item;
}
- $collection = $goods->skus()->createMany($goodsSkus);
- $this->setAfterUpdate($collection->toArray());
+ $collection = $goods->skus()->createMany($goodsSkus)->toArray();
+ $this->setAfterUpdate($collection);
$this->addLog(0, 'add');
+ $newRecords = [];
+ foreach ($collection as $sku) {
+ $newRecords[] = [
+ 'sku_id' => $sku['id'],
+ 'day' => FormatUtils::date(),
+ ];
+ }
+ $record = new DailyStockRecord();
+ $record->batchInsert($newRecords);
DB::commit();
} catch (\Exception $exception) {
DB::rollBack();
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index d3344c8..1798db4 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\GoodsRequest;
use App\Http\Requests\GoodsSkuRequest;
use App\Models\Goods;
use App\Models\Log as LogModel;
+use App\Utils\FormatUtils;
use Illuminate\Http\Request;
use App\Models\GoodsSku;
use App\Http\Resources\GoodsSkuResource;
@@ -16,6 +17,7 @@ use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
use Maatwebsite\Excel\Facades\Excel;
+use App\Models\DailyStockRecord;
class GoodsSkusController extends Controller
{
@@ -34,14 +36,14 @@ class GoodsSkusController extends Controller
$goods = Goods::query()->filter()->get()->toArray();
$goodsIds = array_column($goods, 'id');
// 状态变更时间查询,日志
- $day = date('Y-m-d'); //早上7点之前是昨天,7点之后是今天
+ $day = FormatUtils::date();
$goodsSkus = GoodsSku::query()
->whereIn('goods_id', $goodsIds)
->filter()
->with(['goods' => function ($query) {
$query->with(['type:id,name', 'brand:id,name']);
}])
- ->with(['daily' => function ($query) use ($day){
+ ->with(['daily' => function ($query) use ($day) {
$query->where('day', $day)->with(['daily:id,sku_id,day,arrived_today_num,loss_num,inventory']);
}])
->paginate();
@@ -98,96 +100,199 @@ class GoodsSkusController extends Controller
public function batchUpdate(Request $request)
{
$appendRules = [
+ 'updateType' => ['required', 'string', Rule::in(['newest', 'inventory', 'stock'])],
'skus' => ['required', 'array'],
'skus.*.id' => [
'required',
Rule::exists('goods_skus', 'id'),
],
];
- $data = $request->all();
- $this->validateUpdate($data, $appendRules);
- GoodsSku::whereIn('id', array_column($data, 'id'))
- ->update($data);
+ $validator = $this->validateUpdate($request->all(), $appendRules);
+ if ($validator->fails()) {
+ $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
+
+ return response($this->res, $this->res['httpCode']);
+ }
+ $function = $request->updateType;
+
+ return $this->$function($request);
+ }
+
+ private function newest($request)
+ {
+ DB::beginTransaction();
+ try {
+ $logs = [];
+ foreach ($request->skus as $sku) {
+ $costLog = $arrivedLog = [
+ 'module' => 'goods',
+ 'action' => $request->getMethod(),
+ 'target_type' => 'goods_sku',
+ 'target_id' => $sku['id'],
+ 'user_id' => $request->user()->id
+ ];
+ // 成本
+ $goodsSku = GoodsSku::query()->where('id', $sku['id'])->first(['id', 'cost']);
+ $costLog['target_field'] = 'cost';
+ $costLog['before_update'] = $goodsSku->cost;
+ $goodsSku->cost = $sku['cost'];
+ $goodsSku->reference_price = $sku['cost'] * 1.5;
+ $goodsSku->save();
+ $costLog['after_update'] = $goodsSku->cost;
+ $logs[] = $costLog;
+ // 今日到货
+ $record = DailyStockRecord::query()->where('sku_id', $sku['id'])->where('day', FormatUtils::date())->first(['id', 'arrived_today_num']);
+ $arrivedLog['target_field'] = 'arrived_today_num';
+ $arrivedLog['before_update'] = $record->arrived_today_num;
+ $record->arrived_today_num = $sku['arrived_today_num'];
+ $record->save();
+ $arrivedLog['after_update'] = $record->arrived_today_num;
+ $logs[] = $arrivedLog;
+ }
+ $log = new LogModel();
+ $log->batchInsert($logs);
+ DB::commit();
+ } catch (\Exception $exception) {
+ DB::rollBack();
+ $this->res = [
+ 'httpCode' => 400,
+ 'errorCode' => 400500,
+ 'errorMessage' => $exception->getMessage(),
+ ];
+ }
+
+ return response($this->res, $this->res['httpCode']);
+ }
+
+ private function inventory($request)
+ {
+ DB::beginTransaction();
+ try {
+ $logs = [];
+ foreach ($request->skus as $sku) {
+ $inventoryLog = [
+ 'module' => 'goods',
+ 'action' => $request->getMethod(),
+ 'target_type' => 'goods_sku',
+ 'target_id' => $sku['id'],
+ 'user_id' => $request->user()->id
+ ];
+ // 今日到货
+ $record = DailyStockRecord::query()->where('sku_id', $sku['id'])->where('day', FormatUtils::date())->first(['id', 'inventory']);
+ $inventoryLog['target_field'] = 'inventory';
+ $inventoryLog['before_update'] = $record->inventory;
+ $record->inventory = $sku['inventory'];
+ $record->save();
+ $inventoryLog['after_update'] = $record->inventory;
+ $logs[] = $inventoryLog;
+ }
+ $log = new LogModel();
+ $log->batchInsert($logs);
+ DB::commit();
+ } catch (\Exception $exception) {
+ DB::rollBack();
+ $this->res = [
+ 'httpCode' => 400,
+ 'errorCode' => 400500,
+ 'errorMessage' => $exception->getMessage(),
+ ];
+ }
+
+ return response($this->res, $this->res['httpCode']);
+ }
+
+ private function stock($skus)
+ {
+ $update = reset($skus);
+ DB::beginTransaction();
+ try {
+ $sku = GoodsSku::query()->where('id', $update['id'])->get(['id', 'two_days_ago_num', 'yesterday_num']);
+ $record = DailyStockRecord::query()
+ ->where('sku_id', $sku->id)
+ ->where('day', FormatUtils::date())
+ ->first();
+ $this->setBeforeUpdate([
+ 'two_days_ago_num' => $sku->two_days_ago_num,
+ 'yesterday_num' => $sku->yesterday_num,
+ 'arrived_today_num' => $record->arrived_today_num,
+ ]);
+ $sku->two_days_ago_num = $update['two_days_ago_num'];
+ $sku->yesterday_num = $update['two_days_ago_num'];
+ $sku->save();
+ $record->arrived_today_num = $update['arrived_today_num'];
+ $record->save();
+ $this->setAfterUpdate([
+ 'two_days_ago_num' => $sku->two_days_ago_num,
+ 'yesterday_num' => $sku->yesterday_num,
+ 'arrived_today_num' => $record->arrived_today_num,
+ ]);
+ $this->addLog($sku->id, 'stock');
+ DB::commit();
+ } catch (\Exception $exception) {
+ DB::rollBack();
+ $this->res = [
+ 'httpCode' => 400,
+ 'errorCode' => 400416,
+ 'errorMessage' => $exception->getMessage(),
+ ];
+ }
+
+ return response($this->res, $this->res['httpCode']);
}
public function updateField($id, Request $request)
{
- $appendRules = [
+ $rules = [
'updateField' => [
'required',
Rule::in(['reference_price', 'reserve', 'loss_num', 'status'])
],
+ 'reference_price' => [
+ 'sometimes',
+ 'numeric',
+ 'gt:0'
+ ],
+ 'reserve' => [
+ 'sometimes',
+ 'integer',
+ ],
+ 'loss_num' => [
+ 'sometimes',
+ 'integer',
+ ],
+ 'inventory' => [
+ 'sometimes',
+ 'integer',
+ ],
+ 'reason' => [
+ 'sometimes',
+ 'required',
+ 'string'
+ ]
];
- if ($request->has('loss_num')) {
- $appendRules['reason'] = ['required', 'string'];
+ $validator = Validator::make($request->all(), $rules);
+ if ($validator->fails()) {
+ $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
+
+ return response($this->res, $this->res['httpCode']);
}
- $this->validateUpdate($request->all(), $appendRules);
$updateField = \request('updateField');
- $sku = GoodsSku::query()->find($id);
- $this->setBeforeUpdate($sku->$updateField);
- $sku->$updateField = $request->$updateField;
- $sku->save();
- $this->setAfterUpdate($sku->$updateField);
+ if ('loss_num' === $updateField) {
+ $model = DailyStockRecord::query()
+ ->where('sku_id', $id)
+ ->where('day', FormatUtils::date())
+ ->first(['id', 'loss_num']);
+ $this->log->message = $request->input('reason', '');
+ } else {
+ $model = GoodsSku::query()->find($id);
+ }
+ $this->setBeforeUpdate($model->$updateField);
+ $model->$updateField = $request->$updateField;
+ $model->save();
+ $this->setAfterUpdate($model->$updateField);
$this->addLog($id, $updateField);
- return new GoodsSkuResource($sku);
- }
-
- public function updateStock($id, Request $request)
- {
- $this->validateUpdate($request->all());
- $sku = GoodsSku::query()->where('id', $id)->get(['id', 'two_days_ago_num', 'yesterday_num']);
- if ($sku->two_days_ago_num != \request('t wo_days_ago_num') || $sku->yesterday_num != \request('yesterday_num')) {
- $this->setBeforeUpdate($sku->toArray());
- }
-
- }
-
- private function validateUpdate($data, $appendRules = [])
- {
- $rules = [
- '*.two_days_ago_num' => [
- 'sometimes',
- 'integer',
- ],
- '*.yesterday_num' => [
- 'sometimes',
- 'integer',
- ],
- '*.arrived_today_num' => [
- 'sometimes',
- 'integer',
- ],
- '*.cost' => [
- 'sometimes',
- 'numeric',
- 'gt:0'
- ],
- '*.reference_price' => [
- 'sometimes',
- 'numeric',
- 'gt:0'
- ],
- '*.reserve' => [
- 'sometimes',
- 'integer',
- ],
- '*.loss_num' => [
- 'sometimes',
- 'integer',
- ],
- '*.inventory' => [
- 'sometimes',
- 'integer',
- ],
- '*.status' => [
- 'sometimes',
- 'integer',
- Rule::in([0, 1, 2])
- ],
- ];
-// $validator = Validator::make($data, array_merge($rules, $appendRules))->validate();
- $validator = Validator::make($data, array_merge($rules, $appendRules));
+ return response($this->res, $this->res['httpCode']);
}
public function store(Request $request)
diff --git a/app/Http/Requests/GoodsSkuRequest.php b/app/Http/Requests/GoodsSkuRequest.php
index d6824e0..c403df0 100644
--- a/app/Http/Requests/GoodsSkuRequest.php
+++ b/app/Http/Requests/GoodsSkuRequest.php
@@ -32,6 +32,23 @@ class GoodsSkuRequest extends FormRequest
'status' => ['required', 'integer', Rule::in([0, 1, 2])],
'num' => ['required', 'integer'],
'cost' => ['required', 'numeric'],
+ 'reference_price' => [
+ 'sometimes',
+ 'numeric',
+ 'gt:0'
+ ],
+ 'reserve' => [
+ 'sometimes',
+ 'integer',
+ ],
+ 'loss_num' => [
+ 'sometimes',
+ 'integer',
+ ],
+ 'inventory' => [
+ 'sometimes',
+ 'integer',
+ ],
];
}
diff --git a/app/Utils/FormatUtils.php b/app/Utils/FormatUtils.php
index 667f332..a0a98d5 100644
--- a/app/Utils/FormatUtils.php
+++ b/app/Utils/FormatUtils.php
@@ -7,8 +7,11 @@ class FormatUtils
/**
* 格式化为树形结构
* @param $menus
- * @param $parentId
- * @param $juniorTitle //下级标题
+ * @param $parentValue
+ * @param string $juniorTitle //下级标题
+ * @param string $parentKey
+ * @param string $subKey
+ * @param string $useKey
* @return array
*/
public static function formatTreeData($menus, $parentValue, $juniorTitle = 'children', $parentKey = 'parent_id', $subKey = 'id', $useKey = '')
@@ -30,4 +33,18 @@ class FormatUtils
}
return $data;
}
+
+ /**
+ * 今天7点到明天7点算作今天
+ */
+ public static function date()
+ {
+ $time = time();
+ $inventoryTime = strtotime(date('Y-m-d 07:00:00'));
+ if ($time < $inventoryTime) {
+ $time = strtotime('-1 day');
+ }
+
+ return date('Y-m-d', $time);
+ }
}
diff --git a/database/migrations/2022_07_26_105818_create_logs_table.php b/database/migrations/2022_07_26_105818_create_logs_table.php
index 1ca6436..1530d0c 100644
--- a/database/migrations/2022_07_26_105818_create_logs_table.php
+++ b/database/migrations/2022_07_26_105818_create_logs_table.php
@@ -22,6 +22,7 @@ class CreateLogsTable extends Migration
$table->string('target_field')->nullable()->comment('目标字段');
$table->text('before_update')->nullable()->comment('更新前数据');
$table->text('after_update')->nullable()->comment('更新后数据');
+ $table->text('message')->nullable()->comment('备注信息');
$table->bigInteger('user_id')->comment('操作人id');
$table->timestamps();
});
diff --git a/routes/api.php b/routes/api.php
index c6b756b..5c5adc8 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -30,6 +30,7 @@ Route::middleware('auth:api')->group(function () {
// 商品规格
Route::resource('goods_skus', 'Goods\GoodsSkusController', ['only' => ['index', 'show', 'update', 'store']]);
Route::patch('batch/goods_skus', [GoodsSkusController::class, 'batchUpdate'])->name('goods_sku.batch_update');
+ Route::patch('single/goods_skus/{id}', [GoodsSkusController::class, 'updateField'])->name('goods_sku.single_update');
// 店铺
Route::resource('shops', 'Shop\ShopsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
Route::get('shop_platforms', [ShopsController::class, 'getPlatList'])->name('plat.list');
From c45c004ad8545c54f2743cddb359f2e777b5ef48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 3 Aug 2022 20:41:04 +0800
Subject: [PATCH 25/68] =?UTF-8?q?feat:=20#20220803=20=E5=8D=95=E4=B8=AA?=
=?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Goods/GoodsSkusController.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index 1798db4..d47c1cb 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -260,15 +260,16 @@ class GoodsSkusController extends Controller
'sometimes',
'integer',
],
- 'inventory' => [
- 'sometimes',
- 'integer',
- ],
'reason' => [
'sometimes',
'required',
'string'
- ]
+ ],
+ 'status' => [
+ 'sometimes',
+ 'required',
+ 'integer',
+ Rule::in([0, 1, 2])],
];
$validator = Validator::make($request->all(), $rules);
if ($validator->fails()) {
From 9553c73c427de976192a5ec90041c721eeb642db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Thu, 4 Aug 2022 13:21:45 +0800
Subject: [PATCH 26/68] =?UTF-8?q?feat:=20#20220804=207=E7=82=B9=E5=BA=93?=
=?UTF-8?q?=E5=AD=98=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Console/Commands/Inventory.php | 79 +++++++++++++++++++
.../Controllers/Goods/GoodsSkusController.php | 1 +
app/Models/Log.php | 2 +-
...03559_create_daily_stock_records_table.php | 1 +
.../2022_07_26_105818_create_logs_table.php | 1 +
5 files changed, 83 insertions(+), 1 deletion(-)
create mode 100644 app/Console/Commands/Inventory.php
diff --git a/app/Console/Commands/Inventory.php b/app/Console/Commands/Inventory.php
new file mode 100644
index 0000000..59ad9f9
--- /dev/null
+++ b/app/Console/Commands/Inventory.php
@@ -0,0 +1,79 @@
+get(['id', 'stock', 'two_days_ago_num', 'yesterday_num']);
+ $data = [];
+ $date = date('Y-m-d');
+ foreach ($skus as $sku) {
+ $data[] = [
+ 'sku_id' => $sku->id,
+ 'day' => $date,
+ ];
+ GoodsSku::where('id', $sku->id)->update([
+ 'stock' => $sku->stock + $sku->two_days_ago_num + $sku->yesterday_num,
+ 'yesterday_num' => $sku->stock,
+ 'two_days_ago_num' => $sku->two_days_ago_num + $sku->yesterday_num,
+ ]);
+ }
+ $log = new Log();
+ $log->module = 'goods';
+ $log->action = 'PATCH';
+ $log->target_type = 'goods_sku';
+ $log->target_id = 0;
+ $log->target_field = 'timingInventory';
+ $log->user_id = 1;
+ $record = new DailyStockRecord();
+ $record->batchInsert($data);
+ $log->message = '成功';
+ DB::commit();
+ } catch (\Exception $exception) {
+ $log->message = '失败';
+ DB::rollBack();
+ }
+ $log->save();
+ $this->info($log->message);
+ }
+}
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index d47c1cb..f72f1a7 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -36,6 +36,7 @@ class GoodsSkusController extends Controller
$goods = Goods::query()->filter()->get()->toArray();
$goodsIds = array_column($goods, 'id');
// 状态变更时间查询,日志
+
$day = FormatUtils::date();
$goodsSkus = GoodsSku::query()
->whereIn('goods_id', $goodsIds)
diff --git a/app/Models/Log.php b/app/Models/Log.php
index 2b09204..75c1cd7 100644
--- a/app/Models/Log.php
+++ b/app/Models/Log.php
@@ -87,7 +87,7 @@ class Log extends Model
public function setUserIdAttribute($value)
{
- $this->attributes['user_id'] = Auth::id();
+ $this->attributes['user_id'] = Auth::id() ?: $value;
}
public function add($targetId = 0, $targetField = '')
diff --git a/database/migrations/2022_07_26_103559_create_daily_stock_records_table.php b/database/migrations/2022_07_26_103559_create_daily_stock_records_table.php
index 1c4706d..7d97f34 100644
--- a/database/migrations/2022_07_26_103559_create_daily_stock_records_table.php
+++ b/database/migrations/2022_07_26_103559_create_daily_stock_records_table.php
@@ -20,6 +20,7 @@ class CreateDailyStockRecordsTable extends Migration
$table->unsignedInteger('arrived_today_num')->default(0)->comment('今日到货');
$table->unsignedInteger('loss_num')->default(0)->comment('损耗');
$table->unsignedInteger('inventory')->default(0)->comment('库存盘点');
+ $table->unique('sku_id', 'day');
$table->timestamps();
});
}
diff --git a/database/migrations/2022_07_26_105818_create_logs_table.php b/database/migrations/2022_07_26_105818_create_logs_table.php
index 1530d0c..2a30d1c 100644
--- a/database/migrations/2022_07_26_105818_create_logs_table.php
+++ b/database/migrations/2022_07_26_105818_create_logs_table.php
@@ -24,6 +24,7 @@ class CreateLogsTable extends Migration
$table->text('after_update')->nullable()->comment('更新后数据');
$table->text('message')->nullable()->comment('备注信息');
$table->bigInteger('user_id')->comment('操作人id');
+ $table->index('target_type', 'target_id', 'target_field');
$table->timestamps();
});
}
From 088c41cee9cb2c5a5d7e0e2a2ba81947294e8976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Thu, 4 Aug 2022 13:55:28 +0800
Subject: [PATCH 27/68] =?UTF-8?q?feat:=20#20220804=20=E5=95=86=E5=93=81?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Goods/GoodsSkusController.php | 40 +++++++++++++++----
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index f72f1a7..044d95e 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\GoodsRequest;
use App\Http\Requests\GoodsSkuRequest;
use App\Models\Goods;
+use App\Models\Log;
use App\Models\Log as LogModel;
use App\Utils\FormatUtils;
use Illuminate\Http\Request;
@@ -36,10 +37,20 @@ class GoodsSkusController extends Controller
$goods = Goods::query()->filter()->get()->toArray();
$goodsIds = array_column($goods, 'id');
// 状态变更时间查询,日志
-
+ $ids = [];
+ if ($request->get('keyword_type', '') && $request->get('keyword_value', '')) {
+ $ids = Log::query()->where('target_type', 'sku')
+ ->where('target_field', $request->keyword_type)
+ ->whereBetween('created_at', explode(' - ', $request->keyword_value))
+ ->pluck('sku_id')
+ ->toArray();
+ }
$day = FormatUtils::date();
$goodsSkus = GoodsSku::query()
->whereIn('goods_id', $goodsIds)
+ ->when($ids, function ($query, $ids) {
+ return $query->whereIn('id', $ids);
+ })
->filter()
->with(['goods' => function ($query) {
$query->with(['type:id,name', 'brand:id,name']);
@@ -133,11 +144,13 @@ class GoodsSkusController extends Controller
'user_id' => $request->user()->id
];
// 成本
- $goodsSku = GoodsSku::query()->where('id', $sku['id'])->first(['id', 'cost']);
+ $goodsSku = GoodsSku::query()->where('id', $sku['id'])->first(['id', 'cost', 'stock', 'num']);
$costLog['target_field'] = 'cost';
$costLog['before_update'] = $goodsSku->cost;
$goodsSku->cost = $sku['cost'];
$goodsSku->reference_price = $sku['cost'] * 1.5;
+ $goodsSku->stock += $sku['arrived_today_num'];
+ $goodsSku->num += $sku['arrived_today_num'];
$goodsSku->save();
$costLog['after_update'] = $goodsSku->cost;
$logs[] = $costLog;
@@ -145,7 +158,7 @@ class GoodsSkusController extends Controller
$record = DailyStockRecord::query()->where('sku_id', $sku['id'])->where('day', FormatUtils::date())->first(['id', 'arrived_today_num']);
$arrivedLog['target_field'] = 'arrived_today_num';
$arrivedLog['before_update'] = $record->arrived_today_num;
- $record->arrived_today_num = $sku['arrived_today_num'];
+ $record->arrived_today_num += $sku['arrived_today_num'];
$record->save();
$arrivedLog['after_update'] = $record->arrived_today_num;
$logs[] = $arrivedLog;
@@ -207,7 +220,7 @@ class GoodsSkusController extends Controller
$update = reset($skus);
DB::beginTransaction();
try {
- $sku = GoodsSku::query()->where('id', $update['id'])->get(['id', 'two_days_ago_num', 'yesterday_num']);
+ $sku = GoodsSku::query()->where('id', $update['id'])->get(['id', 'two_days_ago_num', 'yesterday_num', 'num', 'stock']);
$record = DailyStockRecord::query()
->where('sku_id', $sku->id)
->where('day', FormatUtils::date())
@@ -215,10 +228,12 @@ class GoodsSkusController extends Controller
$this->setBeforeUpdate([
'two_days_ago_num' => $sku->two_days_ago_num,
'yesterday_num' => $sku->yesterday_num,
+ 'num' => $sku->num,
'arrived_today_num' => $record->arrived_today_num,
]);
$sku->two_days_ago_num = $update['two_days_ago_num'];
- $sku->yesterday_num = $update['two_days_ago_num'];
+ $sku->yesterday_num = $update['yesterday_num'];
+ $sku->num = $update['two_days_ago_num'] + $update['yesterday_num'] + $sku->stock;
$sku->save();
$record->arrived_today_num = $update['arrived_today_num'];
$record->save();
@@ -284,12 +299,21 @@ class GoodsSkusController extends Controller
->where('sku_id', $id)
->where('day', FormatUtils::date())
->first(['id', 'loss_num']);
- $this->log->message = $request->input('reason', '');
+ $this->log->message = $request->get('reason');
+ $this->setBeforeUpdate($model->loss_num);
+ $model->loss_num += $request->loss_num;
} else {
$model = GoodsSku::query()->find($id);
+ $this->setBeforeUpdate($model->$updateField);
+ if ('reserve' === $updateField) {
+ $changeNum = $model->reserve - $request->reserve;
+ $model->stock += $changeNum;
+ $model->reserve = $request->reserve;
+ $model->num += $changeNum;
+ } else {
+ $model->$updateField = $request->$updateField;
+ }
}
- $this->setBeforeUpdate($model->$updateField);
- $model->$updateField = $request->$updateField;
$model->save();
$this->setAfterUpdate($model->$updateField);
$this->addLog($id, $updateField);
From 2dc13086751143861460f057189d8df7cd0a716b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Thu, 4 Aug 2022 14:25:12 +0800
Subject: [PATCH 28/68] =?UTF-8?q?feat:=20#20220804=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Exports/GoodsSkusExport.php | 75 +++++++++++++++++++
.../Controllers/Goods/GoodsSkusController.php | 8 ++
routes/web.php | 4 +
3 files changed, 87 insertions(+)
create mode 100644 app/Exports/GoodsSkusExport.php
diff --git a/app/Exports/GoodsSkusExport.php b/app/Exports/GoodsSkusExport.php
new file mode 100644
index 0000000..d9316a8
--- /dev/null
+++ b/app/Exports/GoodsSkusExport.php
@@ -0,0 +1,75 @@
+type = $type;
+ $this->data = $this->createData();
+ }
+
+ /**
+ * @return \Illuminate\Support\Collection
+ */
+ public function collection()
+ {
+ return new Collection($this->data);
+ }
+
+ private function createData()
+ {
+ $headTitle = [
+ '商品编码',
+ '商品名称',
+ '商品种类',
+ '商品品牌',
+ '规格编码',
+ '规格名称',
+ '成本',
+ '库存',
+ ];
+ $inventoryTime = strtotime(date('Y-m-d 07:00:00'));
+ $ids = Log::query()->where('target_type', 'sku')
+ ->where('target_field', $this->type)
+ ->where('created_at', '>', $inventoryTime)
+ ->pluck('sku_id')
+ ->toArray();
+ $data = GoodsSku::query()
+ ->when($ids, function ($query, $ids) {
+ return $query->whereIn('id', $ids);
+ })
+ ->with(['goods' => function ($query) {
+ $query->with(['type:id,name', 'brand:id,name']);
+ }])
+ ->get()
+ ->toArray();
+ if (empty($data)) {
+ return [$headTitle];
+ }
+ $bodyData = [];
+ foreach ($data as $item) {
+ $arr[0] = $item['goods']['goods_code'];
+ $arr[1] = $item['goods']['title'];
+ $arr[2] = $item['goods']['type']['name'];
+ $arr[3] = $item['goods']['brand']['name'];
+ $arr[4] = $item['goods']['sku_code'];
+ $arr[5] = $item['goods']['title'];
+ $arr[6] = $item['goods']['cost'];
+ $arr[7] = $item['goods']['stock'];
+ $bodyData[] = $arr;
+ }
+ unset($arr);
+ return [$headTitle, $bodyData];
+ }
+}
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index 044d95e..97053f1 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Goods;
+use App\Exports\GoodsSkusExport;
use App\Http\Controllers\Controller;
use App\Http\Requests\GoodsRequest;
use App\Http\Requests\GoodsSkuRequest;
@@ -340,4 +341,11 @@ class GoodsSkusController extends Controller
return response($this->res, $this->res['httpCode']);
}
+
+ public function export(Request $request)
+ {
+ $type = $request->get('exportType');
+ ob_end_clean();
+ return Excel::download(new GoodsSkusExport($type), $type, '.xlsx');
+ }
}
diff --git a/routes/web.php b/routes/web.php
index 4f8529e..0af6dd8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,7 @@
name('register');
+
+Route::get('goods_skus/export', [GoodsSkusController::class, 'export'])->name('goods_skus.export');
From 6520d8bd6f5485cdd85e7270af61541d1f392a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Thu, 4 Aug 2022 18:13:00 +0800
Subject: [PATCH 29/68] =?UTF-8?q?feat:=20#20220804=20=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Commands/UpdateSuperPermissions.php | 6 +-
.../Controllers/Goods/GoodsSkusController.php | 1 -
app/Http/Controllers/Menu/MenusController.php | 16 +-
.../Permission/PermissionsController.php | 12 +-
app/Http/Kernel.php | 1 +
app/Http/Middleware/CheckPermissions.php | 38 +++
app/Models/User.php | 5 +
config/filesystems.php | 4 +
.../2022_07_26_105818_create_logs_table.php | 2 +-
database/seeds/PermissionsTableSeeder.php | 18 +-
resources/lang/zh-CN/permission.php | 234 ++++++++++++++++++
resources/templates/goods_skus_import.xlsx | Bin 0 -> 10134 bytes
routes/api.php | 13 +-
routes/web.php | 2 +-
14 files changed, 326 insertions(+), 26 deletions(-)
create mode 100644 app/Http/Middleware/CheckPermissions.php
create mode 100644 resources/lang/zh-CN/permission.php
create mode 100644 resources/templates/goods_skus_import.xlsx
diff --git a/app/Console/Commands/UpdateSuperPermissions.php b/app/Console/Commands/UpdateSuperPermissions.php
index 637d6f8..c662b0b 100644
--- a/app/Console/Commands/UpdateSuperPermissions.php
+++ b/app/Console/Commands/UpdateSuperPermissions.php
@@ -2,6 +2,7 @@
namespace App\Console\Commands;
+use App\Models\User;
use Illuminate\Console\Command;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\Models\Role;
@@ -39,9 +40,12 @@ class UpdateSuperPermissions extends Command
*/
public function handle()
{
- $role = Role::query()->where('name', '超级管理员')->find(1);
+ $roleName = '超级管理员';
+ $role = Role::query()->where('name', $roleName)->find(1);
$permissions = Permission::query()->get();
$role->syncPermissions($permissions);
+ $user = User::query()->find(1);
+ $user->assignRole($role);
$this->info('更新成功');
}
}
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index 97053f1..e04ad52 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -25,7 +25,6 @@ class GoodsSkusController extends Controller
{
public function __construct(Request $request)
{
-// $this->middleware(['role:super-admin','permission:publish articles|edit articles']);
$this->log = new LogModel([
'module' => 'goods',
'action' => $request->getMethod(),
diff --git a/app/Http/Controllers/Menu/MenusController.php b/app/Http/Controllers/Menu/MenusController.php
index ee53406..dd50b68 100644
--- a/app/Http/Controllers/Menu/MenusController.php
+++ b/app/Http/Controllers/Menu/MenusController.php
@@ -6,6 +6,8 @@ use App\Http\Controllers\Controller;
use App\Models\Log as LogModel;
use App\Models\Menu;
use App\Http\Resources\MenusResource;
+use App\Models\User;
+use App\Utils\ArrayUtils;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
@@ -22,10 +24,18 @@ class MenusController extends Controller
]);
}
- public function index()
+ public function index(Request $request)
{
- $menus = Menu::query()->get();
- $menus = FormatUtils::formatTreeData($menus, 0);
+ $permissions = $request->user()->getPermissionsViaRoles()->toArray();
+ $permissions = array_column($permissions, 'name');
+ $menus = Menu::query()->get()->toArray();
+ $hasPermissionMenus = [];
+ foreach ($menus as $menu) {
+ if (in_array($menu['code'], $permissions, true)) {
+ $hasPermissionMenus[] = $menu;
+ }
+ }
+ $menus = FormatUtils::formatTreeData($hasPermissionMenus, 0);
return MenusResource::collection($menus);
}
diff --git a/app/Http/Controllers/Permission/PermissionsController.php b/app/Http/Controllers/Permission/PermissionsController.php
index 7507489..112f82b 100644
--- a/app/Http/Controllers/Permission/PermissionsController.php
+++ b/app/Http/Controllers/Permission/PermissionsController.php
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Permission;
use App\Http\Controllers\Controller;
use App\Models\Log as LogModel;
+use App\Utils\ArrayUtils;
+use App\Utils\FormatUtils;
use Spatie\Permission\Models\Permission;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
@@ -23,9 +25,15 @@ class PermissionsController extends Controller
public function index()
{
- $permissions = Permission::query()->get();
+ $permissions = Permission::query()->get()->toArray();
+ $permissions = ArrayUtils::index($permissions, 'name');
+ $routes = include(resource_path('lang/zh-CN/permission.php'));
+ foreach ($routes as $key => &$route) {
+ $route['id'] = $permissions[$key]['id'];
+ }
+ $routes = FormatUtils::formatTreeData($routes, 0);
- return PermissionsResource::collection($permissions);
+ return PermissionsResource::collection($routes);
}
public function store(Request $request)
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index b1c73d6..cf52c70 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -63,6 +63,7 @@ class Kernel extends HttpKernel
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
+ 'check.permissions' => \App\Http\Middleware\CheckPermissions::class,
];
/**
diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php
new file mode 100644
index 0000000..b8f8ae4
--- /dev/null
+++ b/app/Http/Middleware/CheckPermissions.php
@@ -0,0 +1,38 @@
+user()->getPermissionsViaRoles()->toArray();
+ $permissions = array_column($permissions, 'name');
+ if (in_array($currentRouteName, $permissions, true)) {
+ return $next($request);
+ }
+ }
+
+ $res = [
+ 'httpCode' => 403,
+ 'errorCode' => 403403,
+ 'errorMessage' => '您没有使用此功能的权限',
+ ];
+ return response($res, 403);
+ }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index b6d8d5e..88194f2 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -43,4 +43,9 @@ class User extends Authenticatable
{
$this->attributes['password'] = Hash::make($value);
}
+
+ public function isRoot()
+ {
+ return $this->name === 'erpAdmin';
+ }
}
diff --git a/config/filesystems.php b/config/filesystems.php
index 9df9941..b2f1d2f 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -76,6 +76,10 @@ return [
'isCName' => false, // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url， false: 则使用外部节点生成url
'debug' => true
],
+ 'root' => [
+ 'driver' => 'local',
+ 'root' => '/'
+ ]
],
];
diff --git a/database/migrations/2022_07_26_105818_create_logs_table.php b/database/migrations/2022_07_26_105818_create_logs_table.php
index 2a30d1c..da9c3c2 100644
--- a/database/migrations/2022_07_26_105818_create_logs_table.php
+++ b/database/migrations/2022_07_26_105818_create_logs_table.php
@@ -24,7 +24,7 @@ class CreateLogsTable extends Migration
$table->text('after_update')->nullable()->comment('更新后数据');
$table->text('message')->nullable()->comment('备注信息');
$table->bigInteger('user_id')->comment('操作人id');
- $table->index('target_type', 'target_id', 'target_field');
+ $table->index(['target_type', 'target_id', 'target_field']);
$table->timestamps();
});
}
diff --git a/database/seeds/PermissionsTableSeeder.php b/database/seeds/PermissionsTableSeeder.php
index 0df8a79..c0aa0f7 100644
--- a/database/seeds/PermissionsTableSeeder.php
+++ b/database/seeds/PermissionsTableSeeder.php
@@ -12,17 +12,11 @@ class PermissionsTableSeeder extends Seeder
*/
public function run()
{
- DB::table('permissions')->insert([
- ['name' => 'GOODS_MANAGE', 'guard_name' => 'api'],
- ['name' => 'GOODS_LIST', 'guard_name' => 'api'],
- ['name' => 'GOODS_TYPE', 'guard_name' => 'api'],
- ['name' => 'GOODS_BRAND', 'guard_name' => 'api'],
- ['name' => 'SHOP_MANAGE', 'guard_name' => 'api'],
- ['name' => 'USER_MANAGE', 'guard_name' => 'api'],
- ['name' => 'SYSTEM_MANAGE', 'guard_name' => 'api'],
- ['name' => 'ROLE_MANAGE', 'guard_name' => 'api'],
- ['name' => 'PERMISSION_MANAGE', 'guard_name' => 'api'],
- ['name' => 'SYSTEM_LOG', 'guard_name' => 'api'],
- ]);
+ $routes = include(resource_path('lang/zh-CN/permission.php'));
+ $data = [];
+ foreach ($routes as $key => $route) {
+ $data[] = ['name' => $key, 'guard_name' => 'api'];
+ }
+ DB::table('permissions')->insert($data);
}
}
diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php
new file mode 100644
index 0000000..7493111
--- /dev/null
+++ b/resources/lang/zh-CN/permission.php
@@ -0,0 +1,234 @@
+ [
+ 'id' => 1,
+ 'name' => '商品管理',
+ 'parent_id' => 0,
+ ],
+ 'GOODS_LIST' => [
+ 'id' => 2,
+ 'name' => '商品列表',
+ 'parent_id' => 1,
+ ],
+ 'goods.index' => [
+ 'id' => 20,
+ 'name' => '商品列表',
+ 'parent_id' => 2,
+ ],
+ 'goods.store' => [
+ 'id' => 21,
+ 'name' => '新增商品',
+ 'parent_id' => 2,
+ ],
+ 'goods_skus.index' => [
+ 'id' => 22,
+ 'name' => '规格列表',
+ 'parent_id' => 2,
+ ],
+ 'goods_skus.store' => [
+ 'id' => 23,
+ 'name' => '新增规格',
+ 'parent_id' => 2,
+ ],
+ 'goods_skus.show' => [
+ 'id' => 24,
+ 'name' => '规格查看',
+ 'parent_id' => 2,
+ ],
+ 'goods_skus.udpate' => [
+ 'id' => 25,
+ 'name' => '规格更新',
+ 'parent_id' => 2,
+ ],
+ 'goods_sku.batch_update' => [
+ 'id' => 26,
+ 'name' => '上新/盘点',
+ 'parent_id' => 2,
+ ],
+ 'goods_sku.single_update' => [
+ 'id' => 27,
+ 'name' => '字段更新',
+ 'parent_id' => 2,
+ ],
+ 'GOODS_TYPE' => [
+ 'id' => 3,
+ 'name' => '商品种类',
+ 'parent_id' => 1,
+ ],
+ 'goods_types.index' => [
+ 'id' => 30,
+ 'name' => '列表',
+ 'parent_id' => 3,
+ ],
+ 'goods_types.store' => [
+ 'id' => 31,
+ 'name' => '新增',
+ 'parent_id' => 3,
+ ],
+ 'goods_types.show' => [
+ 'id' => 32,
+ 'name' => '查看',
+ 'parent_id' => 3,
+ ],
+ 'goods_types.update' => [
+ 'id' => 33,
+ 'name' => '更新',
+ 'parent_id' => 3,
+ ],
+ 'goods_types.destroy' => [
+ 'id' => 34,
+ 'name' => '删除',
+ 'parent_id' => 3,
+ ],
+ 'GOODS_BRAND' => [
+ 'id' => 4,
+ 'name' => '商品品牌',
+ 'parent_id' => 1,
+ ],
+ 'goods_brands.index' => [
+ 'id' => 40,
+ 'name' => '列表',
+ 'parent_id' => 4,
+ ],
+ 'goods_brands.store' => [
+ 'id' => 41,
+ 'name' => '新增',
+ 'parent_id' => 4,
+ ],
+ 'goods_brands.show' => [
+ 'id' => 42,
+ 'name' => '查看',
+ 'parent_id' => 4,
+ ],
+ 'goods_brands.update' => [
+ 'id' => 43,
+ 'name' => '更新',
+ 'parent_id' => 4,
+ ],
+ 'goods_brands.destroy' => [
+ 'id' => 44,
+ 'name' => '删除',
+ 'parent_id' => 4,
+ ],
+ // 店铺管理
+ 'SHOP_MANAGE' => [
+ 'id' => 5,
+ 'name' => '店铺管理',
+ 'parent_id' => 0,
+ ],
+ 'shops.index' => [
+ 'id' => 50,
+ 'name' => '列表',
+ 'parent_id' => 5,
+ ],
+ 'shops.store' => [
+ 'id' => 51,
+ 'name' => '新增',
+ 'parent_id' => 5,
+ ],
+ 'shops.show' => [
+ 'id' => 52,
+ 'name' => '查看',
+ 'parent_id' => 5,
+ ],
+ 'shops.update' => [
+ 'id' => 53,
+ 'name' => '更新',
+ 'parent_id' => 5,
+ ],
+ 'shops.destroy' => [
+ 'id' => 54,
+ 'name' => '删除',
+ 'parent_id' => 5,
+ ],
+ // 用户管理
+ 'USER_MANAGE' => [
+ 'id' => 6,
+ 'name' => '用户管理',
+ 'parent_id' => 0,
+ ],
+ 'user.index' => [
+ 'id' => 60,
+ 'name' => '列表',
+ 'parent_id' => 6,
+ ],
+ 'user.store' => [
+ 'id' => 61,
+ 'name' => '新增',
+ 'parent_id' => 6,
+ ],
+ 'user.show' => [
+ 'id' => 62,
+ 'name' => '查看',
+ 'parent_id' => 6,
+ ],
+ 'user.update' => [
+ 'id' => 63,
+ 'name' => '更新',
+ 'parent_id' => 6,
+ ],
+ 'user.destroy' => [
+ 'id' => 64,
+ 'name' => '删除',
+ 'parent_id' => 6,
+ ],
+ // 系统管理
+ 'SYSTEM_MANAGE' => [
+ 'id' => 7,
+ 'name' => '系统管理',
+ 'parent_id' => 0,
+ ],
+ 'ROLE_MANAGE' => [
+ 'id' => 8,
+ 'name' => '角色管理',
+ 'parent_id' => 7,
+ ],
+ 'role.index' => [
+ 'id' => 80,
+ 'name' => '列表',
+ 'parent_id' => 8,
+ ],
+ 'role.store' => [
+ 'id' => 81,
+ 'name' => '新增',
+ 'parent_id' => 8,
+ ],
+ 'role.show' => [
+ 'id' => 82,
+ 'name' => '查看',
+ 'parent_id' => 8,
+ ],
+ 'role.update' => [
+ 'id' => 83,
+ 'name' => '更新',
+ 'parent_id' => 8,
+ ],
+ 'role.permission' => [
+ 'id' => 84,
+ 'name' => '设置权限',
+ 'parent_id' => 8,
+ ],
+ 'PERMISSION_MANAGE' => [
+ 'id' => 9,
+ 'name' => '权限管理',
+ 'parent_id' => 7,
+ ],
+ 'permissions.index' => [
+ 'id' => 90,
+ 'name' => '列表',
+ 'parent_id' => 9,
+ ],
+ // 系统日志
+ 'SYSTEM_LOG' => [
+ 'id' => 10,
+ 'name' => '系统日志',
+ 'parent_id' => 0,
+ ],
+ 'logs.index' => [
+ 'id' => 100,
+ 'name' => '列表',
+ 'parent_id' => 10,
+ ],
+];
diff --git a/resources/templates/goods_skus_import.xlsx b/resources/templates/goods_skus_import.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..16d6c963a0bdbbd2c24f7e0173f6c6857bfe9ae4
GIT binary patch
literal 10134
zcmeHtg;yNe_I2a#E(z{Vkl-FH5D38`1a~L6ySuxG-~@NK#$6f@1PP%D1h-!&Gw;g`
zGv8nEURAG>Rdx2NzW3~V_c`Y($-}_n0^k9N004jjAja!IVFLvKz`_9lH~>UwZ3$Z&
zCu18Yy*F-l#*VtIuGUuM`LNLRxd3R$`~Tbii(8=l&9F@mJ7&B3frw;>T3B94X(=LU
z3#m5s9zv>Xyasi{4iWvW7oCZ+Y7JsHjk48*Htne(VZ}17rnu;5E7ohxSJdxNK15YG
zd>6Wt$&vCeELV%Fjg8>WB}4;*;b-a*UN$Wouv$<)P}1OY*C9XK?LJZ57cUDHk)Ua3
z{89>iwfI$NxJMIOp5Z;A!E@Ju*DS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 筛选
+ 重置筛选
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.date }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 全部商品(共800条)
+
+
+
+
+ 新建商品
+ 上新
+ 库存盘点
+ 导入商品
+ 表格导出
+
+
+
+
+
+
+
+
+
+ 66
+
+
+ 备选项
+ 备选项
+ 备选项
+
+
+
+
+ 损耗数量：
+
+ 修改
+
+
+ 编辑
+
+
+ 记录
+
+
+
+
+