src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -9,6 +9,7 @@ import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo; import cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo; import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo; import cc.mrbird.febs.mall.vo.AdminMallSalesmansTreeVo; import lombok.RequiredArgsConstructor; @@ -459,4 +460,22 @@ return mallMemberService.memberUpdateSalesman(mallmember); } /** * 地址金额统计列表 */ @GetMapping("addressAmountList") public FebsResponse addressAmountList(MallAddressInfo mallAddressInfo, QueryRequest request) { Map<String, Object> data = getDataTable(mallMemberService.getAddressAmountList(mallAddressInfo, request)); return new FebsResponse().success().data(data); } /** * 地址金额统计列表-省 */ @GetMapping("address/tree") @ControllerEndpoint(exceptionMessage = "地址金额统计列表") public List<AdminMallAddressInfoVo> getAddressTree(){ return mallMemberService.getAddressTree(); } } src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -319,5 +319,14 @@ return FebsUtil.view("modules/mallMember/agentSelect"); } /** * 地址金额统计列表 */ @GetMapping("addressAmountList") @RequiresPermissions("addressAmountList:view") public String addressAmountList() { return FebsUtil.view("modules/mallMember/addressAmountList"); } } src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
@@ -1,13 +1,16 @@ package cc.mrbird.febs.mall.mapper; import cc.mrbird.febs.mall.entity.MallAddressInfo; import cc.mrbird.febs.mall.entity.MallSalesman; import cc.mrbird.febs.mall.vo.AdminAgentSelectVo; import cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo; import cc.mrbird.febs.mall.vo.AdminMallSalesmansTreeVo; 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; import java.math.BigDecimal; import java.util.List; public interface MallSalesmanMapper extends BaseMapper<MallSalesman> { @@ -17,4 +20,12 @@ List<AdminMallSalesmansTreeVo> selectTreeByState( @Param("state") int i); AdminAgentSelectVo agentSelect(@Param("memberId")long id); IPage<AdminMallAddressInfoVo> selectAddressAmountListInPage(Page<AdminMallAddressInfoVo> page, @Param("record")MallAddressInfo mallAddressInfo); BigDecimal selectSumOrderAmountByProvinceAndCity(@Param("province")String province, @Param("city")String city); Integer selectSumOrderCntByProvinceAndCity(@Param("province")String province, @Param("city")String city); List<AdminMallAddressInfoVo> selectProvince(); } src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -110,4 +110,8 @@ List<AdminMallSalesmansTreeVo> getSalesmansTree(); FebsResponse memberUpdateSalesman(MallMember mallmember); IPage<AdminMallAddressInfoVo> getAddressAmountList(MallAddressInfo mallAddressInfo, QueryRequest request); List<AdminMallAddressInfoVo> getAddressTree(); } src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -708,6 +708,30 @@ return new FebsResponse().success(); } @Override public IPage<AdminMallAddressInfoVo> getAddressAmountList(MallAddressInfo mallAddressInfo, QueryRequest request) { Page<AdminMallAddressInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize()); IPage<AdminMallAddressInfoVo> adminMallAddressInfoVoIPage = mallSalesmanMapper.selectAddressAmountListInPage(page, mallAddressInfo); List<AdminMallAddressInfoVo> records = adminMallAddressInfoVoIPage.getRecords(); if(CollUtil.isNotEmpty(records)){ for(AdminMallAddressInfoVo adminMallAddressInfoVo : records){ String province = adminMallAddressInfoVo.getProvince(); String city = adminMallAddressInfoVo.getCity(); BigDecimal sumAmount = mallSalesmanMapper.selectSumOrderAmountByProvinceAndCity(province,city); adminMallAddressInfoVo.setAmount(sumAmount); Integer orderCnt = mallSalesmanMapper.selectSumOrderCntByProvinceAndCity(province,city); adminMallAddressInfoVo.setOrderCnt(orderCnt); } } return adminMallAddressInfoVoIPage; } @Override public List<AdminMallAddressInfoVo> getAddressTree() { return mallSalesmanMapper.selectProvince(); } private String refererIds(String parentId) { boolean flag = false; if (StrUtil.isBlank(parentId)) { src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -462,8 +462,8 @@ OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo); if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) { MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId()); MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId()); if(ObjectUtil.isNotEmpty(expressInfo)){ orderDetailVo.setExpressNo(expressInfo.getExpressNo()); orderDetailVo.setExpressCom(expressInfo.getExpressCom()); } src/main/java/cc/mrbird/febs/mall/vo/AdminMallAddressInfoVo.java
New file @@ -0,0 +1,20 @@ package cc.mrbird.febs.mall.vo; import io.swagger.annotations.ApiModel; import lombok.Data; import java.math.BigDecimal; @Data @ApiModel(value = "AdminMallAddressInfoVo", description = "返回参数类") public class AdminMallAddressInfoVo { //省 private String province; //市 private String city; private Integer orderCnt; private BigDecimal amount; } src/main/resources/mapper/modules/MallSalesmanMapper.xml
@@ -26,4 +26,76 @@ where a.id = #{memberId} </select> <select id="selectAddressAmountListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo"> SELECT a.province, a.city FROM mall_address_info a <where> <if test="record != null" > <if test="record.province != null and record.province != ''"> and a.province = #{record.province} </if> <if test="record.city != null and record.city != ''"> and a.city = #{record.city} </if> </if> </where> group by a.city </select> <select id="selectSumOrderAmountByProvinceAndCity" resultType="java.math.BigDecimal"> select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info where status in (2, 3, 4) and order_type = 1 and address_id in ( select a.id from mall_address_info a <where> <if test="province != null and province != ''"> and a.province = #{province} </if> <if test="city != null and city != ''"> and a.city = #{city} </if> </where> ) </select> <select id="selectSumOrderCntByProvinceAndCity" resultType="java.lang.Integer"> select count(id) from mall_order_info where status in (2, 3, 4) and order_type = 1 and address_id in ( select a.id from mall_address_info a <where> <if test="province != null and province != ''"> and a.province = #{province} </if> <if test="city != null and city != ''"> and a.city = #{city} </if> </where> ) </select> <select id="selectProvince" resultType="cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo"> SELECT a.province FROM mall_address_info a group by a.province </select> </mapper> src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html
New file @@ -0,0 +1,122 @@ <div class="layui-fluid layui-anim febs-anim" id="febs-address-amount-list" 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="address-amount-table-form"> <div class="layui-row"> <div class="layui-col-md10"> <div class="layui-form-item"> <label class="layui-form-label">省：</label> <div class="layui-input-inline"> <select name="province" class="province-select-category" id="provinceSelect"> <option value="">请选择</option> </select> </div> </div> </div> <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-blue-plain table-action" id="query"> <i class="layui-icon"></i> </div> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset"> <i class="layui-icon"></i> </div> </div> </div> </form> <table lay-filter="addressAmountTable" lay-data="{id: 'addressAmountTable'}"></table> </div> </div> </div> </div> </div> <!-- 表格操作栏 start --> <script type="text/html" id="user-option"> <span shiro:lacksPermission="user:view,user:update,user:delete"> <span class="layui-badge-dot febs-bg-orange"></span> 无权限 </span> <a lay-event="edit" shiro:hasPermission="user:update"><i class="layui-icon febs-edit-area febs-blue"></i></a> </script> <style> .layui-form-onswitch { background-color: #5FB878 !important; } </style> <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-address-amount-list'), $query = $view.find('#query'), $reset = $view.find('#reset'), $searchForm = $view.find('form'), sortObject = {field: 'phone', type: null}, tableIns; //(下拉框) $.get(ctx + 'admin/mallMember/address/tree', function (data) { for (var k in data) { $(".province-select-category").append("<option value='" + data[k].province + "'>" + data[k].province + "</option>"); } layui.use('form', function () { var form = layui.form; form.render(); }); }); form.render(); // 表格初始化 initTable(); // 初始化表格操作栏各个按钮功能 table.on('tool(addressAmountTable)', function (obj) { var data = obj.data, layEvent = obj.event; }); // 查询按钮 $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}); }); function initTable() { tableIns = febs.table.init({ elem: $view.find('table'), id: 'addressAmountTable', url: ctx + 'admin/mallMember/addressAmountList', defaultToolbar:[], cols: [[ {field: 'province', title: '省', minWidth: 100,align:'left'}, {field: 'city', title: '市', minWidth: 100,align:'left'}, {field: 'orderCnt', title: '订单数量', minWidth: 100,align:'left'}, {field: 'amount', title: '总金额', minWidth: 100,align:'left'} ]] }); } // 获取查询参数 function getQueryParams() { return { province: $searchForm.find("select[name='province']").val(), // memberName: $searchForm.find('input[name="memberName"]').val().trim(), // name: $searchForm.find('input[name="name"]').val().trim(), // phone: $searchForm.find('input[name="phone"]').val().trim(), // state: $searchForm.find("select[name='state']").val() }; } }) </script> src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
@@ -1,4 +1,4 @@ <div class="layui-fluid layui-anim febs-anim" id="febs-agent-apply-list" lay-title="代理申请列表"> <div class="layui-fluid layui-anim febs-anim" id="febs-agent-apply-list" lay-title="合伙人申请列表"> <div class="layui-row febs-container"> <div class="layui-col-md12"> <div class="layui-card"> @@ -8,16 +8,19 @@ <div class="layui-col-md10"> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">微信昵称</label> <div class="layui-input-inline"> <input type="text" placeholder="微信昵称" name="memberName" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">姓名</label> <div class="layui-input-inline"> <input type="text" placeholder="姓名" name="name" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">电话</label> <div class="layui-input-inline"> <input type="text" placeholder="电话" name="phone" autocomplete="off" class="layui-input"> </div>
