From 7d13bbe39257ab5231d062e431fbb920c60d8ed5 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 19 九月 2023 14:29:01 +0800
Subject: [PATCH] 企业端
---
platform/src/views/business/company.vue | 1
platform/src/views/business/baseData.vue | 152 +---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 48 +
platform/package.json | 2
server/platform/src/main/java/com/doumee/shiro/ShiroSessionDAO.java | 2
platform/src/api/business/goods.js | 4
server/company/src/main/java/com/doumee/CompanyApplication.java | 2
platform/src/components/common/ImportButton.vue | 37 +
server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 4
server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 8
platform/src/components/common/ImportWindow.vue | 205 +++++++
platform/vue.config.js | 9
platform/src/components/business/selectProduct.vue | 2
server/service/src/main/java/com/doumee/dao/business/CateParamSelectMapper.java | 4
platform/src/components/common/UploadImage.vue | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 1
platform/src/components/business/OperaGoodsWindow.vue | 327 ++---------
platform/.env.development | 6
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 19
server/service/src/main/java/com/doumee/dao/business/model/BaseData.java | 6
server/service/src/main/java/com/doumee/service/CateParamSelectService.java | 3
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 3
server/platform/pom.xml | 5
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 128 +++-
company_admin/package-lock.json | 160 +++---
server/company/src/main/java/com/doumee/api/business/CategoryController.java | 5
server/service/src/main/resources/mappers/CateParamSelectMapper.xml | 19
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 15
server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java | 29 +
platform/public/template/goods_import_modle.xlsx | 0
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 2
server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java | 10
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 115 ++--
server/pom.xml | 56 -
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 5
platform/src/views/business/goods.vue | 87 --
platform/.env.staging | 7
server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 19
38 files changed, 833 insertions(+), 676 deletions(-)
diff --git a/company_admin/package-lock.json b/company_admin/package-lock.json
index f92c6d2..9ccc86a 100644
--- a/company_admin/package-lock.json
+++ b/company_admin/package-lock.json
@@ -1814,63 +1814,6 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
"ssri": {
"version": "8.0.1",
"resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1878,28 +1821,6 @@
"dev": true,
"requires": {
"minipass": "^3.1.1"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
- "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
}
}
}
@@ -13290,6 +13211,87 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-router": {
"version": "3.5.1",
"resolved": "https://registry.nlark.com/vue-router/download/vue-router-3.5.1.tgz?cache=0&sync_timestamp=1620899536020&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-router%2Fdownload%2Fvue-router-3.5.1.tgz",
diff --git a/platform/.env.development b/platform/.env.development
index 6ddd836..360f8b7 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -1,9 +1,15 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
+VUE_APP_CONTEXT_PATH = '/'
VUE_APP_API_PREFIX = '/api'
# 浠诲悍
# VUE_APP_API = 'http://192.168.0.15:10017/'
# 鐒︽澗
+VUE_APP_API = 'http://192.168.0.36:10011'
+# 姹熻悕
VUE_APP_API = 'http://192.168.0.35:10011'
+
+#娴嬭瘯鏈嶅姟鍣�
+# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
diff --git a/platform/.env.staging b/platform/.env.staging
index bd33547..44d070b 100644
--- a/platform/.env.staging
+++ b/platform/.env.staging
@@ -1,2 +1,9 @@
# 娴嬭瘯鐜閰嶇疆
NODE_ENV = 'production'
+
+VUE_APP_CONTEXT_PATH = '/preselect_admin'
+VUE_APP_API_PREFIX = '/preselect_admin_interface'
+
+
+# https://dmtest.ahapp.net/preselect_admin_interface/doc.html
+VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
diff --git a/platform/package.json b/platform/package.json
index 523d8c4..bc7b751 100644
--- a/platform/package.json
+++ b/platform/package.json
@@ -5,7 +5,7 @@
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
- "build:staging": "vue-cli-service build --mode staging",
+ "build:dev": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint",
"fix": "eslint --ext .js,.vue src --fix"
},
diff --git a/platform/public/template/goods_import_modle.xlsx b/platform/public/template/goods_import_modle.xlsx
new file mode 100644
index 0000000..84a9c9a
--- /dev/null
+++ b/platform/public/template/goods_import_modle.xlsx
Binary files differ
diff --git a/platform/src/api/business/goods.js b/platform/src/api/business/goods.js
index b8f9191..1ae02b3 100644
--- a/platform/src/api/business/goods.js
+++ b/platform/src/api/business/goods.js
@@ -30,7 +30,7 @@
// 淇敼
export function updateById (data) {
- return request.post('/business/baseGoods/updateById', data)
+ return request.post('/business/baseGoods/update', data)
}
// 鍒犻櫎
@@ -62,5 +62,5 @@
// 鏍规嵁ID鏌ヨ
export function queryById (id) {
- return request.get(`business/baseGoods/${id}`)
+ return request.get(`/business/baseGoods/${id}`)
}
\ No newline at end of file
diff --git a/platform/src/components/business/OperaGoodsWindow.vue b/platform/src/components/business/OperaGoodsWindow.vue
index d2d1ef9..4bbcc37 100644
--- a/platform/src/components/business/OperaGoodsWindow.vue
+++ b/platform/src/components/business/OperaGoodsWindow.vue
@@ -1,94 +1,46 @@
<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- width="800px"
- >
+ <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm" width="800px"
+ v-loading="isUploading">
<el-form :model="form" ref="form" label-width="120px" :rules="rules">
<div style="font-size: 18px;font-weight: bold;">鍩烘湰淇℃伅</div>
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
- <el-input v-model="form.name" maxlength="50" placeholder="璇疯緭鍏ュ晢鍝佸悕绉帮紝涓嶈秴杩�50涓瓧" v-trim/>
+ <el-input v-model="form.name" maxlength="50" placeholder="璇疯緭鍏ュ晢鍝佸悕绉帮紝涓嶈秴杩�50涓瓧" v-trim />
</el-form-item>
<el-form-item label="鍟嗗搧鍝佺墝" prop="brandId">
<el-select v-model="form.brandId" placeholder="璇烽�夋嫨锛屽崟閫�">
- <el-option
- v-for="item in brandList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-option v-for="item in brandList()" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍟嗗搧绫诲埆" prop="categoryId">
- <!-- @change="changeCategory(form.categoryId)" -->
- <el-select v-model="form.categoryId" placeholder="璇烽�夋嫨锛屽崟閫�">
- <el-option
- v-for="item in categoryList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="form.categoryId" placeholder="璇烽�夋嫨锛屽崟閫�" @change="categorySelect">
+ <el-option v-for="item in categoryList()" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <!-- <el-form-item :label="name1" prop="attrFirstIds" v-if="name1">
- <el-select v-model="form.attrFirstIds" multiple placeholder="璇烽�夋嫨锛屾敮鎸佸閫�">
- <el-option
- v-for="item in form.attrFirstList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item :label="name2" prop="attrSecodIds" v-if="name2">
- <el-select v-model="form.attrSecodIds" multiple placeholder="璇烽�夋嫨锛屾敮鎸佸閫�">
- <el-option
- v-for="item in form.attrSecodList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item> -->
<el-form-item label="鎸囧浠凤紙鍏冿級" prop="zdPrice">
- <el-input v-model="form.zdPrice" @input="priceCHANEG(form.zdPrice, 1)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓" v-trim/>
+ <el-input v-model="form.zdPrice" @input="priceCHANEG(form.zdPrice, 1)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓"
+ v-trim />
</el-form-item>
<el-form-item label="鍏ユ墜浠凤紙鍏冿級" prop="price">
- <el-input v-model="form.price" @input="priceCHANEG(form.price, 2)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓" v-trim/>
+ <el-input v-model="form.price" @input="priceCHANEG(form.price, 2)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓"
+ v-trim />
</el-form-item>
<el-form-item label="鍟嗗搧涓诲浘">
- <el-upload
- :action="action"
- :file-list="form.ztList"
- :data="{ folder: 'goods_img' }"
- list-type="picture-card"
- :limit="1"
- :on-success="fileSuccess"
- :on-exceed="exceed"
- :on-remove="handleRemove">
- <i class="el-icon-plus"></i>
- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�140*140px</div>
- </el-upload>
+ <UploadAvatarImage :file="{ 'imgurlfull': form.imgfullurl, 'imgurl': form.imgurl }" :uploadData="uploadData"
+ tipsLabel="" @uploadSuccess="uploadReverseSuccess" @uploadEnd="isUploading = false"
+ @uploadBegin="isUploading = true" />
+ 鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�140px*140px
</el-form-item>
- <el-form-item label="鍟嗗搧鍥剧墖">
- <el-upload
- :action="action"
- :file-list="form.files"
- :multiple="true"
- :data="{ folder: 'goods_img' }"
- list-type="picture-card"
- :on-success="fileSuccess1"
- :on-remove="handleRemove1">
- <i class="el-icon-plus"></i>
- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�600*600px</div>
- </el-upload>
+ <el-form-item label="鍟嗗搧鍥剧墖">
+ <UploadImage :fileList="form.multifileList" :uploadData="uploadData" @beginUpload="isUploading = true" @endUpload="isUploading = false" />
+ 鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�600*600px
</el-form-item>
- <template v-if="form.goodsParamList && form.goodsParamList.length > 0">
- <div style="font-size: 18px;font-weight: bold;">鍙傛暟灞炴�у�奸厤缃� <span style="font-size: 13px; font-weight: 500;">鎸夐渶閰嶇疆褰撳墠鍟嗗搧鐨勪骇鍝佸弬鏁板�硷紝鍗曚釜鍙傛暟鍊间笉瓒呰繃30涓瓧</span></div>
- <el-form-item :label="item.name" v-for="(item, index) in form.goodsParamList" :key="index">
- <el-input v-model="item.val" maxlength="30" type="text" placeholder="璇疯緭鍏�" v-trim/>
+ <template v-if="form.baseGoodsParamList && form.baseGoodsParamList.length > 0">
+ <div style="font-size: 18px;font-weight: bold;">鍙傛暟灞炴�у�奸厤缃� <span
+ style="font-size: 13px; font-weight: 500;">鎸夐渶閰嶇疆褰撳墠鍟嗗搧鐨勪骇鍝佸弬鏁板�硷紝鍗曚釜鍙傛暟鍊间笉瓒呰繃30涓瓧</span></div>
+ <el-form-item :label="item.name" v-for="(item, index) in form.baseGoodsParamList" :key="index">
+ <el-input v-model="item.val" maxlength="30" type="text" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
</template>
</el-form>
@@ -98,18 +50,21 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import { baseCategory,brand } from '@/api/system/common.js'
-import { create, updateById, companyCreate, companyUpdateById } from '@/api/business/goods.js'
+import UploadAvatarImage from '@/components/common/UploadAvatarImage.vue'
+import UploadImage from '@/components/common/UploadImage.vue'
+import { baseCategory, brand } from '@/api/system/common.js'
+import { companyCreate, companyUpdateById } from '@/api/business/goods.js'
export default {
name: 'OperaGoodsWindow',
extends: BaseOpera,
- components: { GlobalWindow },
- data () {
+ components: { GlobalWindow, UploadAvatarImage, UploadImage },
+ data() {
return {
action: process.env.VUE_APP_API_PREFIX + '/public/upload',
name1: '',
name2: '',
// 琛ㄥ崟鏁版嵁
+ isUploading: false,
form: {
id: null,
name: '',
@@ -117,17 +72,13 @@
brandId: '',
zdPrice: '',
price: '',
- attrFirstIds: [],
- attrFirstNames: '',
- attrSecodIds: [],
- attrSecodNames: '',
imgurl: '',
+ imgfullurl: '',
multifileList: [],
- files: [],
- ztList: [],
- goodsParamList: [],
- attrFirstList: [],
- attrSecodList: []
+ baseGoodsParamList: [],
+ },
+ uploadData: {
+ folder: 'goods_img'
},
// 楠岃瘉瑙勫垯
rules: {
@@ -147,77 +98,44 @@
{ required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
]
},
- options: [],
- categoryList: [],
- brandList: []
+ options: []
}
},
- created () {
+ inject: ['categoryList', 'brandList'],
+ created() {
this.config({
api: '/business/goods',
'field.id': 'id'
})
- this.getbrand()
- this.getcategory()
- },
- watch: {
- 'form.categoryId': {
- immediate: true,
- handler(news, old) {
- if (news) {
- this.name1 = ''
- this.name2 = ''
- if (old) {
- this.form.attrFirstIds = []
- this.form.attrSecodIds = []
- this.form.goodsParamList = []
- }
- this.categoryList.forEach(item => {
- if (item.id === news) {
- this.name1 = item.attrFirst
- this.name2 = item.attrSecond
- this.form.attrFirstList = item.attrFirstList.length > 0 ? item.attrFirstList : []
- this.form.attrSecodList = item.attrSecondList.length > 0 ? item.attrSecondList : []
- this.form.goodsParamList = JSON.parse(JSON.stringify(item.paramList))
- this.form.goodsParamList.forEach(item => {
- item.pramaId = item.id
- })
- console.log(this.form.goodsParamList)
- }
- })
- this.getcategory(1)
- }
- }
- },
- visible: {
- handler(news, old) {
- if (!news) {
- this.name1 = ''
- this.name2 = ''
- this.form = {
- id: null,
- name: '',
- categoryId: '',
- brandId: '',
- zdPrice: '',
- price: '',
- attrFirstIds: [],
- attrFirstNames: '',
- attrSecodIds: [],
- attrSecodNames: '',
- imgurl: '',
- multifileList: [],
- files: [],
- ztList: [],
- goodsParamList: [],
- attrFirstList: [],
- attrSecodList: []
- }
- }
- }
- }
+ // this.getbrand()
+ // this.getcategory()
},
methods: {
+ open(title, target) {
+ this.title = title
+ this.visible = true
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form.imgurl = ''
+ this.form.imgfullurl = ''
+ this.form.multifileList = []
+ this.form.baseGoodsParamList = []
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ this.form.multifileList.forEach(item => {
+ item.url = item.filefullurl
+ })
+ })
+ },
priceCHANEG(val, type) {
if (!/^[1-9]+[0-9]*$/.test(val)) {
this.$message.warning('鍙兘杈撳叆姝ｆ暣鏁�')
@@ -228,115 +146,20 @@
}
}
},
- confirm() {
- this.$refs.form.validate((valid) => {
- if (valid) {
- if (this.form.attrFirstIds.length > 0) {
- let arr = []
- this.form.attrFirstIds.forEach(element => {
- this.form.attrFirstList.forEach(item => {
- if (element === item.id) {
- arr.push(item.name)
- }
- })
- })
- this.form.attrFirstNames = arr.join(',')
- this.form.attrFirstIds = this.form.attrFirstIds.join(',')
- } else {
- this.form.attrFirstNames = ''
- this.form.attrFirstIds = ''
- }
- if (this.form.attrSecodIds.length > 0) {
- let arr = []
- this.form.attrSecodIds.forEach(element => {
- this.form.attrSecodList.forEach(item => {
- if (element === item.id) {
- arr.push(item.name)
- }
- })
- })
- this.form.attrSecodNames = arr.join(',')
- this.form.attrSecodIds = this.form.attrSecodIds.join(',')
- } else {
- this.form.attrSecodNames = ''
- this.form.attrSecodIds = ''
- }
- if (!this.form.id) {
- companyCreate({...this.form, type: 0})
- .then(() => {
- this.visible = false
- this.$tip.apiSuccess('鏂板缓鎴愬姛')
- this.$emit('success')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- } else {
- companyUpdateById({...this.form, type: 0})
- .then(() => {
- this.visible = false
- this.$tip.apiSuccess('缂栬緫鎴愬姛')
- this.$emit('success')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- }
- } else {
- return false;
+ categorySelect(v) {
+ this.categoryList().forEach(item => {
+ if (item.id === v) {
+ this.form.baseGoodsParamList = JSON.parse(JSON.stringify(item.baseCateParamList))
+ this.form.baseGoodsParamList.forEach(item => {
+ item.pramaId = item.id
+ })
}
- });
- },
- exceed() {
- this.$message.warning({
- message: '鍙兘涓婁紶涓�涓浘鏍�'
})
},
- fileSuccess1(response, file, fileList) {
- this.form.files = fileList
- this.form.multifileList.push({ fileurl: response.data.imgaddr, name: response.data.imgname, url: response.data.url })
- },
- handleRemove1(file, fileList) {
- this.form.files = fileList
- this.form.multifileList = fileList
- },
- fileSuccess(response) {
- this.form.ztList.push({ imgaddr: response.data.imgaddr, url: response.data.url })
- this.form.imgurl = response.data.imgaddr
- },
- handleRemove() {
- this.form.ztList = []
- this.form.imgurl = ''
- },
- getbrand() {
- brand({status:0})
- .then(res => {
- this.brandList = res
- })
- },
- getcategory(type) {
- baseCategory({status:0 , type:1})
- .then(res => {
- this.categoryList = res
- if (type === 1) {
- this.categoryList.forEach(item => {
- if (item.id === this.form.categoryId) {
- this.form.goodsParamList = JSON.parse(JSON.stringify(item.paramList))
- this.form.goodsParamList.forEach(item => {
- item.pramaId = item.id
- })
- console.log(this.form.goodsParamList)
- }
- })
- }
- })
- }
+ uploadReverseSuccess(file) {
+ this.form.imgurl = file.imgurl;
+ this.form.imgfullurl = file.imgurlfull;
+ }
}
}
</script>
diff --git a/platform/src/components/business/selectProduct.vue b/platform/src/components/business/selectProduct.vue
index 8137bca..d3702aa 100644
--- a/platform/src/components/business/selectProduct.vue
+++ b/platform/src/components/business/selectProduct.vue
@@ -62,7 +62,7 @@
},
created() {
this.config({
- api: '/business/anchor',
+ api: '/business/goods',
'field.id': 'id'
})
},
diff --git a/platform/src/components/common/ImportButton.vue b/platform/src/components/common/ImportButton.vue
new file mode 100644
index 0000000..f9a64cb
--- /dev/null
+++ b/platform/src/components/common/ImportButton.vue
@@ -0,0 +1,37 @@
+<template>
+ <div class="import-button">
+ <el-button type="primary" @click="$refs.importWindow.open(text)">{{text}}</el-button>
+ <ImportWindow :action="action" :template-path="templatePath" :template-name="templateName" ref="importWindow" @success="handleSuccess"/>
+ </div>
+</template>
+
+<script>
+import ImportWindow from './ImportWindow'
+export default {
+ name: 'ImportButton',
+ components: { ImportWindow },
+ props: {
+ // 鎸夐挳鏂囨
+ text: {
+ default: '瀵煎叆'
+ },
+ // 妯＄増鍦板潃
+ templatePath: {
+ required: true
+ },
+ // 涓嬭浇鍚庣殑妯＄増鏂囦欢鍚嶇О
+ templateName: {
+ required: true
+ },
+ // 瀵煎叆鎺ュ彛鍦板潃
+ action: {
+ required: true
+ }
+ },
+ methods: {
+ handleSuccess () {
+ this.$emit('success')
+ }
+ }
+}
+</script>
diff --git a/platform/src/components/common/ImportWindow.vue b/platform/src/components/common/ImportWindow.vue
new file mode 100644
index 0000000..f25033c
--- /dev/null
+++ b/platform/src/components/common/ImportWindow.vue
@@ -0,0 +1,205 @@
+<template>
+ <el-dialog
+ width="500px"
+ :title="title"
+ :visible.sync="visible"
+ append-to-body
+ custom-class="eva-dialog import-window"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :show-close="false"
+ >
+ <el-form>
+ <el-form-item>
+ <el-upload
+ drag
+ :show-file-list="false"
+ action="none"
+ accept=".xlsx, .xls"
+ :before-upload="handleBeforeUpload"
+ >
+ <template v-if="form.file == null">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ </template>
+ <template v-else>
+ <i class="el-icon-files"></i>
+ <div class="el-upload__text">{{form.file.name}}<em></em></div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-form>
+
+ <div slot="footer" class="import-window__footer">
+ <!-- <div class="sync-exists">
+ <el-checkbox v-model="form.sync"/><span>鍚屾宸插瓨鍦ㄧ殑鏁版嵁</span>
+ </div> -->
+ <div class="opera">
+ <a href=""></a>
+ <el-button type="text" icon="el-icon-download" @click="downloadTemplate">涓嬭浇妯＄増</el-button>
+ <el-button @click="cancel">{{cancelText}}</el-button>
+ <el-button type="primary" @click="confirm" :loading="isWorking">{{confirmText}}</el-button>
+ </div>
+ </div>
+ </el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+export default {
+ name: 'ImportWindow',
+ props: {
+ // 瀵煎叆鎺ュ彛鍦板潃
+ action: {
+ required: true
+ },
+ // 纭鎸夐挳鏂囨
+ confirmText: {
+ type: String,
+ default: '瀵煎叆'
+ },
+
+ // 鍙栨秷鎸夐挳鏂囨
+ cancelText: {
+ type: String,
+ default: '鍙栨秷'
+ },
+ // 妯＄増鍦板潃
+ templatePath: {
+ required: true
+ },
+ // 涓嬭浇鍚庣殑妯＄増鏂囦欢鍚嶇О
+ templateName: {
+ required: true
+ }
+ },
+ data () {
+ return {
+ visible: false,
+ isWorking: false,
+ title: '瀵煎叆鏁版嵁',
+ form: {
+ sync: false,
+ file: false,
+ categoryId: ''
+ }
+ }
+ },
+ methods: {
+ /**
+ * 鎵撳紑绐楀彛
+ *
+ * @param title 绐楀彛鏍囬
+ */
+ open (title) {
+ this.visible = true
+ this.title = title
+ this.form.sync = false
+ this.form.file = null
+ },
+ /**
+ * 纭畾瀵煎叆
+ */
+ confirm () {
+ if (this.form.file == null) {
+ this.$message.warning('璇烽�夋嫨鏂囦欢')
+ return
+ }
+ this.isWorking = true
+ const param = new FormData()
+ param.set('file', this.form.file)
+ request.post(this.action, param, {
+ headers: {
+ 'Content-Type': 'multipart/form-data;charset=UTF-8'
+ }
+ })
+ .then(() => {
+ this.$message.success('瀵煎叆鎴愬姛')
+ this.visible = false
+ this.$emit('success')
+ })
+ .catch(e => {
+ this.$message.error(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ },
+ /**
+ * 鍙栨秷
+ */
+ cancel () {
+ this.visible = false
+ },
+ /**
+ * 涓嬭浇妯＄増
+ */
+ downloadTemplate () {
+ const link = document.createElement('a')
+ link.setAttribute('download', this.templateName) //涓嬭浇鐨勬枃浠跺悕
+ // console.log(`window.location.origin`, window.location.origin);
+ // console.log(`process.env.VUE_APP_CONTEXT_PATH`, process.env.VUE_APP_CONTEXT_PATH);
+ // console.log(`this.templatePath`, this.templatePath);
+ link.href = `${window.location.origin}${process.env.VUE_APP_CONTEXT_PATH}${this.templatePath}` //鏂囦欢url
+ link.click()
+ },
+ /**
+ * 鏂囦欢涓婁紶鍓嶅瓨鍌ㄤ笂浼犵殑鏂囦欢
+ *
+ * @param file 闇�瀵煎叆鐨勬枃浠�
+ */
+ handleBeforeUpload (file) {
+ this.form.file = file
+ return false
+ }
+ }
+}
+</script>
+
+<style lang="scss">
+@import "../../assets/style/variables";
+.import-window {
+ .el-upload {
+ width: 100%;
+ .el-upload-dragger {
+ width: 100%;
+ .el-icon-upload, .el-icon-files {
+ font-size: 67px;
+ color: #C0C4CC;
+ margin: 40px 0 16px;
+ line-height: 50px;
+ }
+ }
+ }
+ .import-window__footer {
+ display: flex;
+ .sync-exists {
+ width: 200px;
+ flex-shrink: 0;
+ text-align: left;
+ font-size: 13px;
+ display: flex;
+ align-items: center;
+ .el-checkbox {
+ margin-right: 10px;
+ }
+ & > * {
+ vertical-align: middle;
+ }
+ }
+ .opera {
+ flex-grow: 1;
+ a {
+ font-size: 12px;
+ margin-right: 10px;
+ text-decoration: none;
+ .el-icon-download {
+ font-size: 15px;
+ position: relative;
+ top: 2px;
+ }
+ }
+ }
+ }
+}
+</style>
diff --git a/platform/src/components/common/UploadImage.vue b/platform/src/components/common/UploadImage.vue
index 67ccb8a..d2ab4df 100644
--- a/platform/src/components/common/UploadImage.vue
+++ b/platform/src/components/common/UploadImage.vue
@@ -59,7 +59,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload',
realList: [],
srcList: [],
diff --git a/platform/src/views/business/baseData.vue b/platform/src/views/business/baseData.vue
index 20cfdd7..9d9d3e8 100644
--- a/platform/src/views/business/baseData.vue
+++ b/platform/src/views/business/baseData.vue
@@ -23,144 +23,80 @@
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
-<!--
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:basedata:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
--->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:basedata:create', 'business:basedata:delete']">
-<!--
- <li><el-button type="primary" @click="$refs.operaBaseDataWindow.open('鏂板缓鍟嗗搧婧愭暟鎹俊鎭〃')" icon="el-icon-plus" v-permissions="['business:basedata:create']">鏂板缓</el-button></li>
--->
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:basedata:delete']">鎵归噺鍒犻櫎</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:basedata:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="name" label="鍟嗗搧涓诲浘" min-width="80px">
<template slot-scope="{row}">
- <a :href="`${row.url}`" target="_blank">
- <div style="display: flex; align-items: center;">
- <div style="width: 70px; height: 70px; flex-shrink: 0;">
- <el-image v-if="row.imgurl" style="width: 70px; height: 70px" :src="row.imgurl"
- :preview-src-list="[row.imgurl]" fit="cover"></el-image>
- </div>
- </div> </a>
+ <div style="display: flex; align-items: center;">
+ <div style="width: 70px; height: 70px; flex-shrink: 0;">
+ <el-image v-if="row.imgurl" style="width: 70px; height: 70px" :src="row.imgurl"
+ :preview-src-list="[row.imgurl]" fit="cover"></el-image>
+ </div>
+ </div>
</template>
</el-table-column>
<el-table-column prop="name" label="鍟嗗搧鍚嶇О" min-width="150px">
<template slot-scope="{row}">
- <a :href="`${row.url}`" target="_blank">{{row.name}}</a>
+ <a :href="`${row.url}`" target="_blank">{{ row.name }}</a>
</template>
</el-table-column>
-<!-- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>-->
+ <!-- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>-->
<el-table-column prop="sku" label="浜笢sku" min-width="100px"></el-table-column>
<el-table-column prop="brand" label="鍝佺墝" min-width="120px"></el-table-column>
<el-table-column prop="category" label="绫诲埆" min-width="100px"></el-table-column>
<el-table-column prop="price" label="浠锋牸锛堝厓锛�" min-width="100px"></el-table-column>
<el-table-column prop="saleprice" label="閲囪喘浠锋牸锛堝厓锛�" min-width="100px"></el-table-column>
<el-table-column prop="haveStock" label="搴撳瓨鎯呭喌" min-width="100px"></el-table-column>
- <el-table-column prop="bgImg" label="澶у浘1" min-width="80px">
+ <el-table-column prop="bgImgs" label="澶у浘" min-width="80px">
<template slot-scope="{row}">
- <div style="display: flex; align-items: center;">
+ <el-button type="text" @click="showImage(row.bgImgs)">鏌ョ湅澶у浘</el-button>
+ <!-- <div style="display: flex; align-items: center;">
<div style="width: 70px; height: 70px; flex-shrink: 0;">
- <el-image v-if="row.bgImg" style="width: 70px; height: 70px" :src="row.bgImg"
- :preview-src-list="[row.bgImg]" fit="cover"></el-image>
+ <el-image v-if="row.bgImgs" style="width: 70px; height: 70px" :src="row.bgImgs"
+ :preview-src-list="row.bgImgs" fit="cover"></el-image>
</div>
- </div>
+ </div> -->
</template>
</el-table-column>
- <el-table-column prop="bgImg2" label="澶у浘2" min-width="80px">
+ <el-table-column prop="status" label="澶勭悊鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <div style="display: flex; align-items: center;">
- <div style="width: 70px; height: 70px; flex-shrink: 0;">
- <el-image v-if="row.bgImg2" style="width: 70px; height: 70px" :src="row.bgImg2"
- :preview-src-list="[row.bgImg2]" fit="cover"></el-image>
- </div>
- </div>
+ {{ row.status == 1 ? "宸插鐞�" : "鏈鐞�" }}
</template>
</el-table-column>
- <el-table-column prop="bgImg3" label="澶у浘3" min-width="80px">
+ <el-table-column v-if="containPermissions(['business:basedata:update', 'business:basedata:delete'])" label="鎿嶄綔"
+ min-width="80" fixed="right">
<template slot-scope="{row}">
- <div style="display: flex; align-items: center;">
- <div style="width: 70px; height: 70px; flex-shrink: 0;">
- <el-image v-if="row.bgImg3" style="width: 70px; height: 70px" :src="row.bgImg3"
- :preview-src-list="[row.bgImg3]" fit="cover"></el-image>
- </div>
- </div>
- </template>
- </el-table-column>
-<!-- <el-table-column prop="attr1" label="灞炴��1" min-width="100px"></el-table-column>
- <el-table-column prop="attr2" label="灞炴��2" min-width="100px"></el-table-column>
- <el-table-column prop="attr3" label="灞炴��3" min-width="100px"></el-table-column>
- <el-table-column prop="attr4" label="灞炴��4" min-width="100px"></el-table-column>
- <el-table-column prop="attr5" label="灞炴��5" min-width="100px"></el-table-column>
- <el-table-column prop="attr6" label="灞炴��6" min-width="100px"></el-table-column>
- <el-table-column prop="attr7" label="灞炴��7" min-width="100px"></el-table-column>
- <el-table-column prop="attr8" label="灞炴��8" min-width="100px"></el-table-column>
- <el-table-column prop="attr9" label="灞炴��9" min-width="100px"></el-table-column>
- <el-table-column prop="attr10" label="灞炴��10" min-width="100px"></el-table-column>
- <el-table-column prop="attr11" label="灞炴��11" min-width="100px"></el-table-column>
- <el-table-column prop="attr12" label="灞炴��12" min-width="100px"></el-table-column>
- <el-table-column prop="attr13" label="灞炴��13" min-width="100px"></el-table-column>
- <el-table-column prop="attr14" label="灞炴��14" min-width="100px"></el-table-column>
- <el-table-column prop="attr15" label="灞炴��15" min-width="100px"></el-table-column>
- <el-table-column prop="attr16" label="灞炴��16" min-width="100px"></el-table-column>
- <el-table-column prop="attr17" label="灞炴��17" min-width="100px"></el-table-column>
- <el-table-column prop="attr18" label="灞炴��18" min-width="100px"></el-table-column>
- <el-table-column prop="attr19" label="灞炴��19" min-width="100px"></el-table-column>
- <el-table-column prop="attr20" label="灞炴��20" min-width="100px"></el-table-column>
- <el-table-column prop="attr21" label="灞炴��21" min-width="100px"></el-table-column>
- <el-table-column prop="attr22" label="灞炴��22" min-width="100px"></el-table-column>
- <el-table-column prop="attr23" label="灞炴��23" min-width="100px"></el-table-column>
- <el-table-column prop="attr24" label="灞炴��24" min-width="100px"></el-table-column>
- <el-table-column prop="attr25" label="灞炴��25" min-width="100px"></el-table-column>
- <el-table-column prop="attr26" label="灞炴��26" min-width="100px"></el-table-column>
- <el-table-column prop="attr27" label="灞炴��27" min-width="100px"></el-table-column>
- <el-table-column prop="attr28" label="灞炴��28" min-width="100px"></el-table-column>
- <el-table-column prop="attr29" label="灞炴��29" min-width="100px"></el-table-column>
- <el-table-column prop="attr30" label="灞炴��30" min-width="100px"></el-table-column>
- <el-table-column prop="attr31" label="灞炴��31" min-width="100px"></el-table-column>
- <el-table-column prop="attr32" label="灞炴��32" min-width="100px"></el-table-column>
- <el-table-column prop="attr33" label="灞炴��33" min-width="100px"></el-table-column>
- <el-table-column prop="attr34" label="灞炴��34" min-width="100px"></el-table-column>
- --><el-table-column prop="status" label="澶勭悊鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- {{row.status==1?"宸插鐞�":"鏈鐞�"}}
- </template>
- </el-table-column>
- <el-table-column
- v-if="containPermissions(['business:basedata:update', 'business:basedata:delete'])"
- label="鎿嶄綔"
- min-width="80"
- fixed="right"
- >
- <template slot-scope="{row}">
-<!--
+ <!--
<el-button type="text" @click="$refs.operaBaseDataWindow.open('缂栬緫鍟嗗搧婧愭暟鎹俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:basedata:update']">缂栬緫</el-button>
-->
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:basedata:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:basedata:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaBaseDataWindow ref="operaBaseDataWindow" @success="handlePageChange"/>
+ <OperaBaseDataWindow ref="operaBaseDataWindow" @success="handlePageChange" />
+ <el-image-viewer
+ v-if="showViewer"
+ :on-close="closeViewer"
+ :initialIndex="0"
+ :url-list="srcList"
+ :z-index="3000"
+ />
</TableLayout>
</template>
@@ -169,12 +105,15 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaBaseDataWindow from '@/components/business/OperaBaseDataWindow'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
export default {
name: 'BaseData',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaBaseDataWindow },
- data () {
+ components: { TableLayout, Pagination, OperaBaseDataWindow, ElImageViewer },
+ data() {
return {
+ showViewer: false,
+ srcList: [],
// 鎼滅储
searchForm: {
name: '',
@@ -189,7 +128,7 @@
]
}
},
- created () {
+ created() {
this.config({
module: '鍟嗗搧婧愭暟鎹俊鎭〃',
api: '/business/baseData',
@@ -197,6 +136,17 @@
'field.main': 'id'
})
this.search()
- }
+ },
+ methods: {
+ showImage(imgs) {
+ this.srcList = []
+ this.srcList = imgs
+ this.showViewer = true
+ },
+ closeViewer() {
+ this.showViewer = false
+ }
+
+ },
}
</script>
diff --git a/platform/src/views/business/company.vue b/platform/src/views/business/company.vue
index fdfe560..8ae8e33 100644
--- a/platform/src/views/business/company.vue
+++ b/platform/src/views/business/company.vue
@@ -35,6 +35,7 @@
<el-table v-loading="isWorking.search" :data="tableData.list" border stripe
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
+ <el-table-column prop="id" label="浼佷笟缂栧彿" min-width="80px" align="center"></el-table-column>
<el-table-column prop="name" label="浼佷笟鍚嶇О" min-width="100px" align="center"></el-table-column>
<el-table-column prop="managerUserName" label="绠＄悊鍛樿处鍙�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="linkname" label="鑱旂郴浜�" min-width="100px" align="center"></el-table-column>
diff --git a/platform/src/views/business/goods.vue b/platform/src/views/business/goods.vue
index 8992e61..b7f8046 100644
--- a/platform/src/views/business/goods.vue
+++ b/platform/src/views/business/goods.vue
@@ -1,6 +1,6 @@
<template>
- <TableLayout :permissions="['business:goods:query']">
+ <TableLayout :permissions="['business:basegoods:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
@@ -37,15 +37,17 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:goods:create', 'business:goods:delete']">
- <li><el-button type="primary" @click="$refs.operaGoodsWindow.open('鏂板缓鍟嗗搧')" icon="el-icon-plus"
- v-permissions="['business:goods:create']">鏂板缓</el-button></li>
+ <ul class="toolbar" v-permissions="['business:basegoods:create', 'business:basegoods:delete']">
+ <li v-permissions="['business:basegoods:create']">
+ <el-button type="primary" @click="$refs.operaGoodsWindow.open('鏂板缓鍟嗗搧')" icon="el-icon-plus">鏂板缓</el-button>
+ </li>
<!-- <el-button type="primary" :loading="isWorking.export"
@click="$refs.selectProduct.open('閫夋嫨骞冲彴鍟嗗搧')">閫夋嫨骞冲彴鍟嗗搧</el-button> -->
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:goods:exportExcel']"
- @click="importFile">瀵煎叆</el-button>
- <el-button type="primary" :loading="isWorking.export" @click="downloadFile">涓嬭浇妯℃澘</el-button>
-
+ <li v-permissions="['business:basegoods:exportExcel']">
+ <ImportButton text="瀵煎叆" template-name="goods_import_modle.xlsx"
+ template-path="/template/goods_import_modle.xlsx" action="/business/baseGoods/importExcel"
+ @success="search" />
+ </li>
<el-button type="primary" :loading="isWorking.export" @click="bulkOperation(0)">鎵归噺涓婃灦</el-button>
<el-button type="primary" :loading="isWorking.export" @click="bulkOperation(1)">鎵归噺涓嬫灦</el-button>
<!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:goods:delete']">鍒犻櫎</el-button></li> -->
@@ -77,17 +79,16 @@
</el-switch>
</template>
</el-table-column>
- <el-table-column v-if="containPermissions(['business:goods:update', 'business:goods:delete'])" label="鎿嶄綔"
+ <el-table-column v-if="containPermissions(['business:basegoods:update', 'business:basegoods:delete'])" label="鎿嶄綔"
min-width="120" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="edit(row.id)" icon="el-icon-edit"
- v-permissions="['business:goods:update']">缂栬緫</el-button>
+ v-permissions="['business:basegoods:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
- v-permissions="['business:goods:delete']">鍒犻櫎</el-button>
+ v-permissions="['business:basegoods:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <input type="file" ref="upload" style="display: none;" @change="uplaodFile" />
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
@@ -104,12 +105,13 @@
import Pagination from '@/components/common/Pagination'
import OperaGoodsWindow from '@/components/business/OperaGoodsWindow'
import selectProduct from '@/components/business/selectProduct'
+import ImportButton from '@/components/common/ImportButton'
import { brand, baseCategory, importExcel } from '@/api/system/common.js'
import { updateStatus, queryById, exportDoc } from '@/api/business/goods.js'
export default {
name: 'Goods',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaGoodsWindow, selectProduct },
+ components: { TableLayout, Pagination, OperaGoodsWindow, selectProduct, ImportButton },
data() {
return {
// 鎼滅储
@@ -130,6 +132,12 @@
]
}
},
+ provide() {
+ return {
+ brandList: () => this.brandList,
+ categoryList: () => this.categoryList
+ }
+ },
created() {
this.config({
module: '鍟嗗搧',
@@ -146,7 +154,6 @@
let arr = e.map(item => item.id)
this.ids = arr.join(',')
this.idList = arr;
- console.log(this.ids)
},
// 鎵归噺涓婁笅鏋�
bulkOperation(type) {
@@ -175,52 +182,10 @@
rowStyle() {
return "text-align:center";
},
- importFile() {
- this.$refs.upload.click()
- },
- uplaodFile(e) {
- const FORMDATE = new FormData()
- FORMDATE.append('file', e.target.files[0])
- // 璇锋眰鎺ュ彛
- importExcel(FORMDATE)
- .then(res => {
- console.log(res)
- this.search()
- })
- .catch((err) => {
- this.$message.error(err.message)
- })
- this.$refs.upload.value = null
- },
edit(id) {
queryById(id)
.then(res => {
- let obj = {
- id: res.id,
- name: res.name,
- categoryId: res.categoryId,
- brandId: res.brandId,
- zdPrice: res.zdPrice,
- price: res.price,
- attrFirstIds: res.attrFirstIds ? this.turnNum(res.attrFirstIds.split(',')) : [],
- attrFirstNames: res.attrFirstNames,
- attrSecodIds: res.attrSecodIds ? this.turnNum(res.attrSecodIds.split(',')) : [],
- attrSecodNames: res.attrSecodNames,
- imgurl: res.imgurl,
- multifileList: [],
- files: [],
- ztList: res.imgurl ? [{ url: res.prefixUrl + res.imgurl }] : [],
- pzList: [],
- attrFirstList: [],
- attrSecodList: []
- }
- if (res.multifileList.length > 0) {
- res.multifileList.forEach(item => {
- obj.multifileList.push({ fileurl: item.fileurl, name: item.name, url: res.prefixUrl + item.fileurl })
- obj.files.push({ fileurl: item.fileurl, name: item.name, url: res.prefixUrl + item.fileurl })
- })
- }
- this.$refs.operaGoodsWindow.open('缂栬緫鍟嗗搧', obj)
+ this.$refs.operaGoodsWindow.open('缂栬緫鍟嗗搧', res)
})
},
changeStatus(item) {
@@ -233,14 +198,8 @@
// this.search()
})
},
- turnNum(nums) {
- for (let i = 0; i < nums.length; i++) {
- nums[i] = parseInt(nums[i])
- }
- return nums;
- },
getbrand() {
- brand({type:1})
+ brand({ type: 1 })
.then(res => {
this.brandList = res
})
diff --git a/platform/vue.config.js b/platform/vue.config.js
index 1b17444..68e3a00 100644
--- a/platform/vue.config.js
+++ b/platform/vue.config.js
@@ -1,9 +1,8 @@
-// 璇︾粏閰嶇疆璇峰弬鑰僪ttps://cli.vuejs.org/zh/config/#vue-config-js
-// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
-// outputDir === '/' ? 'dist' : outputDir
+
+const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
module.exports = {
- publicPath: process.env.VUE_APP_CONTEXT_PATH,
- outputDir: 'dist',
+ publicPath: './',
+ outputDir: outputDir || 'web',
assetsDir: 'static',
lintOnSave: false,
devServer: {
diff --git a/server/company/src/main/java/com/doumee/CompanyApplication.java b/server/company/src/main/java/com/doumee/CompanyApplication.java
index b664755..5894cbd 100644
--- a/server/company/src/main/java/com/doumee/CompanyApplication.java
+++ b/server/company/src/main/java/com/doumee/CompanyApplication.java
@@ -6,6 +6,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
/**
* 鍚姩绫�
@@ -15,6 +16,7 @@
@Slf4j
@SpringBootApplication
@MapperScan("com.doumee.dao")
+@EnableAsync
public class CompanyApplication {
public static void main(String[] args) {
ApplicationContext context = SpringApplication.run(CompanyApplication.class);
diff --git a/server/company/src/main/java/com/doumee/api/business/CategoryController.java b/server/company/src/main/java/com/doumee/api/business/CategoryController.java
index 029e1d8..47bf101 100644
--- a/server/company/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CategoryController.java
@@ -13,6 +13,7 @@
import com.doumee.dao.business.model.BaseCateParam;
import com.doumee.dao.business.model.BaseCategory;
import com.doumee.dao.business.model.Category;
+import com.doumee.service.CateParamSelectService;
import com.doumee.service.business.BaseCateParamService;
import com.doumee.service.business.BaseCategoryService;
import com.doumee.service.business.CategoryService;
@@ -45,6 +46,8 @@
@Autowired
private BaseCateParamService baseCateParamService;
+ @Autowired
+ private CateParamSelectService cateParamSelectService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -97,6 +100,7 @@
@RequiresPermissions("business:category:update")
public ApiResponse companyUpdateById(@RequestBody Category category) {
categoryService.companyUpdateById(category);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -156,7 +160,6 @@
BaseCategory baseCategory = new BaseCategory();
baseCategory.setIsdeleted(Constants.ZERO);
baseCategory.setStatus(Constants.ZERO);
- baseCategoryService.findList(baseCategory);
List list = baseCategoryService.findList(baseCategory);
return ApiResponse.success(list);
}
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 81803f2..835b91e 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -10,8 +10,10 @@
import com.doumee.dao.business.model.dto.BatchDisableDTO;
import com.doumee.dao.business.model.dto.GoodCreatePlatRequest;
import com.doumee.dao.business.model.dto.GoodsRequest;
+import com.doumee.service.CateParamSelectService;
import com.doumee.service.business.GoodsService;
import io.swagger.annotations.*;
+import lombok.extern.java.Log;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,8 @@
@Autowired
private GoodsService goodsService;
+ @Autowired
+ private CateParamSelectService cateParamSelectService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -52,7 +56,9 @@
@PostMapping("/companyCreate")
// @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
- return ApiResponse.success(goodsService.companyCreate(goods));
+ goodsService.companyCreate(goods);
+ cateParamSelectService.dealCateParamSelect();
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@PreventRepeat
@@ -60,7 +66,9 @@
@PostMapping("/createPlat")
@RequiresPermissions("business:goods:create")
public ApiResponse createPlat(@RequestBody GoodCreatePlatRequest param) {
- return ApiResponse.success(goodsService.createPlat(param));
+ goodsService.createPlat(param);
+ cateParamSelectService.dealCateParamSelect();
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -68,6 +76,7 @@
@RequiresPermissions("business:goods:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
goodsService.deleteById(id);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -81,6 +90,7 @@
idList.add(Integer.valueOf(id));
}
goodsService.deleteByIdInBatch(idList);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -97,6 +107,7 @@
@RequiresPermissions("business:goods:update")
public ApiResponse companyUpdateById(@RequestBody Goods goods) {
goodsService.companyUpdateById(goods);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -130,7 +141,9 @@
})
// @RequiresPermissions("business:goods:create")
public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) {
- return ApiResponse.success(goodsService.importBatch(file));
+ Integer val = goodsService.importBatch(file);
+ cateParamSelectService.dealCateParamSelect();
+ return ApiResponse.success(val);
}
diff --git a/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index e517d0d..c294ef4 100644
--- a/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -4,9 +4,12 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.service.business.CompanyService;
import com.doumee.service.system.SystemDataPermissionService;
import com.doumee.service.system.SystemPermissionService;
import com.doumee.service.system.SystemRoleService;
@@ -23,6 +26,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -48,6 +52,10 @@
@Autowired
private SystemPermissionService systemPermissionService;
+ @Lazy
+ @Autowired
+ private CompanyService companyService;
+
/**
* 鏉冮檺澶勭悊
* @author Eva.Caesar Liu
@@ -69,7 +77,7 @@
* @date 2022/03/15 09:54
*/
@Override
- protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
+ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException{
// 鑾峰彇鐢ㄦ埛鍚�
String username = authenticationToken.getPrincipal().toString();
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
@@ -86,6 +94,15 @@
if(!Constants.equalsInteger(user.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璐﹀彿淇℃伅宸茶绂佺敤锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
}
+ if(!user.getType().equals(Constants.UserType.SYSTEM)){
+ Company company = companyService.findById(user.getCompanyId());
+ if(company.getStatus().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅宸茶绂佺敤锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ }
+ if(DateUtil.compareDate(new Date(),DateUtil.addDaysToDate(company.getOepnValidDate(),1))<=Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅宸茶繃鏈燂紝濡傛湁鐤戦棶璇疯仈绯荤郴缁熺鐞嗗憳锛�");
+ }
+ }
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
diff --git a/server/platform/pom.xml b/server/platform/pom.xml
index 95cc8db..dec41ea 100644
--- a/server/platform/pom.xml
+++ b/server/platform/pom.xml
@@ -47,11 +47,6 @@
</execution>
</executions>
</plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
- </plugin>-->
</plugins>
</build>
diff --git a/server/platform/src/main/java/com/doumee/shiro/ShiroSessionDAO.java b/server/platform/src/main/java/com/doumee/shiro/ShiroSessionDAO.java
index 7d4e7a7..726a21f 100644
--- a/server/platform/src/main/java/com/doumee/shiro/ShiroSessionDAO.java
+++ b/server/platform/src/main/java/com/doumee/shiro/ShiroSessionDAO.java
@@ -25,7 +25,7 @@
@Component
public class ShiroSessionDAO implements SessionDAO {
- private static final String KEY_PREFIX = "shiro:session:";
+ private static final String KEY_PREFIX = "shiro:session:admin:";
@Autowired
private ShiroCache shiroCache;
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 531d666..377de60 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -24,7 +24,7 @@
* 瀹氭椂澶勭悊鐖櫕婧愭暟鎹紝鐢熸垚绱犳潗搴撴暟鎹�
* @throws Exception
*/
- @Scheduled(fixedDelay=10*60*1000)
+ @Scheduled(fixedDelay=30*60*1000)
public void dealBaseData() throws Exception {
baseDataService.dealBaseData();
}
diff --git a/server/pom.xml b/server/pom.xml
index 57b0d85..be687ef 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -9,13 +9,13 @@
<packaging>pom</packaging>
<name>preselect</name>
<description></description>
- <modules>
- <module>platform</module>
- <module>service</module>
- <module>company</module>
- </modules>
+ <modules>
+ <module>platform</module>
+ <module>service</module>
+ <module>company</module>
+ </modules>
- <parent>
+ <parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.5.RELEASE</version>
@@ -34,7 +34,6 @@
<oshi.version>5.7.0</oshi.version>
<jna.version>5.7.0</jna.version>
<poi.version>5.0.0</poi.version>
- <maven.build.timestamp.format>yyyy-MM-dd-HH-mm</maven.build.timestamp.format>
</properties>
<dependencies>
@@ -202,26 +201,7 @@
<artifactId>jxl</artifactId>
<version>2.6.12</version>
</dependency>
-
</dependencies>
-
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <evn>dev</evn>
- </properties>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>test</id>
- <properties>
- <evn>test</evn>
- </properties>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
@@ -234,28 +214,4 @@
</plugin>
</plugins>
</build>
-
-
-
- <!--<build>
-
- <finalName>${project.artifactId}</finalName>
-
- <resources>
- <resource>
- <directory>service/src/main/resources</directory>
-<!– <filtering>true</filtering>–>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <mainClass>com.doumee.Application</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>-->
-
</project>
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 04ea0cb..dee67ff 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -7,11 +7,13 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.model.SystemUserRole;
+import com.doumee.service.business.CompanyService;
import com.doumee.service.system.*;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
@@ -32,6 +34,9 @@
@Autowired
private SystemUserService systemUserService;
+
+ @Autowired
+ private CompanyService companyService;
@Autowired
private SystemUserRoleService systemUserRoleService;
@@ -247,6 +252,16 @@
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
}
+ if(createCompanyUserDTO.getType().equals(Constants.UserType.ZHUBO.getKey())){
+ Company company = companyService.findById(loginUserInfo.getCompanyId());
+ SystemUser zbUserNum = new SystemUser();
+ zbUserNum.setCompanyId(loginUserInfo.getCompanyId());
+ zbUserNum.setDeleted(Boolean.FALSE);
+ zbUserNum.setType(Constants.UserType.ZHUBO.getKey());
+ if(systemUserService.findList(zbUserNum).size()>=company.getUserNum()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝宸茶秴鍑轰紒涓氬彲鍒嗛厤涓绘挱鏁伴噺锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ }
+ }
SystemUser systemUser = new SystemUser();
BeanUtils.copyProperties(createCompanyUserDTO,systemUser);
systemUser.setCompanyId(loginUserInfo.getCompanyId());
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index ed54c71..dbea4ac 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -29,6 +29,7 @@
public static final String TOP_IMG = "TOP_IMG";
public static final String PK_IMG = "PK_IMG";
public static final String RANGE_SIZE = "RANGE_SIZE";
+ public static final String CATE_PARAM_OPEN = "_CATE_PARAM_OPEN";
public static final String SYSTEM ="SYSTEM";
diff --git a/server/service/src/main/java/com/doumee/dao/business/CateParamSelectMapper.java b/server/service/src/main/java/com/doumee/dao/business/CateParamSelectMapper.java
index 1adabb6..85d8cac 100644
--- a/server/service/src/main/java/com/doumee/dao/business/CateParamSelectMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/CateParamSelectMapper.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.CateParamSelect;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/09/11 14:45
*/
public interface CateParamSelectMapper extends BaseMapper<CateParamSelect> {
+ void insertBatch(Integer companyId,Integer userId);
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
index 5cf5b80..c379f07 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -241,4 +242,9 @@
@ExcelColumn(name="澶勭悊鐘舵�� 0寰呭鐞� 1宸插鐞�")
private Integer status;
+ @ApiModelProperty(value = "娴佺▼")
+ @TableField(exist = false)
+ private String[] bgImgs;
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/CateParamSelectService.java b/server/service/src/main/java/com/doumee/service/CateParamSelectService.java
index 53ab071..ce0f2ff 100644
--- a/server/service/src/main/java/com/doumee/service/CateParamSelectService.java
+++ b/server/service/src/main/java/com/doumee/service/CateParamSelectService.java
@@ -1,5 +1,6 @@
package com.doumee.service;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.CateParamSelect;
@@ -95,4 +96,6 @@
* @return long
*/
long count(CateParamSelect cateParamSelect);
+
+ void dealCateParamSelect();
}
diff --git a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
index e88130c..753912f 100644
--- a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
@@ -125,6 +125,16 @@
*/
PageData<BaseGoods> findPage(PageWrap<BaseGoods> pageWrap);
+
+
+ /**
+ * 鍏徃鏌ヨ骞冲彴鍟嗗搧
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<BaseGoods>
+ */
+ PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap,Integer companyId);
+
/**
* 鏉′欢缁熻
*
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
index 59a522d..56cf831 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
@@ -257,8 +257,9 @@
@Override
public List<BaseCategory> findList(BaseCategory baseCategory) {
- baseCategory.setIsdeleted(Constants.ZERO);
QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>(baseCategory);
+ wrapper.eq("ISDELETED",Constants.ZERO);
+ wrapper.eq("STATUS",Constants.ZERO);
List<BaseCategory> list = baseCategoryMapper.selectList(wrapper);
list.forEach(i->{
if(StringUtils.isNotBlank(i.getImgurl())){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 603ddd7..7cb9362 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -20,7 +20,9 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -290,7 +292,19 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(baseDataMapper.selectPage(page, queryWrapper));
+ IPage<BaseData> result =baseDataMapper.selectPage(page, queryWrapper);
+ if(result!=null && result.getRecords()!=null){
+ for(BaseData data :result.getRecords()){
+ //澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
+ if(StringUtils.isNotBlank(data.getBgImg())){
+ String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "");
+ String[] imgs =tImg.split(",");
+ data.setBgImgs(imgs);
+
+ }
+ }
+ }
+ return PageData.from(result);
}
@Override
@@ -300,7 +314,7 @@
}
public static boolean IS_RUNNING = false;
@Override
- @Transactional
+ @Async
public void dealBaseData() {
if(IS_RUNNING){
return;
@@ -336,48 +350,7 @@
OssModel ossModel = initOssModel();
Date date = new Date();
for(BaseData data : allLis){
- BaseGoods goods = new BaseGoods();
- goods.setBaseDataId(data.getId());
- goods.setIsdeleted(Constants.ZERO);
- if(baseGoodsMapper.selectCount(new QueryWrapper<>(goods)) >0){
- //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
- UpdateWrapper<BaseGoods> updateModel = new UpdateWrapper<>();
- updateModel.lambda().set(BaseGoods::getIsdeleted,Constants.ONE);
- updateModel.lambda().set(BaseGoods::getEditDate, new Date());
- updateModel.lambda().eq(BaseGoods::getBaseDataId, data.getId());
- baseGoodsMapper.update(null, updateModel);
- }
- goods.setCreateDate(date);
- goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
- goods.setRemark(data.getTitle());
- goods.setContent(data.getTitle());
- goods.setStatus(Constants.ZERO);
- goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
- goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
- goods.setZdPrice(data.getPrice());
- //澶勭悊鍝佺墝鏁版嵁
- Brand bModel = getBrandModelFromList(data.getBrand(),brandList);
- if(bModel!= null){
- goods.setBrandId(bModel.getId());
- }
- //澶勭悊鍒楄〃鏁版嵁
- BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
- if(cModel!= null){
- goods.setCategoryId(cModel.getId());
- }
- goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
- goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
- //鎻掑叆鏂板晢鍝佹暟鎹�
- baseGoodsMapper.insert(goods);
- //澶勭悊鍒嗙被灞炴��
- dealCateParamAll(cModel.getId(),goods.getId(),data,paramList);
- //澶勭悊鑳屾櫙鍥�
- dealBgImgAll(ossModel,goods.getId(),data);
-
- data.setEditDate(new Date());
- data.setStatus(Constants.ONE);
- //鏇存柊鏁版嵁澶勭悊鐘舵��
- baseDataMapper.updateById(data);
+ dealPerData(ossModel,rate,date,data,cateList,brandList,paramList);
}
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================success================澶勭悊鏁版嵁鍏憋紙"+allLis.size()+"锛変釜===");
}catch (Exception e){
@@ -389,12 +362,77 @@
}
}
+ @Transactional(isolation = Isolation.READ_UNCOMMITTED)
+ private void dealPerData(OssModel ossModel, BigDecimal rate, Date date, BaseData data, List<BaseCategory> cateList, List<Brand> brandList, List<BaseCateParam> paramList) {
+ BaseGoods goods = new BaseGoods();
+ goods.setBaseDataId(data.getId());
+ goods.setIsdeleted(Constants.ZERO);
+ //鏌ヨ鏄惁瀛樺湪鍟嗗搧
+ BaseGoods model = baseGoodsMapper.selectOne(new QueryWrapper<>(goods).last(" limit 1"));
+ goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
+ goods.setRemark(data.getTitle());
+ goods.setContent(data.getTitle());
+ goods.setStatus(Constants.ZERO);
+ goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
+ goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
+ goods.setZdPrice(data.getPrice());
+ //澶勭悊鍝佺墝鏁版嵁
+ Brand bModel = getBrandModelFromList(data.getBrand(),brandList);
+ if(bModel!= null){
+ goods.setBrandId(bModel.getId());
+ }
+ //澶勭悊鍒楄〃鏁版嵁
+ BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
+ if(cModel!= null){
+ goods.setCategoryId(cModel.getId());
+ }
+ goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
+ goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+ if(model!=null){
+ //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
+// UpdateWrapper<BaseGoods> updateModel = new UpdateWrapper<>();
+// updateModel.lambda().set(BaseGoods::getIsdeleted,Constants.ONE);
+// updateModel.lambda().set(BaseGoods::getEditDate, new Date());
+// updateModel.lambda().eq(BaseGoods::getBaseDataId, data.getId());
+// baseGoodsMapper.update(null, updateModel);
+ goods.setEditDate(date);
+ goods.setId(model.getId());
+ baseGoodsMapper.updateById(goods);
+ //鍒犻櫎鍘熸湁闄勪欢澶у浘
+ UpdateWrapper<Multifile> updateModel = new UpdateWrapper<>();
+ updateModel.lambda().set(Multifile::getIsdeleted,Constants.ONE);
+ updateModel.lambda().set(Multifile::getEditDate, new Date());
+ updateModel.lambda().eq(Multifile::getObjId, goods.getId());
+ updateModel.lambda().eq(Multifile::getObjType, Constants.ZERO);
+ multifileMapper.delete(updateModel);
+ //鍒犻櫎鍘熸湁鍟嗗搧灞炴��
+ UpdateWrapper<BaseGoodsParam> bgModel = new UpdateWrapper<>();
+ bgModel.lambda().set(BaseGoodsParam::getIsdeleted,Constants.ONE);
+ bgModel.lambda().set(BaseGoodsParam::getEditDate, new Date());
+ bgModel.lambda().eq(BaseGoodsParam::getGoodsId, goods.getId());
+ baseGoodsParamMapper.delete(bgModel);
+ }else{
+ //鎻掑叆鏂板晢鍝佹暟鎹�
+ goods.setCreateDate(date);
+ baseGoodsMapper.insert(goods);
+ }
+ //澶勭悊鍒嗙被灞炴��
+ dealCateParamAll(cModel.getId(),goods.getId(),data,paramList);
+ //澶勭悊鑳屾櫙鍥�
+ dealBgImgAll(ossModel,goods.getId(),data);
+
+ data.setEditDate(new Date());
+ data.setStatus(Constants.ONE);
+ //鏇存柊鏁版嵁澶勭悊鐘舵��
+ baseDataMapper.updateById(data);
+ }
+
private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data) {
int i =0;
//澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
if(StringUtils.isNotBlank(data.getBgImg())){
- String tImg = data.getBgImg().replace("锛�", ",");
+ String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "");
String[] imgs =tImg.split(",");
for (int j = 0; j < imgs.length; j++) {
if(StringUtils.isNotBlank(imgs[j])){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index f0f4f19..db4a088 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -94,7 +94,8 @@
insert.setIsdeleted(Constants.ZERO);
insert.setRemark(baseGoods.getRemark());
insert.setName(baseGoods.getName());
- insert.setStatus(Constants.ZERO);
+ //榛樿涓嬫灦
+ insert.setStatus(Constants.ONE);
insert.setSortnum(integer+Constants.ONE);
insert.setImgurl(baseGoods.getImgurl());
insert.setCategoryId(baseGoods.getCategoryId());
@@ -370,6 +371,51 @@
return pageData;
}
+
+ @Override
+ public PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap ,Integer companyId) {
+
+ //鏌ヨ浼佷笟宸茬粡瀛樺湪鐨勫晢鍝�
+ List<Integer> collect = new ArrayList<>();
+ if(Objects.nonNull(companyId)){
+ QueryWrapper<Goods> goodsQuery = new QueryWrapper<>();
+ goodsQuery.lambda().eq(Goods::getIsdeleted,Constants.ZERO)
+ .eq(Goods::getCompanyId,companyId)
+ .isNotNull(Goods::getGoodsId);
+ List<Goods> goods = goodsMapper.selectList(goodsQuery);
+ if (CollectionUtils.isEmpty(goods)){
+ collect = goods.stream().map(s -> s.getGoodsId()).collect(Collectors.toList());
+ }
+ }
+
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ IPage<BaseGoods> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<BaseGoods> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
+ .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId)
+ .selectAll(BaseGoods.class)
+ .selectAs(Brand::getName,BaseGoods::getBrandName)
+ .selectAs(BaseCategory::getName,BaseGoods::getCategoryName)
+ .eq(BaseGoods::getStatus, Constants.ZERO)
+ .eq(BaseGoods::getIsdeleted, Constants.ZERO)
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getId()!=null,BaseGoods::getId, pageWrap.getModel().getId())
+ .eq(pageWrap.getModel().getCategoryId()!=null,BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId())
+ .eq(pageWrap.getModel().getBrandId()!=null,BaseGoods::getBrandId, pageWrap.getModel().getBrandId())
+ .eq(pageWrap.getModel().getStatus()!=null,BaseGoods::getStatus, pageWrap.getModel().getStatus())
+ .notIn(!CollectionUtils.isEmpty(collect),BaseGoods::getId, collect);
+
+ queryWrapper.orderByDesc(Goods::getId);
+ PageData<BaseGoods> pageData =PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
+ pageData.getRecords().forEach(i->{
+ i.setFullImgUrl(prefixUrl + i.getImgurl());
+ });
+ return pageData;
+ }
+
@Override
public long count(BaseGoods baseGoods) {
QueryWrapper<BaseGoods> wrapper = new QueryWrapper<>(baseGoods);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
index 56ef6a8..2af9103 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -159,7 +159,7 @@
wrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO)
+ .or().eq(Brand::getType,Constants.ONE)
);
}
List<Brand> list = brandMapper.selectList(wrapper);
@@ -186,6 +186,9 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Brand::getType, pageWrap.getModel().getType());
+ }
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Objects.isNull(user.getCompanyId())) {
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index b076e7f..237ba6f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -279,7 +279,8 @@
@Override
public void companyUpdateById(Category category) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(categoryMapper.selectCount(new QueryWrapper<Category>().eq("ISDELETED",Constants.ZERO).ne("id",category.getId()).eq("name",category.getName()))>0){
+ if(categoryMapper.selectCount(new QueryWrapper<Category>().eq("ISDELETED",Constants.ZERO).eq("COMPANY_ID",user.getCompanyId())
+ .ne("id",category.getId()).eq("name",category.getName()))>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+category.getName()+"銆戝凡瀛樺湪");
};
category.setStatus(Constants.ZERO);
@@ -489,9 +490,11 @@
@Override
public List<Category> findListForGoods(Integer goodsId) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
QueryWrapper<Category> wrapper = new QueryWrapper<Category>()
.eq("STATUS",Constants.ZERO)
.eq("ISDELETED",Constants.ZERO)
+ .eq("COMPANY_ID",loginUserInfo.getCompanyId())
.orderByAsc(" SORTNUM ");
List<Category> list = categoryMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
@@ -521,6 +524,9 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Category::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Category::getType, pageWrap.getModel().getType());
+ }
if (pageWrap.getModel().getCompanyId() != null) {
queryWrapper.lambda().eq(Category::getCompanyId, pageWrap.getModel().getCompanyId());
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index e5d6640..238da11 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -223,19 +223,19 @@
goodsParamMapper.insert(goodsParam);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(goodsParam.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(goodsParam.getPramaId());
- cateParamSelect.setCategoryId(goods.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(goodsParam.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(goodsParam.getPramaId());
+// cateParamSelect.setCategoryId(goods.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
@@ -360,19 +360,19 @@
goodsParam.setGoodsId(goods.getId());
goodsParamMapper.insert(goodsParam);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(goodsParam.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(goodsParam.getPramaId());
- cateParamSelect.setCategoryId(goods.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(goodsParam.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(goodsParam.getPramaId());
+// cateParamSelect.setCategoryId(goods.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
return goods.getId();
@@ -469,7 +469,8 @@
goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
goodsMapper.updateById(goods);
- multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId()));
+ multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId())
+ .eq("OBJ_TYPE",0).eq("COMPANY_ID",user.getCompanyId()));
List<Multifile> multifileList = goods.getMultifileList();
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
@@ -497,19 +498,19 @@
goodsParam.setGoodsId(goods.getId());
goodsParamMapper.insert(goodsParam);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(goodsParam.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(goodsParam.getPramaId());
- cateParamSelect.setCategoryId(goods.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(goodsParam.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(goodsParam.getPramaId());
+// cateParamSelect.setCategoryId(goods.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
}
@@ -677,7 +678,9 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.eq(Goods::getStatus, pageWrap.getModel().getStatus());
}
-
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.eq(Goods::getType, pageWrap.getModel().getType());
+ }
if (pageWrap.getModel().getCategoryId() != null) {
queryWrapper.eq(Goods::getCategoryId, pageWrap.getModel().getCategoryId());
}
@@ -693,10 +696,6 @@
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
goodsIPage.getRecords().forEach(i->{
i.setPrefixUrl(prefixUrl);
- if(i.getType().equals(Constants.ONE)){
- i.setBasePrice(i.getBasePrice().multiply(i.getBasePriceRate()));
- }
-
});
return PageData.from(goodsIPage);
}
@@ -875,19 +874,19 @@
//鎻掑叆浜у搧鍙傛暟鍏宠仈琛�
goodsParamMapper.insert(gp);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(gp.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(gp.getPramaId());
- cateParamSelect.setCategoryId(newModel.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(gp.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(gp.getPramaId());
+// cateParamSelect.setCategoryId(newModel.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
if(mulFiles !=null && mulFiles.size()>0){
diff --git a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
index ecca947..0f3717a 100644
--- a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
@@ -4,13 +4,18 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CateParamSelectMapper;
import com.doumee.dao.business.model.CateParamSelect;
import com.doumee.service.CateParamSelectService;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -23,6 +28,9 @@
*/
@Service
public class CateParamSelectServiceImpl implements CateParamSelectService {
+
+ @Autowired
+ private RedisTemplate redisTemplate;
@Autowired
private CateParamSelectMapper cateParamSelectMapper;
@@ -142,4 +150,25 @@
QueryWrapper<CateParamSelect> wrapper = new QueryWrapper<>(cateParamSelect);
return cateParamSelectMapper.selectCount(wrapper);
}
+
+ @Override
+ @Async
+ public void dealCateParamSelect() {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Boolean isGrouping = (Boolean)redisTemplate.opsForValue().get(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN);
+ if(isGrouping!=null && isGrouping ){
+ return;
+ }
+ redisTemplate.opsForValue().set(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN,true);
+ try {
+ //鍒犻櫎浼佷笟涓嬪巻鍙叉暟鎹�
+ cateParamSelectMapper.delete(new QueryWrapper<CateParamSelect>().exists(" select 1 from category c where c.id = cate_param_select.category_id and c.company_id = "+loginUserInfo.getCompanyId()+" "));
+ //鏂板褰撳墠浼佷笟鍙互浣跨敤鐨勬暟鎹�
+ cateParamSelectMapper.insertBatch(loginUserInfo.getCompanyId(),loginUserInfo.getId());
+ }catch (Exception e){
+
+ }finally {
+ redisTemplate.opsForValue().set(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN,false);
+ }
+ }
}
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 2f4ce06..b41579c 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.system.impl;
+import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -21,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.Objects;
@Slf4j
@Service
@@ -77,7 +79,7 @@
loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
loginLog.setSuccess(Boolean.FALSE);
systemLoginLogService.create(loginLog);
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), Objects.isNull(e.getCause())?ResponseStatus.ACCOUNT_INCORRECT.getMessage():e.getCause().getMessage());
}
}
}
diff --git a/server/service/src/main/resources/mappers/CateParamSelectMapper.xml b/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
new file mode 100644
index 0000000..f11a72c
--- /dev/null
+++ b/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.doumee.dao.business.CateParamSelectMapper">
+
+
+ <insert id="insertBatch" >
+ INSERT INTO `cate_param_select`
+ (`CREATOR`, `CREATE_DATE`, `EDITOR`, `EDIT_DATE`, `ISDELETED`, `REMARK`, `NAME`, `PARAM_ID`, `CATEGORY_ID`,
+ `STATUS`, `SORTNUM`)
+ select #{userId} , now(),null , null , 0 , null , a.VAL , a.PRAMA_ID , b.CATEGORY_ID , 0 , null from goods_param a inner join goods b on a.GOODS_ID = b.ID
+ and a.PRAMA_ID is not null AND a.VAL is not null
+ and a.ISDELETED = 0
+ and a.`STATUS` = 0
+ and b.`STATUS` = 0
+ and b.ISDELETED = 0
+ AND b.company_id = #{companyId}
+ </insert>
+
+</mapper>
--
Gitblit v1.9.3