From c2d456b74202d5b2b375ea8c4912dcfbd70c972b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 12 九月 2023 18:20:36 +0800
Subject: [PATCH] #自测修改
---
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 12 +-
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 28 +++++++
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java | 16 ++--
server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java | 2
server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java | 59 ++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 18 ++-
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java | 4
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequestParam.java | 6
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsParamCreatRequest.java | 8 +-
server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java | 2
server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java | 21 ++++-
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 3
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsCreateOrUpdateRequest.java | 12 +-
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 8 +-
server/service/src/main/java/com/doumee/dao/business/model/Multifile.java | 17 ++--
15 files changed, 158 insertions(+), 58 deletions(-)
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 fdfffcf..21b8acb 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
@@ -34,7 +34,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:basecategory:create")
+// @RequiresPermissions("business:basecategory:create")
public ApiResponse create(@RequestBody BaseCategoryRequest baseCategory) {
return ApiResponse.success(baseCategoryService.create(baseCategory));
}
@@ -60,17 +60,30 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID淇敼")
+ @ApiOperation(value = "鏍规嵁ID淇敼-鍒楄〃灞炴�т慨鏀�")
@PostMapping("/updateById")
- @RequiresPermissions("business:basecategory:update")
+// @RequiresPermissions("business:basecategory:update")
public ApiResponse updateById(@RequestBody BaseCategory baseCategory) {
baseCategoryService.updateById(baseCategory);
return ApiResponse.success(null);
}
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param baseCategory 瀹炰綋瀵硅薄
+ */
+ @ApiOperation("鏍规嵁ID淇敼-缂栬緫淇敼")
+ @PostMapping("/update")
+// @RequiresPermissions("business:basecategory:update")
+ public ApiResponse update(@RequestBody BaseCategoryRequest baseCategory){
+ baseCategoryService.update(baseCategory);
+ return ApiResponse.success(null);
+ }
+
@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/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java b/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java
index efa43c4..02b4907 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.BaseGoods;
import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest;
+import com.doumee.dao.business.model.dto.BaseGoodsDTO;
import com.doumee.service.business.BaseGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,7 +35,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:basegoods:create")
+// @RequiresPermissions("business:basegoods:create")
public ApiResponse create(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods) {
return ApiResponse.success(baseGoodsService.create(baseGoods));
}
@@ -84,8 +85,62 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @RequiresPermissions("business:basegoods:query")
+// @RequiresPermissions("business:basegoods:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(baseGoodsService.findById(id));
}
+
+ /**
+ * 涓婚敭涓婁笅鏋�
+ *
+ * @param idList 瀹炰綋瀵硅薄
+ */
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @PostMapping("/{status")
+ @RequiresPermissions("business:basegoods:query")
+ public ApiResponse updateStatusByIds(@RequestBody List<Integer> idList, @PathVariable Integer status){
+ baseGoodsService.updateStatusByIds(idList,status);
+ return ApiResponse.success(null);
+ }
+
+
+ /**
+ * 涓婚敭涓婁笅鏋�
+ *
+ * @param id 瀹炰綋瀵硅薄
+ */
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/updateStatusById")
+ @RequiresPermissions("business:basegoods:query")
+ public ApiResponse updateStatusById(@RequestParam Integer id,@RequestParam Integer status){
+ baseGoodsService.updateStatusById(id,status);
+ return ApiResponse.success(null);
+ }
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return BaseGoods
+ */
+ @ApiOperation("鏍规嵁ID鏌ヨ骞冲彴鍟嗗搧璇︾粏淇℃伅")
+ @GetMapping("/findByIdBaseGoods")
+// @RequiresPermissions("business:basegoods:query")
+ public ApiResponse<BaseGoodsDTO> findByIdBaseGoods(@RequestParam Integer id){
+ BaseGoodsDTO byIdBaseGoods = baseGoodsService.findByIdBaseGoods(id);
+ return ApiResponse.success(byIdBaseGoods);
+ }
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param baseGoods 瀹炰綋瀵硅薄
+ */
+ @ApiOperation("鏍规嵁ID淇敼-缂栬緫淇敼")
+ @PostMapping("/update")
+// @RequiresPermissions("business:basegoods:update")
+ public ApiResponse update(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods){
+ baseGoodsService.update(baseGoods);
+ return ApiResponse.success(null);
+ }
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index 584e40e..71e0ce1 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -74,4 +74,32 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(companyService.findById(id));
}
+
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<Company>
+ */
+ @ApiOperation("骞冲彴鏌ヨ浼佷笟淇℃伅-鍒嗛〉鏌ヨ")
+ @PostMapping("/findPlatformPage")
+ @RequiresPermissions("company:company:query")
+ public ApiResponse<PageData<Company>> findPlatformPage(@RequestBody PageWrap<Company> pageWrap){
+ return ApiResponse.success(companyService.findPlatformPage(pageWrap));
+ }
+
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param companyId 涓婚敭
+ * @return Company
+ */
+ @ApiOperation("鏍规嵁浼佷笟浼佷笟id 鏌ヨ浼佷笟鐢ㄦ埛")
+ @PostMapping("/findPlatformById")
+ @RequiresPermissions("company:company:query")
+ public ApiResponse<Company> findPlatformById(@RequestParam Integer companyId){
+ return ApiResponse.success(companyService.findPlatformById(companyId));
+ }
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
index 37e0564..0dbb30c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
@@ -83,7 +83,7 @@
@ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
@ExcelColumn(name="鎵�灞炲搧鐗宯ame")
@TableField(exist = false)
- private Integer brandName;
+ private String brandName;
@ApiModelProperty(value = "鎸囧浠凤紙鍏冿級", example = "1")
@ExcelColumn(name="鎸囧浠凤紙鍏冿級")
@@ -111,6 +111,7 @@
@ApiModelProperty(value = "鍒嗙被鍔犱环绯绘暟", example = "1")
@ExcelColumn(name="鍒嗙被鍔犱环绯绘暟")
+ @TableField(exist = false)
private BigDecimal cateRatePrice;
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index 77eaca6..115f8bc 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -22,11 +22,11 @@
public class Multifile {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@@ -35,7 +35,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@@ -44,7 +44,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -56,15 +56,15 @@
@ExcelColumn(name="澶囨敞")
private String info;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
private Integer objId;
- @ApiModelProperty(value = "绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬", example = "1")
+ @ApiModelProperty(value = "绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
@ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0鍟嗗搧澶氬浘", example = "1")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0鍟嗗搧澶氬浘")
@ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0鍟嗗搧澶氬浘 1 骞冲彴鍟嗗搧澶氬浘")
private Integer objType;
@@ -75,7 +75,8 @@
@ApiModelProperty(value = "浼佷笟缂栫爜")
@ExcelColumn(name="浼佷笟缂栫爜")
private Integer companyId;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+
+ @ApiModelProperty(value = "鎺掑簭鐮�")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
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 d326bcc..cd0334f 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
@@ -30,10 +30,10 @@
@ApiModelProperty(value = "灞炴��2鍚嶇О")
private String attrSecond;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ApiModelProperty(value = "鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鍥炬爣")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequestParam.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequestParam.java
index 1e8fd74..b15889c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequestParam.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequestParam.java
@@ -17,13 +17,13 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ApiModelProperty(value = "鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(鍏宠仈category琛�)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(鍏宠仈category琛�)")
private Integer categoryId;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsCreateOrUpdateRequest.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsCreateOrUpdateRequest.java
index 7518d37..19a9bb7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsCreateOrUpdateRequest.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsCreateOrUpdateRequest.java
@@ -1,7 +1,5 @@
package com.doumee.dao.business.model.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -25,22 +23,22 @@
@ApiModelProperty(value = "鍚嶇О锛堜笉鍙噸澶嶏級")
private String name;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)")
private Integer categoryId;
- @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)")
private Integer brandId;
- @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級", example = "1")
+ @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級")
private BigDecimal zdPrice;
- @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
+ @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�")
private BigDecimal price;
@ApiModelProperty(value = "鍟嗗搧璇︽儏")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java
index 8a09393..a42e1c3 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java
@@ -25,7 +25,7 @@
@ApiModelProperty(value = "鍚嶇О锛堜笉鍙噸澶嶏級")
private String name;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鍥炬爣")
@@ -34,22 +34,22 @@
@ApiModelProperty(value = "鍥炬爣")
private String imgfullurl;
- @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)")
private Integer categoryId;
- @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)")
private Integer categoryName;
- @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)")
private Integer brandId;
- @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
- private Integer brandName;
+ @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)")
+ private String brandName;
- @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級", example = "1")
+ @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級")
private BigDecimal zdPrice;
- @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
+ @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�")
private BigDecimal price;
@ApiModelProperty(value = "鍟嗗搧璇︽儏")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsParamCreatRequest.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsParamCreatRequest.java
index 518e122..433baa5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsParamCreatRequest.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsParamCreatRequest.java
@@ -17,18 +17,18 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ApiModelProperty(value = "鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "鍏宠仈鍝佺被鍙傛暟缂栫爜锛堝叧鑱攂ase_cate_param琛級", example = "1")
+ @ApiModelProperty(value = "鍏宠仈鍝佺被鍙傛暟缂栫爜锛堝叧鑱攂ase_cate_param琛級")
private Integer pramaId;
@ApiModelProperty(value = "鍙傛暟鍊�")
private String val;
- @ApiModelProperty(value = "鍟嗗搧缂栫爜锛堝叧鑱攂ase_goods琛級", example = "1")
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜锛堝叧鑱攂ase_goods琛級")
private Integer goodsId;
}
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 8e47028..86ee778 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
@@ -48,7 +48,7 @@
*
* @param baseCategory 瀹炰綋瀵硅薄
*/
- void updateById(BaseCategoryRequest baseCategory);
+ void update(BaseCategoryRequest baseCategory);
/**
* 涓婚敭鏇存柊
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 539054a..287a867 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
@@ -67,7 +67,7 @@
*
* @param id 瀹炰綋瀵硅薄
*/
- void updateStatusByIds(Integer id,Integer status);
+ void updateStatusById(Integer id,Integer status);
/**
* 涓婚敭鏇存柊
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 7b3b4f1..9ff21e9 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
@@ -76,7 +76,7 @@
baseCategory2.setShortPinyin(baseCategory.getShortPinyin());
baseCategoryMapper.insert(baseCategory2);
- if (CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
long count = baseCategory.getBaseCategoryRequestParamList().stream().map(s -> s.getName().trim()).distinct().count();
@@ -122,11 +122,11 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
- public void updateById(BaseCategoryRequest baseCategory) {
+ public void update(BaseCategoryRequest baseCategory) {
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if (Objects.nonNull(baseCategory.getId())){
+ if (Objects.isNull(baseCategory.getId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍝佺被涓婚敭缂哄け");
}
@@ -145,9 +145,9 @@
.set(BaseCategory::getName,baseCategory.getName())
.set(BaseCategory::getImgurl,baseCategory.getImgurl())
.set(BaseCategory::getSortnum,baseCategory.getSortnum());
- baseCategoryMapper.update(null,wrapper);
+ baseCategoryMapper.update(null,updateWrapper);
- if (CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
long count = baseCategory.getBaseCategoryRequestParamList().stream().map(s -> s.getName().trim()).distinct().count();
if (baseCategory.getBaseCategoryRequestParamList().size() != count){
@@ -266,7 +266,7 @@
IPage<BaseCategory> baseCategoryIPage = baseCategoryMapper.selectPage(page, queryWrapper);
if (!CollectionUtils.isEmpty(baseCategoryIPage.getRecords())){
- baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgfullurl()));
+ baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgurl()));
}
return PageData.from(baseCategoryIPage);
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 8a62b1f..28dcfe1 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
@@ -168,12 +168,15 @@
wrapper.lambda()
.eq(BaseGoods::getId,baseGoods.getId())
.set(BaseGoods::getName,baseGoods.getName())
- .set(BaseGoods::getName,baseGoods.getName())
- .set(BaseGoods::getName,baseGoods.getName())
- .set(BaseGoods::getName,baseGoods.getName());
+ .set(BaseGoods::getBrandId,baseGoods.getBrandId())
+ .set(BaseGoods::getCategoryId,baseGoods.getCategoryId())
+ .set(BaseGoods::getImgurl,baseGoods.getImgurl())
+ .set(BaseGoods::getPrice,baseGoods.getPrice())
+ .set(BaseGoods::getZdPrice,baseGoods.getZdPrice());
baseGoodsMapper.update(null,wrapper);
- multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",baseGoods.getId()));
+ multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",baseGoods.getId())
+ .eq("OBJ_TYPE",Constants.ONE));
List<Multifile> multifileList = baseGoods.getMultifileList();
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
@@ -217,13 +220,13 @@
if (CollectionUtils.isEmpty(idList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鐘舵�佷笉鑳戒负绌�");
}
- idList.forEach(s->updateStatusByIds(s,status));
+ idList.forEach(s->updateStatusById(s,status));
}
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
- public void updateStatusByIds(Integer id, Integer status) {
+ public void updateStatusById(Integer id, Integer status) {
if (Objects.isNull(status)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鐘舵�佷笉鑳戒负绌�");
@@ -277,7 +280,8 @@
.leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getBaseDataId)
.selectAll(BaseGoods.class)
.selectAs(Brand::getName,BaseGoodsDTO::getBrandName)
- .selectAs(BaseCategory::getSortnum,BaseGoodsDTO::getCategoryName);
+ .selectAs(BaseCategory::getSortnum,BaseGoodsDTO::getCategoryName)
+ .eq(BaseGoods::getId,id);
BaseGoodsDTO baseGoodsDTO = baseGoodsJoinMapper.selectJoinOne(BaseGoodsDTO.class, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
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 d764fea..83aa2a7 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
@@ -45,8 +45,8 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(brandMapper.selectCount(new QueryWrapper<Brand>()
.eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM),"name",brand.getName())
- .and(user.getType().equals(Constants.UserType.COMPANY),
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+ .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
.or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
)
@@ -90,8 +90,8 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(brandMapper.selectCount(new QueryWrapper<Brand>()
.eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM),"name",brand.getName())
- .and(user.getType().equals(Constants.UserType.COMPANY),
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+ .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
.or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
)
--
Gitblit v1.9.3