Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-24 9f0d686c76af97ab2ce2102783d0bc02fa56cb41

Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

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

@@ -4,9 +4,7 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
@@ -108,6 +106,47 @@
        return adminMallOrderService.refundConfirm(id);
    }

    /**
     * 订单退款地址-列表
     * @param mallOrderRefundAddressDto
     * @param request
     * @return
     */
    @GetMapping("addressList")
    public FebsResponse addressList(MallOrderRefundAddressDto mallOrderRefundAddressDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminMallOrderService.getMallOrderRefundAddressInPage(mallOrderRefundAddressDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单退款地址-修改
     */
    @PostMapping("addressUpdate")
    @ControllerEndpoint(operation = "订单退款地址-修改", exceptionMessage = "操作失败")
    public FebsResponse addressUpdate(@Valid AddressUpdateDto addressUpdateDto) {
        return adminMallOrderService.addressUpdate(addressUpdateDto);
    }

    /**
     * 订单退款地址-删除
     * @param id
     * @return
     */
    @GetMapping("deleteAddress/{id}")
    @ControllerEndpoint(operation = "订单退款地址-删除", exceptionMessage = "操作失败")
    public FebsResponse deleteAddress(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.deleteAddress(id);
    }

    /**
     * 订单退款地址-新增
     */
    @PostMapping("addAddress")
    @ControllerEndpoint(operation = "订单退款地址-新增", exceptionMessage = "操作失败")
    public FebsResponse addAddress(@Valid AddAddressDto addAddressDto) {
        return adminMallOrderService.addAddress(addAddressDto);
    }





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

@@ -4,10 +4,7 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import cc.mrbird.febs.mall.vo.AdminOrderDetailVo;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -88,4 +85,39 @@
        return FebsUtil.view("modules/order/Refunding");
    }

    /**
     * 退款地址列表
     * @return
     */
    @GetMapping("refundAddress")
    @RequiresPermissions("refundAddress:view")
    public String refundAddress() {
        return FebsUtil.view("modules/order/refundAddress");
    }


    /**
     * 退款地址-新增
     * @return
     */
    @GetMapping("addAddress")
    @RequiresPermissions("addAddress:add")
    public String addAddress() {
        return FebsUtil.view("modules/order/addAddress");
    }

    /**
     * 退款地址-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("updateAddress/{id}")
    @RequiresPermissions("updateAddress:update")
    public String updateAddress(@PathVariable long id, Model model) {
        AdminMallOrderRefundAddressVo data = adminMallOrderService.getMallOrderRefundAddressInfoById(id);
        model.addAttribute("addressInfo", data);
        return FebsUtil.view("modules/order/updateAddress");
    }

}

 src/main/java/cc/mrbird/febs/mall/dto/AddAddressDto.java

New file
@@ -0,0 +1,15 @@
package cc.mrbird.febs.mall.dto;

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

@Data
@ApiModel(value = "AddAddressDto", description = "地址接收参数类")
public class AddAddressDto {

    private String name;

    private String phone;

    private String address;
}

 src/main/java/cc/mrbird/febs/mall/dto/AddressUpdateDto.java

New file
@@ -0,0 +1,17 @@
package cc.mrbird.febs.mall.dto;

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

@Data
@ApiModel(value = "AddressUpdateDto", description = "地址接收参数类")
public class AddressUpdateDto {

    private Long id;

    private String name;

    private String phone;

    private String address;
}

 src/main/java/cc/mrbird/febs/mall/dto/MallOrderRefundAddressDto.java

New file
@@ -0,0 +1,9 @@
package cc.mrbird.febs.mall.dto;

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

@Data
@ApiModel(value = "MallOrderRefundAddressDto", description = "参数接收类")
public class MallOrderRefundAddressDto {
}

 src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefundAddress.java

New file
@@ -0,0 +1,16 @@
package cc.mrbird.febs.mall.entity;

import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@Data
@TableName("mall_order_refund_address")
public class MallOrderRefundAddress extends BaseEntity {

    private  String name;

    private String phone;

    private String address;
}

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

New file
@@ -0,0 +1,17 @@
package cc.mrbird.febs.mall.mapper;

import cc.mrbird.febs.mall.dto.MallOrderRefundAddressDto;
import cc.mrbird.febs.mall.entity.MallOrderRefundAddress;
import cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;

public interface MallOrderRefundAddressMapper extends BaseMapper<MallOrderRefundAddress> {

    IPage<AdminMallOrderRefundAddressVo> getMallOrderRefundAddressInPage(Page<AdminMallOrderRefundAddressVo> page,
                                                                         @Param("record") MallOrderRefundAddressDto mallOrderRefundAddressDto);

    AdminMallOrderRefundAddressVo getMallOrderRefundAddressInfoById(@Param("id")long id);
}

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

@@ -2,9 +2,7 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import cc.mrbird.febs.mall.vo.*;
@@ -30,4 +28,14 @@
    FebsResponse disagreeRefund(Long id);

    FebsResponse refundConfirm(Long id);

    IPage<AdminMallOrderRefundAddressVo> getMallOrderRefundAddressInPage(MallOrderRefundAddressDto mallOrderRefundAddressDto, QueryRequest request);

    AdminMallOrderRefundAddressVo getMallOrderRefundAddressInfoById(long id);

    FebsResponse addressUpdate(AddressUpdateDto addressUpdateDto);

    FebsResponse deleteAddress(Long id);

    FebsResponse addAddress(AddAddressDto addAddressDto);
}

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

@@ -2,9 +2,7 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
@@ -36,6 +34,8 @@
    private final MallOrderRefundMapper mallOrderRefundMapper;

    private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;

    private final MallOrderRefundAddressMapper mallOrderRefundAddressMapper;

    private final MallMoneyFlowMapper mallMoneyFlowMapper;

@@ -191,5 +191,45 @@
        return new FebsResponse().success();
    }

    @Override
    public IPage<AdminMallOrderRefundAddressVo> getMallOrderRefundAddressInPage(MallOrderRefundAddressDto mallOrderRefundAddressDto, QueryRequest request) {
        Page<AdminMallOrderRefundAddressVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallOrderRefundAddressVo> adminMallOrderRefundAddressVos = mallOrderRefundAddressMapper.getMallOrderRefundAddressInPage(page, mallOrderRefundAddressDto);
        return adminMallOrderRefundAddressVos;
    }

    @Override
    public AdminMallOrderRefundAddressVo getMallOrderRefundAddressInfoById(long id) {
        AdminMallOrderRefundAddressVo AdminMallOrderRefundAddressVo = mallOrderRefundAddressMapper.getMallOrderRefundAddressInfoById(id);
        return AdminMallOrderRefundAddressVo;
    }

    @Override
    public FebsResponse addressUpdate(AddressUpdateDto addressUpdateDto) {
        Long id = addressUpdateDto.getId();
        MallOrderRefundAddress mallOrderRefundAddress = mallOrderRefundAddressMapper.selectById(id);
        mallOrderRefundAddress.setName(addressUpdateDto.getName());
        mallOrderRefundAddress.setPhone(addressUpdateDto.getPhone());
        mallOrderRefundAddress.setAddress(addressUpdateDto.getAddress());
        mallOrderRefundAddressMapper.updateById(mallOrderRefundAddress);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse deleteAddress(Long id) {
        mallOrderRefundAddressMapper.deleteById(id);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse addAddress(AddAddressDto addAddressDto) {
        MallOrderRefundAddress mallOrderRefundAddress = new MallOrderRefundAddress();
        mallOrderRefundAddress.setName(addAddressDto.getName());
        mallOrderRefundAddress.setPhone(addAddressDto.getPhone());
        mallOrderRefundAddress.setAddress(addAddressDto.getAddress());
        mallOrderRefundAddressMapper.insert(mallOrderRefundAddress);
        return new FebsResponse().success();
    }


}

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

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

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

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

    private Long id;

    private  String name;

    private String phone;

    private String address;
}

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

New file
@@ -0,0 +1,17 @@
<?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.MallOrderRefundAddressMapper">

    <select id="getMallOrderRefundAddressInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo">
        select *
        from mall_order_refund_address a
        order by a.created_time desc
    </select>

    <select id="getMallOrderRefundAddressInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo">
        select *
        from mall_order_refund_address a where a.id = #{id}
        order by a.created_time desc
    </select>

</mapper>

 src/main/resources/templates/febs/views/modules/order/addAddress.html

New file
@@ -0,0 +1,75 @@
<style>
    #refund-address-add {
        padding: 20px 25px 25px 0;
    }

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

</style>
<div class="layui-fluid" id="refund-address-add">
    <form class="layui-form" action="" lay-filter="refund-address-add-form">
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">联系人：</label>
            <div class="layui-input-block">
                <input type="text" name="name" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">联系电话：</label>
            <div class="layui-input-block">
                <input type="text" name="phone" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">地址：</label>
            <div class="layui-input-block">
                <input type="text" name="address" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <button class="layui-btn" lay-submit="" lay-filter="refund-address-add-form-submit" id="submit"></button>
        </div>
    </form>
</div>

<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate'], function () {
        var $ = layui.$,
            febs = layui.febs,
            layer = layui.layer,
            formSelects = layui.formSelects,
            treeSelect = layui.treeSelect,
            form = layui.form,
            laydate = layui.laydate,
            eleTree = layui.eleTree,
            $view = $('#refund-address-add'),
            validate = layui.validate;

        form.render();
        laydate.render({
            elem: '#febs-form-group-date'
        });

        formSelects.render();

        form.on('submit(refund-address-add-form-submit)', function (data) {
            febs.post(ctx + 'admin/order/addAddress', data.field, function () {
                layer.closeAll();
                febs.alert.success('新增成功');
                $('#febs-order-refund-address').find('#reset').click();
            });
            return false;
        });
    });
</script>

 src/main/resources/templates/febs/views/modules/order/refundAddress.html

New file
@@ -0,0 +1,127 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-order-refund-address" lay-title="退款地址列表">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-form-item">
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">
                                    新增
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="orderRefundAddressTable" lay-data="{id: 'orderRefundAddressTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-order-refund-address'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(orderRefundAddressTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'update') {
                febs.modal.open('地址编辑', 'modules/order/updateAddress/' + data.id, {
                    btn: ['确认', '取消'],
                    yes: function (index, layero) {
                        $('#address-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'delete') {
                febs.modal.confirm('删除', '确认删除地址？', function () {
                    deleteAddress(data.id);
                });
            }
        });

        function deleteAddress(id) {
            febs.get(ctx + 'admin/order/deleteAddress/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }

        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        $add.on('click', function () {
            febs.modal.open('新增', 'modules/order/addAddress/', {
                btn: ['提交', '取消'],
                yes: function (index, layero) {
                    $('#refund-address-add').find('#submit').trigger('click');
                },
                btn2: function () {
                    layer.closeAll();
                }
            });
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'orderRefundAddressTable',
                url: ctx + 'admin/order/addressList',
                cols: [[
                    {field: 'name', title: '联系人', minWidth: 150,align:'left'},
                    {field: 'phone', title: '联系电话', minWidth: 150,align:'left'},
                    {field: 'address', title: '地址', minWidth: 150,align:'left'},
                    {title: '操作',
                        templet: function (d) {
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="update" shiro:hasPermission="user:update">编辑</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delete" shiro:hasPermission="user:update">删除</button>'
                        },minWidth: 300,align:'center'}
                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {
            };
        }

    })
</script>

 src/main/resources/templates/febs/views/modules/order/updateAddress.html

New file
@@ -0,0 +1,91 @@
<style>
    #address-update {
        padding: 20px 25px 25px 0;
    }

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

</style>
<div class="layui-fluid" id="address-update">
    <form class="layui-form" action="" lay-filter="address-update-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-form-item">
            <label class="layui-form-label febs-form-item-require">联系人：</label>
            <div class="layui-input-block">
                <input type="text" name="name"
                       autocomplete="off" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">联系方式：</label>
            <div class="layui-input-block">
                <input type="text" name="phone"
                       autocomplete="off" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">地址：</label>
            <div class="layui-input-block">
                <input type="text" name="address"
                       autocomplete="off" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <button class="layui-btn" lay-submit="" lay-filter="address-update-form-submit" id="submit"></button>
        </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,
            addressInfo = [[${addressInfo}]],
            $view = $('#address-update'),
            validate = layui.validate,
            _deptTree;

        form.render();

        initUserValue();

        function initUserValue() {
            form.val("address-update-form", {
                "id": addressInfo.id,
                "name": addressInfo.name,
                "phone": addressInfo.phone,
                "address": addressInfo.address
            });
        }

        form.on('submit(address-update-form-submit)', function (data) {
            febs.post(ctx + 'admin/order/addressUpdate', data.field, function () {
                layer.closeAll();
                febs.alert.success('操作成功');
                $('#febs-order-refund-address').find('#reset').click();
            });
            return false;
        });
    });
</script>