20210922

xiaoyong931011

2021-09-22 78bbf44ed2122e8831ae26f1c48b6f3c0b0ff5af

20210922

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java

@@ -20,6 +20,7 @@
import sun.misc.BASE64Encoder;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -94,18 +95,29 @@
    /**
     * 商品-上架
     */
    @PostMapping("upMallGoods")
    @GetMapping("upMallGoods/{id}")
    @ControllerEndpoint(operation = " 商品-上架", exceptionMessage = "上架失败")
    public FebsResponse upMallGoods(@RequestBody @Valid UpMallGoodsDto upMallGoodsDto) {
        return adminMallGoodsService.upMallGoods(upMallGoodsDto);
    public FebsResponse upMallGoods(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallGoodsService.upMallGoods(id);
    }

    /**
     * 商品-下架
     */
    @PostMapping("downMallGoods")
    @GetMapping("downMallGoods/{id}")
    @ControllerEndpoint(operation = " 商品-下架", exceptionMessage = "下架失败")
    public FebsResponse downMallGoods(@RequestBody @Valid UpMallGoodsDto upMallGoodsDto) {
        return adminMallGoodsService.downMallGoods(upMallGoodsDto);
    public FebsResponse downMallGoods(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallGoodsService.downMallGoods(id);
    }

    /**
     * 商品-删除
     */
    @GetMapping("delMallGoods/{id}")
    @ControllerEndpoint(operation = " 商品-删除", exceptionMessage = "删除失败")
    public FebsResponse delMallGoods(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallGoodsService.delMallGoods(id);
    }


}

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java

@@ -3,16 +3,24 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

@Controller("goodsView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/goods")
@RequiredArgsConstructor
public class ViewMallGoodsController extends BaseController {

    private final IAdminMallGoodsService mallGoodsService;

    /**
     * 商品列表
@@ -43,4 +51,18 @@
    public String goodsAddNew() {
        return FebsUtil.view("modules/goods/goodsAddNew");
    }

    /**
     * 商品-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("detailGoods/{id}")
    @RequiresPermissions("detailGoods:update")
    public String detailGoods(@PathVariable long id, Model model) {
        AdminMailGoodsDetailVo data = mallGoodsService.getMallGoodsInfoById(id);
        model.addAttribute("mailGoodsDetail", data);
        return FebsUtil.view("modules/goods/detailGoods");
    }
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java

@@ -2,6 +2,7 @@

import cc.mrbird.febs.mall.dto.MallGoodsQueryDto;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsVo;
import cc.mrbird.febs.mall.vo.MallGoodsListVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,4 +21,6 @@
    Integer selectMallGoodsCountByGoodsName(@Param("goodsName")String goodsName);

    Integer selectMallGoodsCountByGoodsNo(@Param("goodsNo")String goodsNo);

    AdminMailGoodsDetailVo selectMallGoodsInfoById(@Param("id")long id);
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsSkuMapper.java

@@ -1,7 +1,15 @@
package cc.mrbird.febs.mall.mapper;

import cc.mrbird.febs.mall.entity.MallGoodsSku;
import cc.mrbird.febs.mall.vo.AdminMailGoodsSkuDetailVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface MallGoodsSkuMapper extends BaseMapper<MallGoodsSku> {

    void deleteByGoodsId(@Param("id")Long id);

    List<AdminMailGoodsSkuDetailVo> selectByGoodId(@Param("id")Long id);
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsStyleMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.mall.entity.MallGoodsStyle;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

public interface MallGoodsStyleMapper extends BaseMapper<MallGoodsStyle> {

    void deleteByGoodsId(@Param("id")Long id);

}

 src/main/java/cc/mrbird/febs/mall/service/IAdminMallGoodsService.java

@@ -5,6 +5,7 @@
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.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -15,7 +16,11 @@

    FebsResponse addMallGoods(AddMallGoodsDto addMallGoodsDto);

    FebsResponse upMallGoods(UpMallGoodsDto upMallGoodsDto);
    FebsResponse upMallGoods(Long id);

    FebsResponse downMallGoods(UpMallGoodsDto upMallGoodsDto);
    FebsResponse downMallGoods(Long id);

    FebsResponse delMallGoods(Long id);

    AdminMailGoodsDetailVo getMallGoodsInfoById(long id);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java

@@ -14,6 +14,8 @@
import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper;
import cc.mrbird.febs.mall.mapper.MallGoodsStyleMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.AdminMailGoodsSkuDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -79,7 +81,7 @@
        mallGoods.setCategoryId(addMallGoodsDto.getCategoryId());
        mallGoods.setPresentPrice(addMallGoodsDto.getPresentPrice());
        mallGoods.setIsHot(addMallGoodsDto.getIsHot());
        mallGoods.setIsSale(2);
        mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
        mallGoodsMapper.insert(mallGoods);

        List<AddMallGoodsSkuDto> addMallGoodsSkuDtos = addMallGoodsDto.getAddMallGoodsSkuDtos();
@@ -109,8 +111,7 @@
    }

    @Override
    public FebsResponse upMallGoods(UpMallGoodsDto upMallGoodsDto) {
        Long id = upMallGoodsDto.getId();
    public FebsResponse upMallGoods(Long id) {
        MallGoods mallGoods = mallGoodsMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallGoods)){
            return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
@@ -121,8 +122,7 @@
    }

    @Override
    public FebsResponse downMallGoods(UpMallGoodsDto upMallGoodsDto) {
        Long id = upMallGoodsDto.getId();
    public FebsResponse downMallGoods(Long id) {
        MallGoods mallGoods = mallGoodsMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallGoods)){
            return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
@@ -132,5 +132,30 @@
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse delMallGoods(Long id) {
        MallGoods mallGoods = mallGoodsMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallGoods)){
            return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
        }
        Integer isSale = mallGoods.getIsSale();
        if(MallGoods.ISSALE_STATUS_DISABLED != isSale){
            return new FebsResponse().fail().message("请先下架该商品");
        }

        mallGoodsStyleMapper.deleteByGoodsId(id);
        mallGoodsSkuMapper.deleteByGoodsId(id);
        mallGoodsMapper.deleteById(mallGoods);
        return new FebsResponse().success();
    }

    @Override
    public AdminMailGoodsDetailVo getMallGoodsInfoById(long id) {
        AdminMailGoodsDetailVo adminMailGoodsDetailVo = mallGoodsMapper.selectMallGoodsInfoById(id);
        List<AdminMailGoodsSkuDetailVo> adminMailGoodsSkuDetailVos = mallGoodsSkuMapper.selectByGoodId(id);
        adminMailGoodsDetailVo.setMailGoodsSkuDetailVo(adminMailGoodsSkuDetailVos);
        return adminMailGoodsDetailVo;
    }


}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMailGoodsDetailVo.java

New file
@@ -0,0 +1,37 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

@Data
@ApiModel(value = "AdminMailGoodsDetailVo", description = "信息返回类")
public class AdminMailGoodsDetailVo {

    private Long id;

    private String goodsNo;

    private String goodsName;

    private List<AdminMailGoodsSkuDetailVo> mailGoodsSkuDetailVo;

    private String goodsIntrodution;

    private String unit;

    private String thumb;

    private String goodsDetails;

    private Integer isSale;

    private String originalPrice;

    private String presentPrice;

    private Long categoryId;

    private Integer isHot;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMailGoodsSkuDetailVo.java

New file
@@ -0,0 +1,33 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(value = "AdminMailGoodsSkuDetailVo", description = "信息返回类")
public class AdminMailGoodsSkuDetailVo {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "sku名称")
    private String skuName;

    @ApiModelProperty(value = "sku图片")
    private String skuImage;

    @ApiModelProperty(value = "库存")
    private Integer stock;

    @ApiModelProperty(value = "销量")
    private Integer skuVolume;

    @ApiModelProperty(value = "原价")
    private BigDecimal originalPrice;

    @ApiModelProperty(value = "现价")
    private BigDecimal presentPrice;
}

 src/main/resources/mapper/modules/MallGoodsMapper.xml

@@ -113,4 +113,8 @@
    <select id="selectMallGoodsCountByGoodsNo" resultType="java.lang.Integer">
        select count(id) from mall_goods a where a.goods_no = #{goodsNo}
    </select>

    <select id="selectMallGoodsInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo">
        select * from mall_goods a where a.id = #{id}
    </select>
</mapper>

 src/main/resources/mapper/modules/MallGoodsSkuMapper.xml

@@ -6,4 +6,14 @@
    <select id="selectSkuInfoById" resultType="cc.mrbird.febs.mall.entity.MallGoodsSku">
        select * from mall_goods_sku where id=#{id}
    </select>

    <delete  id="deleteByGoodsId">
        delete from mall_goods_sku where goods_id = #{id}
    </delete>


    <select id="selectByGoodId" resultType="cc.mrbird.febs.mall.vo.AdminMailGoodsSkuDetailVo">
        select * from mall_goods_sku where goods_id = #{id}
    </select>

</mapper>

 src/main/resources/mapper/modules/MallGoodsStyleMapper.xml

New file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallGoodsStyleMapper">

    <delete  id="deleteByGoodsId">
        delete from mall_goods_style where goods_id = #{id}
    </delete>

</mapper>

 src/main/resources/templates/febs/views/modules/goods/detailGoods.html

New file
@@ -0,0 +1,176 @@
<style>
    #goods-detail {
        padding: 20px 25px 25px 0;
    }

    #goods-detail .layui-treeSelect .ztree li a, .ztree li span {
        margin: 0 0 2px 3px !important;
    }
    #goods-detail #data-permission-tree-block {
        border: 1px solid #eee;
        border-radius: 2px;
        padding: 3px 0;
    }
    #user-add .layui-treeSelect .ztree li span.button.switch {
        top: 1px;
        left: 3px;
    }

</style>
<div class="layui-fluid" id="goods-detail">
    <form class="layui-form" action="" lay-filter="goods-detail-form">
        <div class="layui-form-item febs-hide">
            <label class="layui-form-label febs-form-item-require">id：</label>
            <div class="layui-input-block">
                <input type="text" name="id">
            </div>
        </div>
        <div class="layui-row layui-col-space10 layui-form-item">
            <div class="layui-col-lg6">
                <label class="layui-form-label febs-form-item-require">商品名称：</label>
                <div class="layui-input-block">
                    <input type="text" name="goodsName" class="layui-input" readonly>
                </div>
            </div>
            <div class="layui-col-lg6">
                <label class="layui-form-label febs-form-item-require">商品编号：</label>
                <div class="layui-input-block">
                    <input type="text" name="goodsNo" class="layui-input" readonly>
                </div>
            </div>
        </div><div class="layui-row layui-col-space10 layui-form-item">
        <div class="layui-col-lg6">
            <label class="layui-form-label febs-form-item-require">所属分类：</label>
            <div class="layui-input-block">
                <select name="categoryId"
                        lay-verify="required"
                        xm-select-direction="down"
                        xm-select="user-add-goods"
                        xm-select-skin="default">
                </select>
            </div>
        </div>
        <div class="layui-col-lg6">
            <label class="layui-form-label febs-form-item-require">单位：</label>
            <div class="layui-input-block">
                <input type="text" name="unit" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
            </div>
        </div>
    </div>
        <div class="layui-row layui-col-space10 layui-form-item">
            <div class="layui-col-lg6">
                <label class="layui-form-label febs-form-item-require">原价：</label>
                <div class="layui-input-block">
                    <input type="text" name="originalPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-col-lg6">
                <label class="layui-form-label febs-form-item-require">现价：</label>
                <div class="layui-input-block">
                    <input type="text" name="presentPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">商品介绍：</label>
            <div class="layui-input-block">
                <input type="text" name="goodsIntrodution" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-row layui-col-space10 layui-form-item">
            <div class="layui-col-lg6">
                <label class="layui-form-label">规格：</label>
                <div class="layui-input-block">
                    <input type="text" name="addMallGoodsSkuDtos" autocomplete="off" class="layui-input" id="attrName">
                </div>
            </div>
            <div class="layui-col-lg6">
                <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" id="test3" >添加</button>
            </div>
        </div>
        <div id="attrWrap"></div>
        <div class="layui-form-item">
            <label class="layui-form-label">缩略图链接：</label>
            <div class="layui-input-block">
                <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">商品详情：</label>
            <div class="layui-input-block">
                <textarea id="lay_edit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>
            </div>
        </div>
        <div class="layui-row layui-col-space10 layui-form-item">
            <div class="layui-col-lg6">
                <label class="layui-form-label">是否热卖：</label>
                <div class="layui-input-block">
                    <input type="radio" name="isHot" value="1" title="是" >
                    <input type="radio" name="isHot" value="2" title="否" checked="">
                </div>
            </div>
        </div>
    </form>
</div>

<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
        var $ = layui.$,
            febs = layui.febs,
            layer = layui.layer,
            formSelects = layui.formSelects,
            treeSelect = layui.treeSelect,
            form = layui.form,
            eleTree = layui.eleTree,
            mailGoodsDetail = [[${mailGoodsDetail}]],
            $view = $('#goods-detail'),
            validate = layui.validate,
            _deptTree;

        form.render();

        formSelects.config('user-add-goods', {
            searchUrl: ctx + 'admin/goodsCategory/categorys',
            response: {
                statusCode: 200
            },
            beforeSuccess: function (id, url, searchVal, result) {
                var data = result.data;
                var tranData = [];
                for (var i = 0; i < data.length; i++) {
                    tranData.push({
                        name: data[i].name,
                        value: data[i].id
                    })
                }
                result.data = tranData;
                return result;
            },
            success: function () {
                // formSelects.value('user-add-goods', result.id);
            },
            error: function (id, url, searchVal, err) {
                console.error(err);
                febs.alert.error('获取分类列表失败');
            }
        });

        initUserValue();

        function initUserValue() {
            form.val("goods-detail-form", {
                "id": mailGoodsDetail.id,
                "goodsNo": mailGoodsDetail.goodsNo,
                "categoryId": mailGoodsDetail.categoryId,
                "unit": mailGoodsDetail.unit,
                "originalPrice": mailGoodsDetail.originalPrice,
                "presentPrice": mailGoodsDetail.presentPrice,
                "goodsIntrodution": mailGoodsDetail.goodsIntrodution,
                "thumb": mailGoodsDetail.thumb,
                "goodsDetails": mailGoodsDetail.goodsDetails,
                "isHot": mailGoodsDetail.isHot,
                "goodsName": mailGoodsDetail.goodsName
            });
        }
    });
</script>

 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html

@@ -24,6 +24,7 @@
                                    <label class="layui-form-label febs-form-item-require">所属分类：</label>
                                    <div class="layui-input-block">
                                        <select name="categoryId"
                                                value="categoryId"
                                                lay-verify="required"
                                                xm-select-direction="down"
                                                xm-select="user-add-goods"
@@ -117,7 +118,7 @@
</div>
<!-- 表格操作栏 end -->
<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate','layedit','upload'], function () {
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','dropdown', 'laydate','layedit','upload'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            layer = layui.layer,
@@ -154,10 +155,11 @@
                    })
                }
                result.data = tranData;
                console.log(result);
                return result;
            },
            success: function () {
                // formSelects.value('user-add-goods', result.id);
                formSelects.value('user-add-goods', result.id);
            },
            error: function (id, url, searchVal, err) {
                console.error(err);

 src/main/resources/templates/febs/views/modules/goods/goodsList.html

@@ -73,11 +73,16 @@
            }
            if (layEvent === 'upGoods') {
                febs.modal.confirm('上架', '确认上架该商品？', function () {
                    downGoods(data.id);
                    upGoods(data.id);
                });
            }
            if (layEvent === 'see') {
                febs.modal.open( '个人信息', 'modules/mallMember/detail/' + data.id, {
            if (layEvent === 'delGoods') {
                febs.modal.confirm('删除', '确认删除该商品？', function () {
                    delGoods(data.id);
                });
            }
            if (layEvent === 'detailGoods') {
                febs.modal.open( '商品详情', 'modules/goods/detailGoods/' + data.id, {
                    maxmin: true,
                });
            }
@@ -88,15 +93,18 @@
                $query.click();
            });
        }


        function delGoods(id) {
            febs.get(ctx + 'admin/goods/delMallGoods/' + id, null, function () {
                febs.alert.success('删除成功');
                $query.click();
            });
        }
        function upGoods(id) {
            febs.get(ctx + 'admin/goods/upMallGoods/' + id, null, function () {
                febs.alert.success('上架成功');
                $query.click();
            });
        }


        // 查询按钮
        $query.on('click', function () {
@@ -147,8 +155,11 @@
                        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>'
                                + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detailGoods" 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>'
                                + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delGoods" shiro:hasPermission="user:update">删除</button>'
                                + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateGoods" shiro:hasPermission="user:update">编辑</button>'

                            }
                        },minWidth: 300,align:'center'}
@@ -159,7 +170,7 @@
        // 获取查询参数
        function getQueryParams() {
            return {
                name: $searchForm.find('input[name="goodsName"]').val().trim(),
                goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
            };
        }