diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index d798cbb8c..9ec10b8f0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -77,8 +77,6 @@ public class WxBillController extends BaseController { @PostMapping("listBill") public ResultData listBill(@RequestBody WxBillAll wxBillAll) { - logger.info("listBill WxBillAll:"+JSON.toJSONString(wxBillAll)); - if(StringUtils.isEmpty(wxBillAll.getTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空"); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index bda5ca989..3910aefaa 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -33,6 +33,7 @@ public interface WxBillAllMapper { Map queryPaidInfo(WxBillAll record); List> listRentBillData(WxBillAll wxBillAll); + List> listRentManageBillData(WxBillAll wxBillAll); List> listRentDepositBillData(WxBillAll wxBillAll); List> listPropertyBillData(WxBillAll wxBillAll); List> listPropertyDepositBillData(WxBillAll wxBillAll); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 6735615bd..0fed4e50b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -335,6 +335,16 @@ public class WxBillAllServiceImpl implements WxBillAllService { } else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.SETTLE.getCode())) { wxBillAll.setBillTypeValue(EnumBillQueryType.SETTLE.getCode()); maps = wxBillAllMapper.listSettleBillData(wxBillAll); + } else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.RENT_BUSSINESS_MANAGE.getCode())) { + wxBillAll.setBillTypeValue(EnumBillQueryType.RENT_BUSSINESS_MANAGE.getCode()); + wxBillAll.setBillTypeName(EnumBillQueryType.RENT_BUSSINESS_MANAGE.getMessage()); + wxBillAll.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); + maps = wxBillAllMapper.listRentManageBillData(wxBillAll); + } else if (wxBillAll.getBillTypeValue().equals(EnumBillQueryType.RENT_OPERATING_MANAGE.getCode())) { + wxBillAll.setBillTypeValue(EnumBillQueryType.RENT_OPERATING_MANAGE.getCode()); + wxBillAll.setBillTypeName(EnumBillQueryType.RENT_OPERATING_MANAGE.getMessage()); + wxBillAll.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); + maps = wxBillAllMapper.listRentManageBillData(wxBillAll); } else { logger.info("账单不存在"); } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index ae4541785..1ce97b0c8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -326,23 +326,15 @@ - + select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,#{billTypeName} name,#{manageFeeType} billTypeValue,#{billTypeName} billType, + need_pay needPay,receive_pay receivePay,pay pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe, receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,rent_shop_type rentShopType,'' priceDetail, freeze,ifnull(late_pay_price,0) latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime - from wx_bill_rent bill - where bill.is_preview = 0 + from wx_bill_rent_manage bill + where bill.manage_fee_type = #{manageFeeType} and rent_contract_id in (select id from wx_rent_contract where status in (2,3,4)) - - - select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId, - '商业管理费' name,11 billTypeValue,'商业管理费' billType, 0 as needPay,receive_pay receivePay, - pay,(receive_pay+service_charge_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime, - rent_shop_type rentShopType,price_detail priceDetail,freeze,0 latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime - - from wx_bill_daily bill where bill.merchant_id=#{merchantId}