| @@ -256,9 +256,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return new ResultData(Result.ERROR,"请选择分类"); | return new ResultData(Result.ERROR,"请选择分类"); | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(getBillList(wxMerchant, btype, null, pageNum, pageSize)); | return new ResultData(getBillList(wxMerchant, btype, null, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -271,9 +276,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return new ResultData(Result.ERROR,"请选择分类"); | return new ResultData(Result.ERROR,"请选择分类"); | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(getBillList(wxMerchant, btype, getNearBillBeforeDays(), pageNum, pageSize)); | return new ResultData(getBillList(wxMerchant, btype, getNearBillBeforeDays(), pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -303,9 +313,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return ; | return ; | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| } | |||||
| } | } | ||||
| PageInfo page = getBillList(wxMerchant, btype, null, 1, 10000); | PageInfo page = getBillList(wxMerchant, btype, null, 1, 10000); | ||||
| if (null == page) { | if (null == page) { | ||||
| @@ -320,9 +335,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return ; | return ; | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| } | |||||
| } | } | ||||
| PageInfo page = getBillList(wxMerchant, btype, getNearBillBeforeDays(), 1, 10000); | PageInfo page = getBillList(wxMerchant, btype, getNearBillBeforeDays(), 1, 10000); | ||||
| if (null == page) { | if (null == page) { | ||||
| @@ -374,9 +394,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return new ResultData(Result.ERROR,"请选择分类"); | return new ResultData(Result.ERROR,"请选择分类"); | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(getBillSum(wxMerchant, btype, null)); | return new ResultData(getBillSum(wxMerchant, btype, null)); | ||||
| } | } | ||||
| @@ -387,9 +412,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return new ResultData(Result.ERROR,"请选择分类"); | return new ResultData(Result.ERROR,"请选择分类"); | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(getBillSum(wxMerchant, btype, getNearBillBeforeDays())); | return new ResultData(getBillSum(wxMerchant, btype, getNearBillBeforeDays())); | ||||
| } | } | ||||
| @@ -420,9 +450,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return ; | return ; | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| } | |||||
| } | } | ||||
| WxBillBaseEntity bill = billAllHelper.getOneBill(getTenantInfo(), btype, id); | WxBillBaseEntity bill = billAllHelper.getOneBill(getTenantInfo(), btype, id); | ||||
| if (null == bill) { | if (null == bill) { | ||||
| @@ -437,9 +472,14 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null == billType) { | if (null == billType) { | ||||
| return ; | return ; | ||||
| } | } | ||||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return ; | |||||
| } | |||||
| } | } | ||||
| WxBillBaseEntity bill = billAllHelper.getOneBill(getTenantInfo(), btype, id); | WxBillBaseEntity bill = billAllHelper.getOneBill(getTenantInfo(), btype, id); | ||||
| if (null == bill) { | if (null == bill) { | ||||
| @@ -1,22 +1,33 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.common.SysConfigConstant; | |||||
| import com.iformall.domain.po.SysConfig; | |||||
| import com.iformall.domain.po.WxFlowModel; | import com.iformall.domain.po.WxFlowModel; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxMerchantBUser; | import com.iformall.domain.po.WxMerchantBUser; | ||||
| import com.iformall.domain.po.WxUserDataRule; | |||||
| import com.iformall.domain.vo.WxBillAll; | import com.iformall.domain.vo.WxBillAll; | ||||
| import com.iformall.domain.vo.WxBillHotNotify; | |||||
| import com.iformall.enums.EnumBillAllType; | |||||
| import com.iformall.enums.EnumBillUpdateType; | import com.iformall.enums.EnumBillUpdateType; | ||||
| import com.iformall.enums.EnumFilterSettle; | import com.iformall.enums.EnumFilterSettle; | ||||
| import com.iformall.enums.EnumFlowKey; | import com.iformall.enums.EnumFlowKey; | ||||
| import com.iformall.enums.EnumMerchantStatus; | import com.iformall.enums.EnumMerchantStatus; | ||||
| import com.iformall.service.SysConfigService; | |||||
| import com.iformall.service.WxBillAllService; | import com.iformall.service.WxBillAllService; | ||||
| import com.iformall.service.WxBillSettleService; | import com.iformall.service.WxBillSettleService; | ||||
| import com.iformall.service.WxFlowService; | import com.iformall.service.WxFlowService; | ||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| import com.iformall.service.helper.WxBillAllHelper; | |||||
| import com.iformall.utils.Constant; | |||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | |||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| @@ -47,6 +58,10 @@ public class WxBillController extends BaseController { | |||||
| WxBillSettleService wxBillSettleService; | WxBillSettleService wxBillSettleService; | ||||
| @Autowired | @Autowired | ||||
| private WxFlowService wxFlowService; | private WxFlowService wxFlowService; | ||||
| @Autowired | |||||
| private SysConfigService sysConfigService; | |||||
| @Autowired | |||||
| WxBillAllHelper billAllHelper; | |||||
| // @ApiOperation("所有欠缴和待缴的数据") | // @ApiOperation("所有欠缴和待缴的数据") | ||||
| // @PostMapping("listBillOweAndWaitPay") | // @PostMapping("listBillOweAndWaitPay") | ||||
| @@ -68,37 +83,139 @@ public class WxBillController extends BaseController { | |||||
| // List<Map<String,Object>> result=wxBillAllService.listBillOweAndWaitPay(wxBillAll); | // List<Map<String,Object>> result=wxBillAllService.listBillOweAndWaitPay(wxBillAll); | ||||
| // return new ResultData(result); | // return new ResultData(result); | ||||
| // } | // } | ||||
| /** | |||||
| * 账单类型 | |||||
| * @return | |||||
| */ | |||||
| @GetMapping("billTypes") | |||||
| public ResultData billTypes() { | |||||
| Map<Integer,String> tmap = new HashMap<Integer,String>(); | |||||
| for (EnumBillAllType t : EnumBillAllType.values()) { | |||||
| tmap.put(t.getCode(), t.getMessage()); | |||||
| } | |||||
| return new ResultData(tmap); | |||||
| } | |||||
| private Integer getOweBillBeforeDays() { | |||||
| SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); | |||||
| Integer oweBillBeforeDays = 0 ; | |||||
| if (null != config && null != config.getConfigItemValue()) { | |||||
| oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); | |||||
| } | |||||
| return oweBillBeforeDays; | |||||
| } | |||||
| private Integer getNearBillBeforeDays() { | |||||
| SysConfig lqconfig = sysConfigService.getByKey(SysConfigConstant.bill_near_days, getTenantInfo()); | |||||
| Integer nearBillBeforeDays = Constant.bill_near_default_days ; | |||||
| if (null != lqconfig && null != lqconfig.getConfigItemValue()) { | |||||
| nearBillBeforeDays = Integer.parseInt(lqconfig.getConfigItemValue()); | |||||
| } | |||||
| return nearBillBeforeDays; | |||||
| } | |||||
| @ApiOperation("账单") | |||||
| @PostMapping("listBill") | |||||
| 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); | |||||
| /** | |||||
| * 欠缴账单统计-红灯区 | |||||
| * @param wxBillAll | |||||
| * @param pageNum | |||||
| * @param pageSize | |||||
| * @return | |||||
| */ | |||||
| @GetMapping("oweBillHot") | |||||
| public ResultData oweBillHot() { | |||||
| return new ResultData(getHots(null)); | |||||
| } | |||||
| //临期 | |||||
| @GetMapping("nearBillHot") | |||||
| public ResultData nearBillHot() { | |||||
| return new ResultData(getHots(getNearBillBeforeDays())); | |||||
| } | |||||
| private List<WxBillHotNotify> getHots(Integer nearBillBeforeDays) { | |||||
| WxMerchant wxMerchant = new WxMerchant(); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchant.setId(this.getLoginBUser().getMerchantId()); | |||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | |||||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | |||||
| return billAllHelper.getHotNotify(wxMerchant); | |||||
| } | |||||
| /** | |||||
| * 欠缴账单列表 | |||||
| * @param wxBillAll | |||||
| * @param pageNum | |||||
| * @param pageSize | |||||
| * @return | |||||
| */ | |||||
| @GetMapping("oweBillList") | |||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||||
| public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, Integer pageNum, Integer pageSize) { | |||||
| if (null == billType) { | |||||
| return new ResultData(Result.ERROR,"请选择分类"); | |||||
| } | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| } | |||||
| } | |||||
| wxMerchant.setId(this.getLoginBUser().getMerchantId()); | |||||
| return new ResultData(getBillList(wxMerchant, btype, null, pageNum, pageSize)); | |||||
| } | |||||
| @GetMapping("nearBillList") | |||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||||
| public ResultData nearBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, Integer pageNum, Integer pageSize) { | |||||
| if (null == billType) { | |||||
| return new ResultData(Result.ERROR,"请选择分类"); | |||||
| } | |||||
| EnumBillAllType btype; | |||||
| if (billType.intValue() == Constant.bill_all_type_manage_fee) { | |||||
| btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; | |||||
| }else { | |||||
| btype = EnumBillAllType.getEnum(billType); | |||||
| if (null == btype) { | |||||
| return new ResultData(Result.ERROR,"分类非法"); | |||||
| } | |||||
| } | |||||
| wxMerchant.setId(this.getLoginBUser().getMerchantId()); | |||||
| return new ResultData(getBillList(wxMerchant, btype, getNearBillBeforeDays(), pageNum, pageSize)); | |||||
| } | |||||
| private PageInfo getBillList(WxMerchant wxMerchant,EnumBillAllType btype,Integer nearBillBeforeDays, Integer pageNum, Integer pageSize) { | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | |||||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | |||||
| 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)); | |||||
| } | } | ||||
| @@ -13,6 +13,8 @@ public class WxBillHotNotify implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| //EnumBillAllType | |||||
| private Integer billType; | |||||
| private String billTypeName; | private String billTypeName; | ||||
| private Integer totalCount = 0; | private Integer totalCount = 0; | ||||
| private String totalMoney = "0"; | private String totalMoney = "0"; | ||||
| @@ -49,6 +49,7 @@ import com.iformall.service.WxBillRentService; | |||||
| import com.iformall.service.WxMallService; | import com.iformall.service.WxMallService; | ||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| import com.iformall.service.WxShopService; | import com.iformall.service.WxShopService; | ||||
| import com.iformall.utils.Constant; | |||||
| import com.iformall.utils.DateUtils; | import com.iformall.utils.DateUtils; | ||||
| import com.iformall.utils.PriceUtil; | import com.iformall.utils.PriceUtil; | ||||
| import com.iformall.utils.WordUtil; | import com.iformall.utils.WordUtil; | ||||
| @@ -141,6 +142,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.RENT.getMessage()); | notify.setBillTypeName(EnumBillAllType.RENT.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.RENT.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -179,9 +181,20 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| if (null != manageFeeType) { | if (null != manageFeeType) { | ||||
| notify.setBillTypeName(manageFeeType.getMessage()); | |||||
| if (manageFeeType == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE) { | |||||
| notify.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | |||||
| notify.setBillTypeName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage()); | |||||
| }else if (manageFeeType == EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE) { | |||||
| notify.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); | |||||
| notify.setBillTypeName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage()); | |||||
| }else { | |||||
| notify.setBillTypeName("商业&运营管理费"); | |||||
| notify.setBillType(Constant.bill_all_type_manage_fee); | |||||
| } | |||||
| }else { | }else { | ||||
| notify.setBillTypeName("商业&运营管理费"); | notify.setBillTypeName("商业&运营管理费"); | ||||
| notify.setBillType(Constant.bill_all_type_manage_fee); | |||||
| } | } | ||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -211,6 +224,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.RENT_DEPOSIT.getMessage()); | notify.setBillTypeName(EnumBillAllType.RENT_DEPOSIT.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -239,6 +253,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.PROPERTY.getMessage()); | notify.setBillTypeName(EnumBillAllType.PROPERTY.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.PROPERTY.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -267,6 +282,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); | notify.setBillTypeName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -305,6 +321,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.DAILY.getMessage()); | notify.setBillTypeName(EnumBillAllType.DAILY.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.DAILY.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -333,6 +350,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.OTHER.getMessage()); | notify.setBillTypeName(EnumBillAllType.OTHER.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.OTHER.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -361,6 +379,7 @@ public class WxBillAllHelper { | |||||
| notify = new WxBillHotNotify(); | notify = new WxBillHotNotify(); | ||||
| } | } | ||||
| notify.setBillTypeName(EnumBillAllType.OTHER_DEPOSIT.getMessage()); | notify.setBillTypeName(EnumBillAllType.OTHER_DEPOSIT.getMessage()); | ||||
| notify.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); | |||||
| return notify; | return notify; | ||||
| } | } | ||||
| @@ -423,40 +442,49 @@ public class WxBillAllHelper { | |||||
| if (billType == EnumBillAllType.RENT) { | if (billType == EnumBillAllType.RENT) { | ||||
| WxBillRent wxBillRent = new WxBillRent(); | WxBillRent wxBillRent = new WxBillRent(); | ||||
| updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillRent.setSortColumns("starttime asc"); | |||||
| return wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | return wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.RENT_BUSSINESS_MANAGE) { | }else if (billType == EnumBillAllType.RENT_BUSSINESS_MANAGE) { | ||||
| WxBillRentManage wxBillRentManage = new WxBillRentManage(); | WxBillRentManage wxBillRentManage = new WxBillRentManage(); | ||||
| wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); | wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); | ||||
| updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillRentManage.setSortColumns("starttime asc"); | |||||
| return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.RENT_OPERATION_MANAGE) { | }else if (billType == EnumBillAllType.RENT_OPERATION_MANAGE) { | ||||
| WxBillRentManage wxBillRentManage = new WxBillRentManage(); | WxBillRentManage wxBillRentManage = new WxBillRentManage(); | ||||
| wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); | wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); | ||||
| updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillRentManage.setSortColumns("starttime asc"); | |||||
| return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.RENT_DEPOSIT) { | }else if (billType == EnumBillAllType.RENT_DEPOSIT) { | ||||
| WxBillDeposit wxBillDeposit = new WxBillDeposit(); | WxBillDeposit wxBillDeposit = new WxBillDeposit(); | ||||
| updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillDeposit.setSortColumns("starttime asc"); | |||||
| return wxBillRentDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | return wxBillRentDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.PROPERTY) { | }else if (billType == EnumBillAllType.PROPERTY) { | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | WxBillProperty wxBillProperty = new WxBillProperty(); | ||||
| updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillProperty.setSortColumns("starttime asc"); | |||||
| return wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | return wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { | }else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { | ||||
| WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | ||||
| updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillPropertyDeposit.setSortColumns("starttime asc"); | |||||
| return wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | return wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.DAILY) { | }else if (billType == EnumBillAllType.DAILY) { | ||||
| WxBillDaily wxBillDaily = new WxBillDaily(); | WxBillDaily wxBillDaily = new WxBillDaily(); | ||||
| updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillDaily.setSortColumns("starttime asc"); | |||||
| return wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | return wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.OTHER) { | }else if (billType == EnumBillAllType.OTHER) { | ||||
| WxBillOther wxBillOther = new WxBillOther(); | WxBillOther wxBillOther = new WxBillOther(); | ||||
| updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillOther.setSortColumns("starttime asc"); | |||||
| return wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | return wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | ||||
| }else if (billType == EnumBillAllType.OTHER_DEPOSIT) { | }else if (billType == EnumBillAllType.OTHER_DEPOSIT) { | ||||
| WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | ||||
| updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); | ||||
| wxBillOtherDeposit.setSortColumns("starttime asc"); | |||||
| return wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | return wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | ||||
| } | } | ||||
| return null; | return null; | ||||
| @@ -137,5 +137,6 @@ public class Constant { | |||||
| public static final Integer default_long_decimal_size = 10; | public static final Integer default_long_decimal_size = 10; | ||||
| public static final Integer bill_near_default_days = 5; | public static final Integer bill_near_default_days = 5; | ||||
| public static final Integer bill_all_type_manage_fee = 999; | |||||
| } | } | ||||