From 282f2cb6c4920ac940164f17b22a4d60c2ddb66f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 10:29:55 +0800
Subject: [PATCH] 20210922
---
src/main/java/cc/mrbird/febs/mall/dto/UpMallGoodsDto.java | 12 ++++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 46 +++++++-------
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java | 9 +++
src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsService.java | 5 +
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 19 ++++++
src/main/resources/templates/febs/views/modules/goods/goodsList.html | 58 +++++++-----------
6 files changed, 91 insertions(+), 58 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
index 83fffc1..8e8f1d1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.OssUtils;
import cc.mrbird.febs.mall.dto.AddMallGoodsDto;
+import cc.mrbird.febs.mall.dto.UpMallGoodsDto;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
@@ -89,4 +90,22 @@
public FebsResponse addMallGoods(@RequestBody @Valid AddMallGoodsDto addMallGoodsDto) {
return adminMallGoodsService.addMallGoods(addMallGoodsDto);
}
+
+ /**
+ * 商品-上架
+ */
+ @PostMapping("upMallGoods")
+ @ControllerEndpoint(operation = " 商品-上架", exceptionMessage = "上架失败")
+ public FebsResponse upMallGoods(@RequestBody @Valid UpMallGoodsDto upMallGoodsDto) {
+ return adminMallGoodsService.upMallGoods(upMallGoodsDto);
+ }
+
+ /**
+ * 商品-下架
+ */
+ @PostMapping("downMallGoods")
+ @ControllerEndpoint(operation = " 商品-下架", exceptionMessage = "下架失败")
+ public FebsResponse downMallGoods(@RequestBody @Valid UpMallGoodsDto upMallGoodsDto) {
+ return adminMallGoodsService.downMallGoods(upMallGoodsDto);
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/UpMallGoodsDto.java b/src/main/java/cc/mrbird/febs/mall/dto/UpMallGoodsDto.java
new file mode 100644
index 0000000..c6eeeec
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/UpMallGoodsDto.java
@@ -0,0 +1,12 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "UpMallGoodsDto", description = "参数接收类")
+public class UpMallGoodsDto {
+
+ private Long id;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
index df5c4df..f03c370 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -29,6 +29,15 @@
private Integer isSale;
+ /**
+ * 上架
+ */
+ public static final Integer ISSALE_STATUS_ENABLE = 1;
+ /**
+ * 下架
+ */
+ public static final Integer ISSALE_STATUS_DISABLED = 2;
+
private String originalPrice;
private String presentPrice;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsService.java
index 97df00b..89ea386 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsService.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.AddMallGoodsDto;
+import cc.mrbird.febs.mall.dto.UpMallGoodsDto;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.vo.AdminMallGoodsVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,4 +14,8 @@
IPage<AdminMallGoodsVo> getCategoryListInPage(MallGoods mallGoods, QueryRequest request);
FebsResponse addMallGoods(AddMallGoodsDto addMallGoodsDto);
+
+ FebsResponse upMallGoods(UpMallGoodsDto upMallGoodsDto);
+
+ FebsResponse downMallGoods(UpMallGoodsDto upMallGoodsDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
index 1712fff..b0cd995 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.AddMallGoodsDto;
import cc.mrbird.febs.mall.dto.AddMallGoodsSkuDto;
+import cc.mrbird.febs.mall.dto.UpMallGoodsDto;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
import cc.mrbird.febs.mall.entity.MallGoodsSku;
@@ -107,30 +108,29 @@
return new FebsResponse().success().message("操作成功");
}
+ @Override
+ public FebsResponse upMallGoods(UpMallGoodsDto upMallGoodsDto) {
+ Long id = upMallGoodsDto.getId();
+ MallGoods mallGoods = mallGoodsMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallGoods)){
+ return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
+ }
+ mallGoods.setIsSale(MallGoods.ISSALE_STATUS_ENABLE);
+ mallGoodsMapper.updateById(mallGoods);
+ return new FebsResponse().success();
+ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ @Override
+ public FebsResponse downMallGoods(UpMallGoodsDto upMallGoodsDto) {
+ Long id = upMallGoodsDto.getId();
+ MallGoods mallGoods = mallGoodsMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallGoods)){
+ return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
+ }
+ mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+ mallGoodsMapper.updateById(mallGoods);
+ return new FebsResponse().success();
+ }
}
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index 7b040b9..6ccd99b 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -66,14 +66,14 @@
table.on('tool(userTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
- if (layEvent === 'close') {
- febs.modal.confirm('禁用', '确认禁用该账号？', function () {
- closeAccount(data.id);
+ if (layEvent === 'downGoods') {
+ febs.modal.confirm('下架', '确认下架该商品？', function () {
+ downGoods(data.id);
});
}
- if (layEvent === 'open') {
- febs.modal.confirm('开启', '确认开启该账号？', function () {
- openAccount(data.id);
+ if (layEvent === 'upGoods') {
+ febs.modal.confirm('上架', '确认上架该商品？', function () {
+ downGoods(data.id);
});
}
if (layEvent === 'see') {
@@ -82,15 +82,17 @@
});
}
});
- function closeAccount(id) {
- febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
- febs.alert.success('禁用成功');
+ function downGoods(id) {
+ febs.get(ctx + 'admin/goods/downMallGoods/' + id, null, function () {
+ febs.alert.success('下架成功');
$query.click();
});
}
- function openAccount(id) {
- febs.get(ctx + 'admin/mallMember/openAccount/' + id, null, function () {
- febs.alert.success('开启成功');
+
+
+ function upGoods(id) {
+ febs.get(ctx + 'admin/goods/upMallGoods/' + id, null, function () {
+ febs.alert.success('上架成功');
$query.click();
});
}
@@ -109,17 +111,6 @@
tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
});
- // $add.on('click', function () {
- // febs.modal.open('新增', 'modules/goods/goodsAdd/', {
- // btn: ['提交', '取消'],
- // yes: function (index, layero) {
- // $('#goods-add').find('#submit').trigger('click');
- // },
- // btn2: function () {
- // layer.closeAll();
- // }
- // });
- // });
$add.on('click', function () {
febs.view.tab.change("/modules/goods/goodsAddNew/");
});
@@ -152,18 +143,15 @@
// }
// }, minWidth: 80,align:'center'},
// {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
- // {title: '操作',
- // templet: function (d) {
- // if (d.accountStatus === 1) {
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close" shiro:hasPermission="user:update">禁用</button>'
- //
- // }else{
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="open" shiro:hasPermission="user:update">启用</button>'
- //
- // }
- // },minWidth: 300,align:'center'}
+ {title: '操作',
+ templet: function (d) {
+ if (d.isSale === 1) {
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="downGoods" shiro:hasPermission="user:update">下架</button>'
+ }else{
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="upGoods" shiro:hasPermission="user:update">上架</button>'
+
+ }
+ },minWidth: 300,align:'center'}
]]
});
}
--
Gitblit v1.9.1