Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

昨天 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21

 server/admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -8,6 +8,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.dto.MemberListQueryDTO;
import com.doumee.dao.vo.MemberDetailVO;
import com.doumee.dao.vo.MemberListVO;
import com.doumee.service.business.MemberService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
@@ -84,23 +87,6 @@
    @RequiresPermissions("business:member:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
        List<Member> memberList = memberService.findPage(pageWrap).getRecords();
        if(CollectionUtils.isNotEmpty(memberList)){
            for (Member m:memberList) {
                m.setAmountYuan(Objects.nonNull(m.getAmount())&&m.getAmount()> Constants.ZERO? new BigDecimal(m.getAmount()+"").divide(new BigDecimal("100"),2,BigDecimal.ROUND_UP):BigDecimal.ZERO);
                List<String> identityInfo = new ArrayList<>();
                if(Constants.equalsInteger(m.getWorkerIdentity(),Constants.TWO)){
                    identityInfo.add("工人");
                }
                if(Constants.equalsInteger(m.getDriverIdentity(),Constants.TWO)){
                    identityInfo.add("司机");
                }
                if(Constants.equalsInteger(m.getChefIdentity(),Constants.TWO)){
                    identityInfo.add("供餐");
                }
                m.setIdentityApplyInfo(StringUtils.join(identityInfo,","));
                m.setIdentityInfo("发单方" + (StringUtils.isNotBlank(m.getIdentityApplyInfo())?" | 接单方":""));
            }
        }
        ExcelExporter.build(Member.class).export(memberList, "会员信息表", response);
    }

@@ -110,4 +96,26 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(memberService.findById(id));
    }

    @ApiOperation("会员列表分页查询")
    @PostMapping("/list/page")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberListVO>> findMemberListPage(@RequestBody PageWrap<MemberListQueryDTO> pageWrap) {
        return ApiResponse.success(memberService.findMemberListPage(pageWrap));
    }

    @ApiOperation("会员列表导出Excel")
    @PostMapping("/list/exportExcel")
    @RequiresPermissions("business:member:exportExcel")
    public void exportMemberListExcel(@RequestBody PageWrap<MemberListQueryDTO> pageWrap, HttpServletResponse response) {
        List<MemberListVO> list = memberService.findMemberListPage(pageWrap).getRecords();
        ExcelExporter.build(MemberListVO.class).export(list, "会员列表", response);
    }

    @ApiOperation("会员详情查询")
    @GetMapping("/detail/{id}")
    @RequiresPermissions("business:member:query")
    public ApiResponse<MemberDetailVO> findMemberDetail(@PathVariable Integer id) {
        return ApiResponse.success(memberService.findMemberDetail(id));
    }
}