From 1bada3da32aa8b29509b7357e5adfe816ac17c72 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 16 Jul 2021 10:29:33 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java
index c8cef2e..87585b9 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java
@@ -1,5 +1,6 @@
package com.xzx.gc.shop.controller;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.xzx.gc.common.constant.CommonEnum;
@@ -23,6 +24,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -53,7 +55,10 @@
@PostMapping(Constants.ADMIN_VIEW_PREFIX+"/score/goods/addGoods.json")
@ApiOperation(value = "商品管理-添加商品", notes = "test: 仅0有正确返回")
public JsonResult<String> addGoods(@RequestBody AddGoodsDto model, HttpServletRequest request) {
-
+ List<ScoreGoodsStyleDto> scoreGoodsStyles = model.getScoreGoodsStyles();
+ if(CollUtil.isEmpty(scoreGoodsStyles)){
+ return JsonResult.failMessage("样式不能为空！");
+ }
model.setCreatedBy(getAdminName(request));
model.setCreatedTime(new Date());
Long scoreGoodsId = goodsService.addGoods(model);
@@ -94,16 +99,17 @@
/**
* 查看商品详情
*/
- @GetMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/viewGoods/{id}")
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/viewGoods.json")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewGoodsVo.class)})
@ApiOperation(value="商品管理-查看商品详情", notes="test: 仅0有正确返回")
- public JsonResult<ViewGoodsVo> viewGoods(@PathVariable long id) {
+ public JsonResult<ViewGoodsVo> viewGoods(@RequestBody ViewGoodsDto viewGoodsDto) {
+ Long id = viewGoodsDto.getId();
ViewGoodsVo viewGoodsVo = goodsService.viewGoods(id);
return JsonResult.success(viewGoodsVo);
}
/**
- * 更新商品分类
+ * 更新商品
* @param model
* @return
*/
@@ -120,6 +126,10 @@
if(ScoreGoods.ISSALE_YES == isSale){
return JsonResult.failMessage("请先下架商品！");
}
+ List<ScoreGoodsStyleDto> scoreGoodsStyles = model.getScoreGoodsStyles();
+ if(CollUtil.isEmpty(scoreGoodsStyles)){
+ return JsonResult.failMessage("样式不能为空！");
+ }
goodsService.updateGoods(model);
OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
.methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("商品管理-更新商品-" + id).build();
--
Gitblit v1.9.1