From 69c65dda53f5fa7007130e6a7339666b5b5ef52a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 13:39:06 +0800
Subject: [PATCH] 休bug
---
platform/src/components/business/OperaCategoryWindow.vue | 30 +++---
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 95 ++++++++++++++----
server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java | 2
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 16 ++
platform/src/views/business/baseData.vue | 7
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 22 ++-
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java | 13 --
platform/src/api/system/permission.js | 2
server/service/src/main/java/com/doumee/dao/business/model/Company.java | 2
platform/src/views/business/brand.vue | 4
server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java | 20 ++-
platform/src/components/business/OperaBrandWindow.vue | 9 +
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 34 +++++-
server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java | 2
platform/.env.development | 2
platform/src/views/business/category.vue | 2
16 files changed, 171 insertions(+), 91 deletions(-)
diff --git a/platform/.env.development b/platform/.env.development
index fd388dc..6ddd836 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -6,4 +6,4 @@
# 浠诲悍
# VUE_APP_API = 'http://192.168.0.15:10017/'
# 鐒︽澗
-VUE_APP_API = 'http://localhost:10011'
+VUE_APP_API = 'http://192.168.0.35:10011'
diff --git a/platform/src/api/system/permission.js b/platform/src/api/system/permission.js
index 7d60c43..055a24d 100644
--- a/platform/src/api/system/permission.js
+++ b/platform/src/api/system/permission.js
@@ -12,7 +12,7 @@
// 鏌ヨ鎵�鏈�
export function fetchAllCom () {
- return request.get('/system/permission/allCom')
+ return request.get('/system/permission/all')
}
// 鏂板缓
diff --git a/platform/src/components/business/OperaBrandWindow.vue b/platform/src/components/business/OperaBrandWindow.vue
index e572e50..b5899ee 100644
--- a/platform/src/components/business/OperaBrandWindow.vue
+++ b/platform/src/components/business/OperaBrandWindow.vue
@@ -1,10 +1,10 @@
<template>
<GlobalAlertWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" width="600px" @confirm="confirm">
- <el-form :model="form" ref="form" label-width="100px" label-suffix="锛�" :rules="rules">
+ <el-form :model="form" ref="form" label-width="150px" label-suffix="锛�" :rules="rules">
<el-form-item label="鍝佺墝鍚嶇О" prop="name">
<el-input v-model="form.name" maxlength="20" placeholder="璇疯緭鍏ワ紝涓嶈秴杩�20涓瓧绗�" v-trim />
</el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
+ <el-form-item label="鍝佺墝鍥炬爣" prop="imgurl">
<UploadAvatarImage
:file="{ 'imgurlfull': form.imgfullurl, 'imgurl': form.imgurl }"
:uploadData="uploadData"
@@ -13,9 +13,10 @@
@uploadEnd="end"
@uploadBegin="begin"
/>
+ 鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�200px*200px
</el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim />
+ <el-form-item label="鎺掑簭鐮�(鍗囧簭)" prop="sortnum">
+ <el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜锛屽崌搴忓睍绀�" v-trim />
</el-form-item>
</el-form>
</GlobalAlertWindow>
diff --git a/platform/src/components/business/OperaCategoryWindow.vue b/platform/src/components/business/OperaCategoryWindow.vue
index d3b2b4f..e70b3a3 100644
--- a/platform/src/components/business/OperaCategoryWindow.vue
+++ b/platform/src/components/business/OperaCategoryWindow.vue
@@ -19,21 +19,21 @@
</el-form-item>
</el-form>
- <div class="param-table">
+ <div class="param-table" >
<div class="title-contant">
<div class="title">鍙傛暟灞炴�ч厤缃�</div>
<div class="sub-title">閰嶇疆褰撳墠绫诲埆鐨勪骇鍝佸弬鏁板悕</div>
</div>
- <el-table :data="form.baseCategoryRequestParamList" stripe border>
- <el-table-column prop="" label="鍙傛暟鍚�" min-width="100px" align="center">
+ <el-table :data="form.baseCateParamList" stripe border >
+ <el-table-column prop="" label="鍙傛暟鍚�" min-width="200px" align="center">
<template slot-scope="{row}">
- <el-input v-model="row.name" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim />
+ <el-input v-model="row.name" placeholder="璇疯緭鍏ュ弬鏁板悕" v-trim />
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="100" align="center">
<template slot-scope="{row, $index}">
<el-button type="text" style="color: red"
- @click="form.baseCategoryRequestParamList.splice($index, 1)">鍒犻櫎</el-button>
+ @click="form.baseCateParamList.splice($index, 1)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -66,14 +66,13 @@
// attrFirst: '',
// attrFirst1: '',
- baseCategoryRequestParamList: [],
+ baseCateParamList: [],
// attrSecond: '',
// attrSecond1: '',
// attrSecondList: [],
// parameter: '',
- // paramList: [],
-
+ paramList: []
},
// 楠岃瘉瑙勫垯
@@ -100,6 +99,8 @@
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form.imgfullurl = ''
+ this.form.baseCateParamList = [{name:''}]
+ this.form.paramList = [{name:''}]
this.form[this.configData['field.id']] = null
})
return
@@ -109,15 +110,14 @@
for (const key in this.form) {
this.form[key] = target[key]
}
- this.form.baseCategoryRequestParamList = this.form.baseCategoryRequestParamList || []
+ this.form.baseCateParamList = this.form.baseCateParamList || []
})
},
- addParam() {
- this.form.baseCategoryRequestParamList.push({ name: '' })
+ addParam () {
+ this.form.baseCateParamList.push({ name: '' })
},
- changeInput(type, index) {
+ changeInput (type, index) {
if (type === 1) {
- 涓嶈兘涓虹┖
if (!this.form.budgetList[index].minamount) return
if (!/^[0-9]*[1-9][0-9]*$/.test(this.form.budgetList[index].minamount)) {
this.$message.warning({
@@ -222,6 +222,7 @@
<style lang="scss" scoped>
.param-table {
+ //width: 70%;
margin-top: 40px;
.title-contant {
@@ -247,5 +248,4 @@
width: 300px;
}
}
-</style>
-
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/platform/src/views/business/baseData.vue b/platform/src/views/business/baseData.vue
index 4ac6e19..20cfdd7 100644
--- a/platform/src/views/business/baseData.vue
+++ b/platform/src/views/business/baseData.vue
@@ -57,17 +57,18 @@
</div> </a>
</template>
</el-table-column>
- <el-table-column prop="name" label="鍟嗗搧鍚嶇О" min-width="100px">
+ <el-table-column prop="name" label="鍟嗗搧鍚嶇О" min-width="150px">
<template slot-scope="{row}">
<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="sku" label="浜笢sku" min-width="100px"></el-table-column>
- <el-table-column prop="brand" label="鍝佺墝" 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">
<template slot-scope="{row}">
<div style="display: flex; align-items: center;">
@@ -140,7 +141,7 @@
<el-table-column
v-if="containPermissions(['business:basedata:update', 'business:basedata:delete'])"
label="鎿嶄綔"
- min-width="120"
+ min-width="80"
fixed="right"
>
<template slot-scope="{row}">
diff --git a/platform/src/views/business/brand.vue b/platform/src/views/business/brand.vue
index 0c4f9db..5392956 100644
--- a/platform/src/views/business/brand.vue
+++ b/platform/src/views/business/brand.vue
@@ -20,7 +20,7 @@
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border :header-cell-style="rowStyle"
:cell-style="rowStyle">
<el-table-column prop="name" label="鍝佺墝鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="imgfullurl" label="鍥炬爣" min-width="100px">
+ <el-table-column prop="imgfullurl" label="鍝佺墝鍥炬爣" min-width="100px">
<template slot-scope="{row}">
<el-image v-if="row.imgfullurl" style="width: 70px; height: 70px" :src="row.imgfullurl"
:preview-src-list="[row.imgfullurl]" fit="cover"></el-image>
@@ -83,7 +83,7 @@
name: row.name,
sortnum: row.sortnum,
imgurl: row.imgurl,
- fileList: row.imgurl ? [{ url: row.prefixUrl + row.imgurl }] : []
+ imgfullurl: row.imgfullurl
}
this.$refs.operaBrandWindow.open('缂栬緫鍝佺墝', obj)
}
diff --git a/platform/src/views/business/category.vue b/platform/src/views/business/category.vue
index 3f682ba..659971b 100644
--- a/platform/src/views/business/category.vue
+++ b/platform/src/views/business/category.vue
@@ -108,7 +108,7 @@
budgetList: res.budgetList,
fileList: res.imgurl ? [{ url: res.prefixUrl + res.imgurl }] : []
}
- this.$refs.operaCategoryWindow.open('缂栬緫绫诲埆', obj)
+ this.$refs.operaCategoryWindow.open('缂栬緫绫诲埆', res)
})
}
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java b/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
index 21b8acb..fd01a68 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.BaseCategory;
+import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.dto.BaseCategoryRequest;
import com.doumee.service.business.BaseCategoryService;
import io.swagger.annotations.Api;
@@ -61,10 +62,17 @@
}
@ApiOperation(value = "鏍规嵁ID淇敼-鍒楄〃灞炴�т慨鏀�")
- @PostMapping("/updateById")
-// @RequiresPermissions("business:basecategory:update")
+ @PostMapping("/updateByIdOrigin")
+ @RequiresPermissions("business:basecategory:update")
public ApiResponse updateById(@RequestBody BaseCategory baseCategory) {
baseCategoryService.updateById(baseCategory);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("淇敼鐘舵��")
+ @PostMapping("/updateDisableById")
+ @RequiresPermissions("business:basecategory:update")
+ public ApiResponse updateDisableById(@RequestBody BaseCategory category) {
+ baseCategoryService.updateDisableById(category);
return ApiResponse.success(null);
}
@@ -74,16 +82,16 @@
* @param baseCategory 瀹炰綋瀵硅薄
*/
@ApiOperation("鏍规嵁ID淇敼-缂栬緫淇敼")
- @PostMapping("/update")
-// @RequiresPermissions("business:basecategory:update")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:basecategory:update")
public ApiResponse update(@RequestBody BaseCategoryRequest baseCategory){
baseCategoryService.update(baseCategory);
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("鍒嗛〉鏌ヨ`")
@PostMapping("/page")
-// @RequiresPermissions("business:basecategory:query")
+ @RequiresPermissions("business:basecategory:query")
public ApiResponse<PageData<BaseCategory>> findPage (@RequestBody PageWrap<BaseCategory> pageWrap) {
return ApiResponse.success(baseCategoryService.findPage(pageWrap));
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
index 93ee05f..13377aa 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +43,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
index 12ca91a..54b651b 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -79,7 +79,7 @@
private Integer salesmanId;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
- private Byte status;
+ private Integer status;
@ApiModelProperty(value = "閿�鍞汉鍛樺鍚�")
@TableField(exist = false)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java
index 86fc24a..d1dd6a7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java
@@ -25,12 +25,6 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "灞炴��1鍚嶇О")
- private String attrFirst;
-
- @ApiModelProperty(value = "灞炴��2鍚嶇О")
- private String attrSecond;
-
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@@ -40,17 +34,12 @@
@ApiModelProperty(value = "鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "鍚嶇О鎷奸煶")
- private String pinyin;
-
- @ApiModelProperty(value = "鍚嶇О鎷奸煶棣栧瓧姣�")
- private String shortPinyin;
@ApiModelProperty(value = "鍔犱环绯绘暟",example = "0")
private BigDecimal priceRate;
@ApiModelProperty(value = "鍙傛暟灞炴�ч厤缃�")
- List<BaseCategoryRequestParam> baseCategoryRequestParamList;
+ List<BaseCategoryRequestParam> baseCateParamList;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java b/server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java
index 86ee778..aa2fabb 100644
--- a/server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java
+++ b/server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java
@@ -103,4 +103,6 @@
* @return long
*/
long count(BaseCategory baseCategory);
+
+ void updateDisableById(BaseCategory category);
}
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 761a78d..e5ea7b9 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.PinYinUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BaseCateParamMapper;
import com.doumee.dao.business.BaseCategoryMapper;
@@ -19,12 +20,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -67,24 +71,22 @@
baseCategory2.setIsdeleted(Constants.ZERO);
baseCategory2.setName(baseCategory.getName());
baseCategory2.setRemark(baseCategory.getRemark());
- baseCategory2.setAttrFirst(baseCategory.getAttrFirst());
- baseCategory2.setAttrSecond(baseCategory.getAttrSecond());
baseCategory2.setStatus(baseCategory.getStatus());
baseCategory2.setSortnum(baseCategory.getSortnum());
baseCategory2.setImgurl(baseCategory.getImgurl());
- baseCategory2.setPinyin(baseCategory.getPinyin());
- baseCategory2.setShortPinyin(baseCategory.getShortPinyin());
+ baseCategory2.setPinyin(PinYinUtil.getFullSpell(baseCategory.getName()));
+ baseCategory2.setShortPinyin(PinYinUtil.getFirstSpell(baseCategory.getName()));
baseCategory2.setPriceRate(baseCategory.getPriceRate());
baseCategoryMapper.insert(baseCategory2);
- if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCateParamList())){
- long count = baseCategory.getBaseCategoryRequestParamList().stream().map(s -> s.getName().trim()).distinct().count();
+ long count = baseCategory.getBaseCateParamList().stream().map(s -> s.getName().trim()).distinct().count();
- if (baseCategory.getBaseCategoryRequestParamList().size() != count){
+ if (baseCategory.getBaseCateParamList().size() != count){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"灞炴�у瓨鍦ㄩ噸澶�");
}
- baseCategory.getBaseCategoryRequestParamList().forEach(s->{
+ baseCategory.getBaseCateParamList().forEach(s->{
BaseCateParam baseCateParam = new BaseCateParam();
baseCateParam.setCreator(loginUserInfo.getId());
baseCateParam.setCreateDate(new Date());
@@ -127,8 +129,9 @@
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if (Objects.isNull(baseCategory.getId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍝佺被涓婚敭缂哄け");
+ if (Objects.isNull(baseCategory.getId())
+ || Objects.isNull(baseCategory.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>();
@@ -139,41 +142,61 @@
if (Objects.nonNull(baseCategory1) && (!baseCategory1.getId().equals(baseCategory.getId()))){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍝佺被淇℃伅琛�");
}
+ if(baseCategory.getPriceRate() == null){
+ baseCategory.setPriceRate(new BigDecimal(1.2));
+ }
UpdateWrapper<BaseCategory> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda()
.eq(BaseCategory::getId,baseCategory.getId())
.set(BaseCategory::getName,baseCategory.getName())
+ .set(BaseCategory::getPinyin,PinYinUtil.getFullSpell(baseCategory.getName()))
+ .set(BaseCategory::getShortPinyin,PinYinUtil.getFirstSpell(baseCategory.getName()))
.set(BaseCategory::getImgurl,baseCategory.getImgurl())
.set(BaseCategory::getPriceRate,baseCategory.getPriceRate())
.set(BaseCategory::getSortnum,baseCategory.getSortnum());
+
baseCategoryMapper.update(null,updateWrapper);
- if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCateParamList())){
- long count = baseCategory.getBaseCategoryRequestParamList().stream().map(s -> s.getName().trim()).distinct().count();
- if (baseCategory.getBaseCategoryRequestParamList().size() != count){
+ long count = baseCategory.getBaseCateParamList().stream().map(s -> s.getName().trim()).distinct().count();
+ if (baseCategory.getBaseCateParamList().size() != count){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"灞炴�у瓨鍦ㄩ噸澶�");
}
-
+ List<Integer> ids = new ArrayList<>();
+ baseCategory.getBaseCateParamList().forEach(s->{
+ if(s.getId() !=null){
+ ids. add(s.getId());
+ }
+ });
QueryWrapper<BaseCateParam> baseCateParamQuery = new QueryWrapper<>();
baseCateParamQuery.lambda()
.eq(BaseCateParam::getCategoryId,baseCategory.getId());
+ baseCateParamQuery.lambda()
+ .notIn(ids!=null && ids.size()>0,BaseCateParam::getId,ids);
+ //鍒櫎閫昏緫
baseCateParamMapper.delete(baseCateParamQuery);
-
- baseCategory.getBaseCategoryRequestParamList().forEach(s->{
+ baseCategory.getBaseCateParamList().forEach(s->{
BaseCateParam baseCateParam = new BaseCateParam();
- baseCateParam.setCreator(loginUserInfo.getId());
- baseCateParam.setCreateDate(new Date());
- baseCateParam.setEditor(loginUserInfo.getId());
- baseCateParam.setEditDate(new Date());
baseCateParam.setIsdeleted(Constants.ZERO);
baseCateParam.setName(s.getName());
baseCateParam.setRemark(s.getRemark());
baseCateParam.setStatus(s.getStatus());
baseCateParam.setSortnum(s.getSortnum());
baseCateParam.setCategoryId(baseCategory.getId());
- baseCateParamMapper.insert(baseCateParam);
+ if(s.getId() !=null ){
+ //鏇存柊鏁版嵁
+ baseCateParam.setEditor(loginUserInfo.getId());
+ baseCateParam.setEditDate(new Date());
+ baseCateParam.setId(s.getId());
+ baseCateParamMapper.updateById(baseCateParam);
+ }else{
+ //鏂板
+ baseCateParam.setCreator(loginUserInfo.getId());
+ baseCateParam.setCreateDate(new Date());
+ baseCateParamMapper.insert(baseCateParam);
+ }
});
}
@@ -183,6 +206,25 @@
@Override
public void updateById(BaseCategory baseCategory) {
baseCategoryMapper.updateById(baseCategory);
+ }
+ @Override
+ public void updateDisableById(BaseCategory baseCategory) {
+
+ LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(baseCategory.getId() == null || baseCategory.getStatus() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(!Constants.equalsInteger(baseCategory.getStatus(), Constants.ONE)
+ && !Constants.equalsInteger(baseCategory.getStatus(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ BaseCategory param= new BaseCategory();
+ param.setId(baseCategory.getId());
+ param.setEditDate(new Date());
+ param.setEditor(loginUserInfo.getId());
+ param.setId(baseCategory.getId());
+ param.setStatus(baseCategory.getStatus());
+ baseCategoryMapper.updateById(param);
}
@Override
@@ -197,7 +239,14 @@
@Override
public BaseCategory findById(Integer id) {
- return baseCategoryMapper.selectById(id);
+ BaseCategory model = baseCategoryMapper.selectById(id);
+ if(StringUtils.isNotBlank(model.getImgurl())){
+ model.setImgfullurl(
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_IMG).getCode() + model.getImgurl()
+ );
+ }
+ return model;
}
@Override
@@ -245,7 +294,7 @@
queryWrapper.lambda().eq(BaseCategory::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(BaseCategory::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(BaseCategory::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(BaseCategory::getRemark, pageWrap.getModel().getRemark());
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 69a36fc..f637423 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
@@ -391,9 +391,19 @@
private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data) {
int i =0;
- i += addImg(i,ossModel,id,data.getBgImg());
- i += addImg(i,ossModel,id,data.getBgImg2());
- addImg(i,ossModel,id,data.getBgImg3());
+ //澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
+ if(StringUtils.isNotBlank(data.getBgImg())){
+ String tImg = data.getBgImg().replace("锛�", ",");
+ String[] imgs =tImg.split(",");
+ for (int j = 0; j < imgs.length; j++) {
+ if(StringUtils.isNotBlank(imgs[j])){
+ i += addImg(i,ossModel,id,imgs[j]);
+ }
+ }
+ }
+// i += addImg(i,ossModel,id,data.getBgImg());
+// i += addImg(i,ossModel,id,data.getBgImg2());
+// addImg(i,ossModel,id,data.getBgImg3());
}
private int addImg(int i,OssModel ossModel, Integer id,String bgImg) {
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 d76e4c7..be0fe71 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
@@ -42,6 +42,9 @@
private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(Brand brand) {
+ if(StringUtils.isBlank(brand.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(brandMapper.selectCount(new QueryWrapper<Brand>()
.eq("ISDELETED",Constants.ZERO)
@@ -52,7 +55,14 @@
)
)>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
- };
+ }
+ if(Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())){
+ //骞冲彴鍝佺墝
+ brand.setType(Constants.ONE);
+ }else{
+ brand.setType(Constants.ZERO);
+ brand.setCompanyId(user.getCompanyId());
+ }
brand.setStatus(Constants.ZERO);
brand.setCreateDate(new Date());
brand.setCreator(user.getId());
@@ -100,7 +110,9 @@
if(Objects.nonNull(brand1) && (!brand.getId().equals(brand.getId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
- };
+ }
+ brand.setType(null);
+ brand.setCompanyId(null);
brand.setStatus(Constants.ZERO);
brand.setEditDate(new Date());
brand.setEditor(user.getId());
@@ -120,10 +132,12 @@
@Override
public Brand findById(Integer id) {
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
- + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
Brand brand = brandMapper.selectById(id);
- brand.setImgfullurl(prefixUrl+brand.getImgurl());
+ if(StringUtils.isNotBlank(brand.getImgurl())){
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
+ brand.setImgfullurl(prefixUrl+brand.getImgurl());
+ }
return brand;
}
@@ -173,15 +187,19 @@
if (Objects.isNull(user.getCompanyId())) {
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- queryWrapper.lambda().eq(Brand::getType,pageWrap.getModel().getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);
+ queryWrapper.lambda().and(wreapper->{
+ wreapper.eq(Brand::getType,pageWrap.getModel().getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO);});
+
}
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
brandIPage.getRecords().forEach(i->{
- i.setImgfullurl(prefixUrl+i.getImgurl());
+ if(StringUtils.isNotBlank(i.getImgurl())){
+ i.setImgfullurl(prefixUrl+i.getImgurl());
+ }
});
return PageData.from(brandIPage);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 5e80b3d..8f6815e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -88,14 +88,15 @@
if (Objects.nonNull(company1)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
}
-
- wrapper.clear();
- wrapper.lambda()
- .eq(Company::getDeleted,Boolean.FALSE)
- .eq(Company::getCreditCode,company.getCreditCode());
- Company company2 = companyMapper.selectOne(wrapper);
- if (Objects.nonNull(company2)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ if(StringUtils.isNotBlank(company.getCreditCode())){
+ wrapper.clear();
+ wrapper.lambda()
+ .eq(Company::getDeleted,Boolean.FALSE)
+ .eq(Company::getCreditCode,company.getCreditCode());
+ Company company2 = companyMapper.selectOne(wrapper);
+ if (Objects.nonNull(company2)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟缁熶竴绀句細淇＄敤浠ｇ爜宸插瓨鍦ㄨ閲嶆柊杈撳叆");
+ }
}
Company insert = new Company();
insert.setDeleted((byte)Constants.ZERO);
@@ -114,6 +115,7 @@
insert.setOepnValidDate(company.getOepnValidDate());
insert.setOepnType(company.getOepnType());
insert.setSalesmanId(company.getSalesmanId());
+ insert.setStatus(Constants.ZERO);
companyMapper.insert(insert);
//鍒涘缓浼佷笟鐢ㄦ埛
SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId());
@@ -193,6 +195,8 @@
.set(Company::getShortName,company.getShortName())
.set(Company::getCreditCode,company.getCreditCode())
.set(Company::getSalesmanId,company.getSalesmanId())
+ .set(company.getOepnValidDate()!=null,Company::getOepnValidDate,company.getOepnValidDate())
+ .set(company.getUserNum()!=null,Company::getUserNum,company.getUserNum())
.set(Company::getLinkname,company.getLinkname())
.set(Company::getLinkephone,company.getLinkephone());
companyMapper.update(null,wrapper);
@@ -296,7 +300,7 @@
"(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
- .eq(Objects.nonNull(pageWrap.getModel().getManagerUserName()),Company::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
.between((Objects.nonNull(pageWrap.getModel().getOepnValidDateStart()) && Objects.nonNull(pageWrap.getModel().getOepnValidDateEnd())),
Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper));
--
Gitblit v1.9.3