Commit e3a5f508 authored by libin's avatar libin

会员订单列表

parent 5f1fb88b
...@@ -69,6 +69,6 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz, ...@@ -69,6 +69,6 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public void exportMemberOrders(@RequestBody MemberOrderFindDTO memberOrderFindDTO, HttpServletResponse response){ public void exportMemberOrders(@RequestBody MemberOrderFindDTO memberOrderFindDTO, HttpServletResponse response){
orderMemberService.exportMemberOrderData(memberOrderFindDTO);
} }
} }
\ No newline at end of file
package com.xxfc.platform.order.service; package com.xxfc.platform.order.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import com.github.wxiaoqi.security.admin.bo.UserBo; import com.github.wxiaoqi.security.admin.bo.UserBo;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel; import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import com.github.wxiaoqi.security.admin.feign.UserFeign; import com.github.wxiaoqi.security.admin.feign.UserFeign;
...@@ -189,6 +191,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz ...@@ -189,6 +191,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
public void exportMemberOrderData(MemberOrderFindDTO memberOrderFindDTO){ public void exportMemberOrderData(MemberOrderFindDTO memberOrderFindDTO){
MemberOrderPageVo memberOrderPageVo = listMemberOrderPage(memberOrderFindDTO); MemberOrderPageVo memberOrderPageVo = listMemberOrderPage(memberOrderFindDTO);
List<MemberOrderBo> memberOrderBoList = memberOrderPageVo.getMemberOrderPage().getData(); List<MemberOrderBo> memberOrderBoList = memberOrderPageVo.getMemberOrderPage().getData();
ExcelWriter excelWriter = ExcelUtil.getWriter();
} }
...@@ -197,10 +200,10 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz ...@@ -197,10 +200,10 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
MemberOrderStatisticsBo memberOrderStatisticsBo = new MemberOrderStatisticsBo(); MemberOrderStatisticsBo memberOrderStatisticsBo = new MemberOrderStatisticsBo();
List<Integer> userIds = new ArrayList<>(); List<Integer> userIds = new ArrayList<>();
PageDataVO<MemberOrderBo> pageDataVO= new PageDataVO<>(); PageDataVO<MemberOrderBo> pageDataVO= new PageDataVO<>();
pageDataVO = new PageDataVO<>();
pageDataVO.setPageNum(memberOrderFindDTO.getPage()); pageDataVO.setPageNum(memberOrderFindDTO.getPage());
pageDataVO.setPageSize(memberOrderFindDTO.getLimit()); pageDataVO.setPageSize(memberOrderFindDTO.getLimit());
pageDataVO.setData(Collections.EMPTY_LIST); pageDataVO.setData(Collections.EMPTY_LIST);
boolean isNoNullUserName = StringUtils.isNotEmpty(memberOrderFindDTO.getName()) && memberOrderFindDTO.getName().trim().length() > 0; boolean isNoNullUserName = StringUtils.isNotEmpty(memberOrderFindDTO.getName()) && memberOrderFindDTO.getName().trim().length() > 0;
boolean isNoNullPhone = StringUtils.isNotEmpty(memberOrderFindDTO.getPhone()) && memberOrderFindDTO.getPhone().trim().length() > 0; boolean isNoNullPhone = StringUtils.isNotEmpty(memberOrderFindDTO.getPhone()) && memberOrderFindDTO.getPhone().trim().length() > 0;
boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(memberOrderFindDTO.getPhone()) && memberOrderFindDTO.getPhone().trim().length() > 0; boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(memberOrderFindDTO.getPhone()) && memberOrderFindDTO.getPhone().trim().length() > 0;
...@@ -217,6 +220,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz ...@@ -217,6 +220,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
List<MemberOrderBo> baseOrders = baseOrderBiz.findMemberOrders(memberOrderFindDTO); List<MemberOrderBo> baseOrders = baseOrderBiz.findMemberOrders(memberOrderFindDTO);
if (CollectionUtils.isEmpty(baseOrders)){ if (CollectionUtils.isEmpty(baseOrders)){
memberOrderPageVo.setMemberOrderStatisticsBo(memberOrderStatisticsBo); memberOrderPageVo.setMemberOrderStatisticsBo(memberOrderStatisticsBo);
memberOrderPageVo.setMemberOrderPage(pageDataVO);
return memberOrderPageVo; return memberOrderPageVo;
} }
memberOrderStatisticsBo = getMemberOrderStatisticsBo(baseOrders); memberOrderStatisticsBo = getMemberOrderStatisticsBo(baseOrders);
...@@ -230,6 +234,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz ...@@ -230,6 +234,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
memberOrderBoList = pageDataVO.getData(); memberOrderBoList = pageDataVO.getData();
if (CollectionUtils.isEmpty(memberOrderBoList)){ if (CollectionUtils.isEmpty(memberOrderBoList)){
memberOrderPageVo.setMemberOrderStatisticsBo(memberOrderStatisticsBo); memberOrderPageVo.setMemberOrderStatisticsBo(memberOrderStatisticsBo);
memberOrderPageVo.setMemberOrderPage(pageDataVO);
return memberOrderPageVo; return memberOrderPageVo;
} }
}else { }else {
...@@ -295,7 +300,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz ...@@ -295,7 +300,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
return memberOrderStatisticsBo; return memberOrderStatisticsBo;
} }
private enum levelEnum{ private enum levelEnum{
DIAMOND(3,"石会员"), DIAMOND(3,"石会员"),
GOLD(2,"黄金会员"), GOLD(2,"黄金会员"),
GENERAL(1,"普通会员"); GENERAL(1,"普通会员");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment