xiaoyong931011
2023-02-22 69b2dfc245c5b761db44b70b1653c3b4d97f1564
商品排序
2 files modified
16 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java 8 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsList.html 8 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -389,6 +389,10 @@
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
        MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
        if(ObjectUtil.isEmpty(mallGoodsSku)){
            return new FebsResponse().fail().message("退款失败,请联系客服人员");
        }
        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, 3);
        if(CollUtil.isEmpty(mallRefundEntities)){
            return new FebsResponse().fail().message("退款失败,请联系客服人员");
@@ -429,8 +433,6 @@
                mallGoods.setStock(mallGoods.getStock() + mallOrderItem.getCnt());
                mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
                mallGoodsMapper.updateById(mallGoods);
                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
                mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
                mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
                mallGoodsSkuMapper.updateById(mallGoodsSku);
@@ -471,7 +473,7 @@
                mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
                mallGoodsMapper.updateById(mallGoods);
                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
//                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
                mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
                mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
                mallGoodsSkuMapper.updateById(mallGoodsSku);
src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -28,7 +28,7 @@
                            </div>
                        </div>
                    </form>
                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
                    <table lay-filter="goodsListTable" lay-data="{id: 'goodsListTable'}"></table>
                    <style type="text/css">
                        .layui-table-cell{
                            text-align:center;
@@ -104,7 +104,7 @@
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            sortObject = {field: 'isSale', type: 'asc'},
            tableIns;
        form.render();
@@ -115,7 +115,7 @@
        initTable();
        // 初始化表格操作栏各个按钮功能
        table.on('tool(userTable)', function (obj) {
        table.on('tool(goodsListTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'downGoods') {
@@ -227,7 +227,7 @@
        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'userTable',
                id: 'goodsListTable',
                url: ctx + 'admin/goods/goodsList?goodsType=1',
                cols: [[
                    {field: 'goodsNo', title: '商品编号', minWidth: 100,align:'left'},