Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!172

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -96,7 +96,7 @@ public class GoodsMgrController extends BaseApiController {
 		startPage();
 		QueryWrapper<Goods> queryWrapper = new QueryWrapper<Goods>();
 		queryWrapper.lambda().like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), Goods::getTitle, queryParam.getTitle());
-		queryWrapper.lambda().eq(null != queryParam && StringUtils.isNotBlank(queryParam.getGoodsId()), Goods::getGoodsId, queryParam.getGoodsId());
+		queryWrapper.lambda().eq(null != queryParam && StringUtils.isNotBlank(queryParam.getGoodsId()), Goods::getGoodsId, Long.valueOf(queryParam.getGoodsId()));
 		// 成本
 		queryWrapper.lambda().ge(null != queryParam && null != queryParam.getMinCost(), Goods::getCost, queryParam.getMinCost());
 		queryWrapper.lambda().le(null != queryParam && null != queryParam.getMaxCost(), Goods::getCost, queryParam.getMaxCost());
@@ -126,8 +126,8 @@ public class GoodsMgrController extends BaseApiController {
 	    if (StringUtils.isBlank(goodsId)){
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
-		Goods goods = goodsService.getById(goodsId);
-		if(null == goods || null == goods.getGoodsId() || 0 == goods.getGoodsId()) {
+		Goods goods = goodsService.getById(Long.valueOf(goodsId));
+		if(null == goods) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		GoodsVO goodsVo = new GoodsVO();
@@ -207,7 +207,7 @@ public class GoodsMgrController extends BaseApiController {
 		if (null == goodsParam || StringUtils.isBlank(goodsParam.getGoodsId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		Goods oldGoods = goodsService.getById(goodsParam.getGoodsId());
+		Goods oldGoods = goodsService.getById(Long.valueOf(goodsParam.getGoodsId()));
 		if(null == oldGoods || null == oldGoods.getGoodsId()) {
 			return AjaxResult.error("商品'" + oldGoods.getTitle() + "'编辑失败，商品ID异常");
 		}
@@ -262,15 +262,15 @@ public class GoodsMgrController extends BaseApiController {
 	 */
 	@ApiOperation(value = "停用、启用商品", notes = "停用、启用商品")
 	@PostMapping("/status")
-	public AjaxResult goodsStatus(@RequestBody Goods goods) {
-		Long goodsId = goods.getGoodsId();
-		GoodsStatusEnum status = (null != goods && null != goods.getStatus())?goods.getStatus():null;
-		if (null == goodsId || 0 == goodsId
-				|| null == status) {
+	public AjaxResult goodsStatus(@RequestBody JSONObject jsonObject) {
+		String goodsId = jsonObject.getString("goodsId");
+
+		GoodsStatusEnum status = GoodsStatusEnum.getStatusEnum(jsonObject.getString("status"));
+		if (StringUtils.isBlank(goodsId) || null == status) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		try {
-			goodsService.lambdaUpdate().set(Goods::getStatus, goods.getStatus()).eq(Goods::getGoodsId, goodsId).update();
+			goodsService.lambdaUpdate().set(Goods::getStatus, status).eq(Goods::getGoodsId, Long.valueOf(goodsId)).update();
 			// 查询代金券信息
 		} catch (Exception e) {
 			return AjaxResult.error("操作失败");
@@ -291,7 +291,7 @@ public class GoodsMgrController extends BaseApiController {
 	    if (StringUtils.isBlank(goodsId)){
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
-		Goods goods = goodsService.getById(goodsId);
+		Goods goods = goodsService.getById(Long.valueOf(goodsId));
 		if(null == goods || null == goods.getGoodsId() || 0 == goods.getGoodsId()) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}

mp-common/src/main/java/com/qs/mp/common/enums/GoodsStatusEnum.java

@@ -20,6 +20,15 @@ public enum GoodsStatusEnum implements IEnum<String> {
   private final String value;
   private final String desc;
 
+  public static GoodsStatusEnum getStatusEnum(String value) {
+    for (GoodsStatusEnum statusEnum : GoodsStatusEnum.values()) {
+      if (statusEnum.getValue().equals(value)) {
+        return statusEnum;
+      }
+    }
+    return null;
+  }
+
   GoodsStatusEnum(final String value, final String desc) {
     this.value = value;
     this.desc = desc;