diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index 8abc533c4..5e817efa2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -198,24 +198,57 @@ public class WxBillController extends BaseController { return billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize); } + //###### 待切换 ####################### +// @ApiOperation("分类查询账单") +// @GetMapping("listBill") +// public ResultData listBill(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue, Integer pageNum, Integer pageSize) { +// if (null == billTypeValue) { +// return new ResultData(Result.ERROR,"请选择分类"); +// } +// EnumBillAllType btype; +// if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { +// btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; +// }else { +// btype = EnumBillAllType.getEnum(billTypeValue); +// if (null == btype) { +// return new ResultData(Result.ERROR,"分类非法"); +// } +// } +// wxMerchant.setId(this.getLoginBUser().getMerchantId()); +// wxMerchant.updateTenantInfo(getTenantInfo()); +// return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); +// } + @ApiOperation("分类查询账单") @GetMapping("listBill") - public ResultData listBill(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue, Integer pageNum, Integer pageSize) { - if (null == billTypeValue) { - return new ResultData(Result.ERROR,"请选择分类"); - } - EnumBillAllType btype; - if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { - btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; - }else { - btype = EnumBillAllType.getEnum(billTypeValue); - if (null == btype) { - return new ResultData(Result.ERROR,"分类非法"); - } - } - wxMerchant.setId(this.getLoginBUser().getMerchantId()); - wxMerchant.updateTenantInfo(getTenantInfo()); - return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); + public ResultData listBill(@RequestBody WxBillAll wxBillAll) { + + if(StringUtils.isEmpty(wxBillAll.getTenantId())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空"); + } + if(wxBillAll.getMerchantId()==null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"merchantId不能为空"); + } + if(wxBillAll.getBillTypeValue()==null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"billTypeValue不能为空"); + } + WxMerchant wxMerchant = wxMerchantService.getById(wxBillAll.getMerchantId()); + if(wxMerchant==null){ + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + if(wxMerchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())){ + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); + } + if(!StringUtils.isEmpty(wxBillAll.getStarttime()) && StringUtils.isEmpty(wxBillAll.getEndtime())){ + logger.info("开始时间和结束时间要同时存在或不存在"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); + } + if(StringUtils.isEmpty(wxBillAll.getStarttime()) && !StringUtils.isEmpty(wxBillAll.getEndtime())){ + logger.info("开始时间和结束时间要同时存在或不存在"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在"); + } + + return wxBillAllService.pageListBill(wxBillAll,wxMerchant,true,true,true); }