| @@ -26,6 +26,9 @@ import com.iformall.domain.vo.WxBillSum; | |||
| import com.iformall.domain.vo.WxMerchantBillVo; | |||
| import com.iformall.domain.vo.WxMerchantMicroPayVo; | |||
| import com.iformall.domain.vo.WxShopVo; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import com.iformall.enums.EnumBillType; | |||
| import com.iformall.enums.EnumRentContractManageFeeType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.ExcelService; | |||
| import com.iformall.service.WxBillAllService; | |||
| @@ -187,7 +190,8 @@ public class WxBillAllController extends BaseController { | |||
| vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); | |||
| WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime); | |||
| WxBillSum rentManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime,null); | |||
| WxBillSum rentBussinessManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); | |||
| WxBillSum rentOperationManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); | |||
| WxBillSum rentDepositSum = billAllHelper.getBillDeposit(wxMerchant, starttime, enttime); | |||
| WxBillSum propertySum = billAllHelper.getBillProperty(wxMerchant, starttime, enttime); | |||
| WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDeposit(wxMerchant, starttime, enttime); | |||
| @@ -195,16 +199,17 @@ public class WxBillAllController extends BaseController { | |||
| WxBillSum otherSum = billAllHelper.getBillOther(wxMerchant, starttime, enttime); | |||
| WxBillSum otherDepositSum = billAllHelper.getBillOtherDeposit(wxMerchant, starttime, enttime); | |||
| vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), | |||
| vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), | |||
| propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); | |||
| vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(), | |||
| vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(), | |||
| propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid())); | |||
| vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), | |||
| vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), | |||
| propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe())); | |||
| List<WxBillSum> sumlist = new ArrayList<>(); | |||
| sumlist.add(rentSum); | |||
| sumlist.add(rentManageSum); | |||
| sumlist.add(rentBussinessManageSum); | |||
| sumlist.add(rentOperationManageSum); | |||
| sumlist.add(rentDepositSum); | |||
| sumlist.add(propertySum); | |||
| sumlist.add(propertyDepositSum); | |||
| @@ -216,9 +221,17 @@ public class WxBillAllController extends BaseController { | |||
| return new ResultData(vo); | |||
| } | |||
| @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); | |||
| } | |||
| /** | |||
| * 欠缴商户列表 | |||
| * 欠缴账单列表 | |||
| * @param wxBillAll | |||
| * @param pageNum | |||
| * @param pageSize | |||
| @@ -228,19 +241,22 @@ public class WxBillAllController extends BaseController { | |||
| @ApiImplicitParams({ | |||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||
| @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") | |||
| public ResultData oweBillList(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { | |||
| logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist"); | |||
| if (null == wxBillAll) { | |||
| wxBillAll = new WxBillAll(); | |||
| } | |||
| //默认查当月第一天到今天 | |||
| if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ | |||
| wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); | |||
| public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, Integer pageNum, Integer pageSize) { | |||
| if (null == billType) { | |||
| return new ResultData(Result.ERROR,"请选择分类"); | |||
| } | |||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | |||
| if (null != dataRule) { | |||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | |||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| wxBillAll.updateTenantInfo(getTenantInfo()); | |||
| Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); | |||
| return new ResultData(result); | |||
| wxMerchant.setOnlyOwe(EnumYesOrNo.YES.getCode()); | |||
| EnumBillAllType btype = EnumBillAllType.getEnum(billType); | |||
| if (null == btype) { | |||
| return new ResultData(Result.ERROR,"分类非法"); | |||
| } | |||
| return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); | |||
| } | |||
| @@ -125,6 +125,17 @@ public class WxBillDaily extends TenantEntity { | |||
| @TableField(exist = false) | |||
| private String realReceivePay; | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| private Long floor; | |||
| @TableField(exist = false) | |||
| private String serviceChargePayBefore; | |||
| @TableField(exist = false) | |||
| @@ -90,6 +90,9 @@ public class WxBillDeposit extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | |||
| @TableField(exist = false) | |||
| private String realReceivePay; | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @TableField(exist = false) | |||
| private String serviceChargePayBefore; | |||
| @@ -100,6 +103,14 @@ public class WxBillDeposit extends TenantEntity { | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| private Long floor; | |||
| @TableField(exist = false) | |||
| private String month; | |||
| @@ -161,6 +161,17 @@ public class WxBillOther extends TenantEntity { | |||
| return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString(); | |||
| } | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| private Long floor; | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| @@ -164,6 +164,17 @@ public class WxBillOtherDeposit extends TenantEntity { | |||
| return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString(); | |||
| } | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| private Long floor; | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| @@ -201,6 +201,9 @@ public class WxBillProperty extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | |||
| @TableField(exist = false) | |||
| private String realReceivePay; | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @TableField(exist = false) | |||
| private String serviceChargePayBefore; | |||
| @@ -90,6 +90,17 @@ public class WxBillPropertyDeposit extends TenantEntity { | |||
| @TableField(exist = false) | |||
| private String realReceivePay; | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| private Long floor; | |||
| @TableField(exist = false) | |||
| private String serviceChargePayBefore; | |||
| @TableField(exist = false) | |||
| @@ -269,7 +269,9 @@ public class WxBillRent extends TenantEntity { | |||
| // return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString(); | |||
| // } | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| private String billTypeName; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @@ -289,5 +291,7 @@ public class WxBillRent extends TenantEntity { | |||
| @TableField(exist = false) | |||
| private Integer onlyOwe; | |||
| } | |||
| @@ -193,6 +193,9 @@ public class WxBillRentManage extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="管理费类型,EnumRentContractManageFeeType",name="manageFeeType") | |||
| private Integer manageFeeType; | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称-管理费",name="billTypeName") | |||
| private String billTypeName; | |||
| public void initByBillRent(WxBillRent billRent) { | |||
| this.rentContractId = billRent.getRentContractId(); | |||
| this.pay = billRent.getPay(); | |||
| @@ -214,6 +217,14 @@ public class WxBillRentManage extends TenantEntity { | |||
| this.latePayRatio = billRent.getLatePayRatio(); | |||
| } | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| private Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| private Long floor; | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| @TableField(exist = false) | |||
| @@ -0,0 +1,41 @@ | |||
| package com.iformall.enums; | |||
| public enum EnumBillAllType { | |||
| RENT(1,"租金"), | |||
| RENT_BUSSINESS_MANAGE(11,"商业管理费"), | |||
| RENT_OPERATION_MANAGE(12,"运营管理费"), | |||
| RENT_DEPOSIT(13,"租赁押金"), | |||
| PROPERTY(2,"物业费"), | |||
| PROPERTY_DEPOSIT(21,"物业押金"), | |||
| DAILY(3, "日常(水电空调)费"), | |||
| OTHER(4, "其他费用"), | |||
| OTHER_DEPOSIT(5, "其他押金") | |||
| ; | |||
| public static EnumBillAllType getEnum(Integer code) { | |||
| for (EnumBillAllType value : values()) { | |||
| if (value.getCode().equals(code)) { | |||
| return value; | |||
| } | |||
| } | |||
| return null; | |||
| } | |||
| private Integer code; | |||
| private String message; | |||
| EnumBillAllType(Integer code, String message) { | |||
| this.code = code; | |||
| this.message = message; | |||
| } | |||
| public Integer getCode() { | |||
| return code; | |||
| } | |||
| public String getMessage() { | |||
| return message; | |||
| } | |||
| } | |||
| @@ -9,10 +9,10 @@ public enum EnumBillType { | |||
| RENT(1,"租金"), | |||
| DEPOSIT(2,"押金"), | |||
| PROPERTY(3,"物业"), | |||
| PROPERTY(3,"物业费"), | |||
| WATER(4, "水费"), | |||
| POWER(5, "电费"), | |||
| ROUTINE(6, "其他"), | |||
| ROUTINE(6, "其他费用"), | |||
| AIR_CONDITIONING(7, "空调费"), | |||
| OTHER_DEPOSIT(8, "其他押金"), | |||
| SETTLE(10, "结算单") | |||
| @@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.stereotype.Service; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.domain.po.WxBillDaily; | |||
| import com.iformall.domain.po.WxBillDeposit; | |||
| import com.iformall.domain.po.WxBillOther; | |||
| @@ -24,6 +25,9 @@ import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillSum; | |||
| import com.iformall.domain.vo.WxShopVo; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import com.iformall.enums.EnumBillType; | |||
| import com.iformall.enums.EnumRentContractManageFeeType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.WxBillDailyService; | |||
| import com.iformall.service.WxBillDepositService; | |||
| @@ -90,19 +94,25 @@ public class WxBillAllHelper { | |||
| return wxBillRentService.getMerchantIds(br); | |||
| } | |||
| public WxBillSum getBillRentManage(WxMerchant wxMerchant,Date starttime, Date enttime,Integer manageFeeType) { | |||
| public WxBillSum getBillRentManage(WxMerchant wxMerchant,Date starttime, Date enttime,EnumRentContractManageFeeType manageFeeType) { | |||
| WxBillRentManage brm = new WxBillRentManage(); | |||
| brm.updateTenantInfo(wxMerchant); | |||
| brm.setStarttime(starttime); | |||
| brm.setEndtime(enttime); | |||
| brm.setOnlyOwe(wxMerchant.getOnlyOwe()); | |||
| brm.setManageFeeType(manageFeeType); | |||
| if (null != manageFeeType) { | |||
| brm.setManageFeeType(manageFeeType.getCode()); | |||
| } | |||
| brm.setMerchantId(wxMerchant.getId()); | |||
| WxBillSum rentManageSum = wxBillRentManageService.getBillMonthSum(brm); | |||
| if (null == rentManageSum) { | |||
| rentManageSum = new WxBillSum(); | |||
| } | |||
| rentManageSum.setBillName("租赁营业&商业管理费费用"); | |||
| if (null != manageFeeType) { | |||
| rentManageSum.setBillName(manageFeeType.getMessage()); | |||
| }else { | |||
| rentManageSum.setBillName("租赁营业&商业管理费费用"); | |||
| } | |||
| return rentManageSum; | |||
| } | |||
| @@ -321,4 +331,128 @@ public class WxBillAllHelper { | |||
| } | |||
| return null; | |||
| } | |||
| public PageInfo getBillList(EnumBillAllType billType,WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { | |||
| if (billType == EnumBillAllType.RENT) { | |||
| WxBillRent wxBillRent = new WxBillRent(); | |||
| wxBillRent.updateTenantInfo(wxMerchant); | |||
| wxBillRent.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillRent.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillRent.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillRent.setFloor(wxMerchant.getFloor()); | |||
| wxBillRent.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillRent.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillRent.setRentShopType(wxMerchant.getType()); | |||
| wxBillRent.setMerchantName(wxMerchant.getName());; | |||
| return wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.RENT_BUSSINESS_MANAGE) { | |||
| WxBillRentManage wxBillRentManage = new WxBillRentManage(); | |||
| wxBillRentManage.updateTenantInfo(wxMerchant); | |||
| wxBillRentManage.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillRentManage.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillRentManage.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillRentManage.setFloor(wxMerchant.getFloor()); | |||
| wxBillRentManage.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillRentManage.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillRentManage.setRentShopType(wxMerchant.getType()); | |||
| wxBillRentManage.setMerchantName(wxMerchant.getName()); | |||
| wxBillRentManage.setManageFeeType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | |||
| return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.RENT_OPERATION_MANAGE) { | |||
| WxBillRentManage wxBillRentManage = new WxBillRentManage(); | |||
| wxBillRentManage.updateTenantInfo(wxMerchant); | |||
| wxBillRentManage.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillRentManage.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillRentManage.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillRentManage.setFloor(wxMerchant.getFloor()); | |||
| wxBillRentManage.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillRentManage.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillRentManage.setRentShopType(wxMerchant.getType()); | |||
| wxBillRentManage.setMerchantName(wxMerchant.getName()); | |||
| wxBillRentManage.setManageFeeType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); | |||
| return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.RENT_DEPOSIT) { | |||
| WxBillDeposit wxBillDeposit = new WxBillDeposit(); | |||
| wxBillDeposit.updateTenantInfo(wxMerchant); | |||
| wxBillDeposit.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillDeposit.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillDeposit.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillDeposit.setFloor(wxMerchant.getFloor()); | |||
| wxBillDeposit.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillDeposit.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillDeposit.setRentShopType(wxMerchant.getType()); | |||
| wxBillDeposit.setMerchantName(wxMerchant.getName()); | |||
| return wxBillRentDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.PROPERTY) { | |||
| WxBillProperty wxBillProperty = new WxBillProperty(); | |||
| wxBillProperty.updateTenantInfo(wxMerchant); | |||
| wxBillProperty.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillProperty.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillProperty.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillProperty.setFloor(wxMerchant.getFloor()); | |||
| wxBillProperty.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillProperty.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillProperty.setRentShopType(wxMerchant.getType()); | |||
| wxBillProperty.setMerchantName(wxMerchant.getName()); | |||
| return wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { | |||
| WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | |||
| wxBillPropertyDeposit.updateTenantInfo(wxMerchant); | |||
| wxBillPropertyDeposit.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillPropertyDeposit.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillPropertyDeposit.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillPropertyDeposit.setFloor(wxMerchant.getFloor()); | |||
| wxBillPropertyDeposit.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillPropertyDeposit.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillPropertyDeposit.setRentShopType(wxMerchant.getType()); | |||
| wxBillPropertyDeposit.setMerchantName(wxMerchant.getName()); | |||
| return wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.DAILY) { | |||
| WxBillDaily wxBillDaily = new WxBillDaily(); | |||
| wxBillDaily.updateTenantInfo(wxMerchant); | |||
| wxBillDaily.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillDaily.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillDaily.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillDaily.setFloor(wxMerchant.getFloor()); | |||
| wxBillDaily.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillDaily.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillDaily.setRentShopType(wxMerchant.getType()); | |||
| wxBillDaily.setMerchantName(wxMerchant.getName()); | |||
| return wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.OTHER) { | |||
| WxBillOther wxBillOther = new WxBillOther(); | |||
| wxBillOther.updateTenantInfo(wxMerchant); | |||
| wxBillOther.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillOther.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillOther.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillOther.setFloor(wxMerchant.getFloor()); | |||
| wxBillOther.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillOther.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillOther.setRentShopType(wxMerchant.getType()); | |||
| wxBillOther.setMerchantName(wxMerchant.getName()); | |||
| return wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | |||
| }else if (billType == EnumBillAllType.OTHER_DEPOSIT) { | |||
| WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | |||
| wxBillOtherDeposit.updateTenantInfo(wxMerchant); | |||
| wxBillOtherDeposit.setFloorForRule(wxMerchant.getFloorForRule()); | |||
| wxBillOtherDeposit.setBusinessForRule(wxMerchant.getBusinessForRule()); | |||
| wxBillOtherDeposit.setBuilding(wxMerchant.getBuilding()); | |||
| wxBillOtherDeposit.setFloor(wxMerchant.getFloor()); | |||
| wxBillOtherDeposit.setStarttime(wxMerchant.getStarttime()); | |||
| wxBillOtherDeposit.setEndtime(wxMerchant.getEndtime()); | |||
| wxBillOtherDeposit.setRentShopType(wxMerchant.getType()); | |||
| wxBillOtherDeposit.setMerchantName(wxMerchant.getName()); | |||
| return wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | |||
| } | |||
| return null; | |||
| } | |||
| } | |||
| @@ -32,12 +32,13 @@ | |||
| <result column="freeze" property="freeze"/> | |||
| <result column="build_way" property="buildWay"/> | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`, | |||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay | |||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,'日常费用' bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -117,7 +118,7 @@ | |||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | |||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id, | |||
| br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time` | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,'日常费用' bill_type_name | |||
| from wx_bill_daily br | |||
| <include refid="queryBillDailyListConditions" /> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| @@ -31,12 +31,13 @@ | |||
| <result column="freeze" property="freeze"/> | |||
| <result column="merchant_name" property="merchantName"/> | |||
| <result column="shop_number" property="shopNumber"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`, | |||
| `expired_day`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay | |||
| `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -95,7 +96,7 @@ | |||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| br.`owe`,br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, | |||
| br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay | |||
| br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,'租赁押金' bill_type_name | |||
| from wx_bill_rent_deposit br | |||
| <include refid="queryBillRentListCondition"/> | |||
| order by br.id desc | |||
| @@ -34,12 +34,13 @@ | |||
| <result column="endtime" property="endtime"/> | |||
| <result column="freeze" property="freeze"/> | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | |||
| `owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`, | |||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time` | |||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`,'其他费用' bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -117,7 +118,7 @@ | |||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`, | |||
| br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`, | |||
| br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | |||
| br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他费用' bill_type_name | |||
| from wx_bill_other br | |||
| <include refid="queryBillListConditions" /> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| @@ -31,12 +31,13 @@ | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="merchant_name" property="merchantName"/> | |||
| <result column="shop_number" property="shopNumber"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, | |||
| `pay_date`,`createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay,'物业押金' bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -126,7 +127,7 @@ | |||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`owe`,br.`status`, | |||
| br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way, | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time` | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,'物业押金' bill_type_name | |||
| from wx_bill_property_deposit br | |||
| <include refid="queryBillDepositListConditions"/> | |||
| order by id desc | |||
| @@ -46,6 +46,7 @@ | |||
| <result column="late_pay_ratio" property="latePayRatio"/> | |||
| <result column="freeze" property="freeze"/> | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| @@ -53,7 +54,7 @@ | |||
| `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,'物业费' bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -162,7 +163,7 @@ | |||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`, | |||
| br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status, | |||
| br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay, | |||
| br.`late_pay_ratio` | |||
| br.`late_pay_ratio`,'物业费' bill_type_name | |||
| from wx_bill_property br | |||
| <include refid="queryBillPropertyListConditions"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -38,13 +38,16 @@ | |||
| <result column="manage_fee_type" jdbcType="INTEGER" property="manageFeeType"/> | |||
| <result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | |||
| `createtime`,`expired_day`,`owe`,`status`,`apply_status`,`apply_pay_img`,`apply_update_time`,`is_del`,`need_pay`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`, | |||
| `period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type | |||
| `period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type, | |||
| case manage_fee_type when 1 then '商业管理费' when 2 then '运营管理费' else '管理费' end bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -138,7 +141,8 @@ | |||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | |||
| br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime, | |||
| br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio` | |||
| br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`, | |||
| case br.manage_fee_type when 1 then '商业管理费' when 2 then '运营管理费' else '管理费' end bill_type_name | |||
| from wx_bill_rent_manage br | |||
| <include refid="queryBillManageListConditions"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| @@ -55,7 +55,7 @@ | |||
| <result column="bus_discount_ratio" property="busDiscountRatio"/> | |||
| <result column="join_rent_price" property="joinRentPrice"/> | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| @@ -63,7 +63,7 @@ | |||
| `createtime`,`expired_day`,`owe`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,'租金' bill_type_name | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -160,7 +160,7 @@ | |||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`, | |||
| br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay,'租金' bill_type_name | |||
| from wx_bill_rent br | |||
| <include refid="queryBillRentListCondition"/> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||