From 6cecf22e674ad51529e1caa8a6698a10f5e43dbc Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 8 Jun 2024 21:24:58 +0800 Subject: [PATCH] fix --- .../iformall/controller/WxBillController.java | 112 +++++------------- .../service/helper/WxBillAllHelper.java | 40 +++---- 2 files changed, 48 insertions(+), 104 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index 040c2de61..5cd93dc02 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -18,6 +18,7 @@ import com.iformall.enums.EnumBillUpdateType; import com.iformall.enums.EnumFilterSettle; import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.SysConfigService; import com.iformall.service.WxBillAllService; import com.iformall.service.WxBillSettleService; @@ -88,54 +89,30 @@ public class WxBillController extends BaseController { @GetMapping("notifyList") public ResultData notifyList(@ModelAttribute WxMerchant wxMerchant) { wxMerchant.setId(this.getLoginBUser().getMerchantId()); - return new ResultData(billAllHelper.getBillNotifyList(wxMerchant)); + return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,EnumYesOrNo.YES.getCode())); } - - - 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; - } - /** - * 欠缴账单统计-红灯区 + * 欠缴账单列表 * @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())); + @GetMapping("oweBillList") + public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant) { + wxMerchant.setId(this.getLoginBUser().getMerchantId()); + wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); } - private List 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); + 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; } /** @@ -145,55 +122,22 @@ public class WxBillController extends BaseController { * @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,"分类非法"); - } - } + public ResultData nearBillList(@ModelAttribute WxMerchant wxMerchant) { wxMerchant.setId(this.getLoginBUser().getMerchantId()); - return new ResultData(getBillList(wxMerchant, btype, getNearBillBeforeDays(), pageNum, pageSize)); + wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); + return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); } - - 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); - } - + + 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("分类查询账单") @GetMapping("listBill") public ResultData listBill(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue, Integer pageNum, Integer pageSize) { diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 8c621915b..599a56f24 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -585,41 +585,41 @@ public class WxBillAllHelper { return null; } - public List getBillNotifyList(WxMerchant wxMerchant) { + public List getBillNotifyList(WxMerchant wxMerchant,Integer notifyed) { List retList = new ArrayList(); - List rentList = getBillNotifyList(EnumBillAllType.RENT,wxMerchant); + List rentList = getBillNotifyList(EnumBillAllType.RENT,wxMerchant,notifyed); if (null != rentList) { retList.addAll(rentList); } - List rentBussinessList = getBillNotifyList(EnumBillAllType.RENT_BUSSINESS_MANAGE,wxMerchant); + List rentBussinessList = getBillNotifyList(EnumBillAllType.RENT_BUSSINESS_MANAGE,wxMerchant,notifyed); if (null != rentBussinessList) { retList.addAll(rentBussinessList); } - List rentOperationList = getBillNotifyList(EnumBillAllType.RENT_OPERATION_MANAGE,wxMerchant); + List rentOperationList = getBillNotifyList(EnumBillAllType.RENT_OPERATION_MANAGE,wxMerchant,notifyed); if (null != rentOperationList) { retList.addAll(rentOperationList); } - List rentDepositList = getBillNotifyList(EnumBillAllType.RENT_DEPOSIT,wxMerchant); + List rentDepositList = getBillNotifyList(EnumBillAllType.RENT_DEPOSIT,wxMerchant,notifyed); if (null != rentDepositList) { retList.addAll(rentDepositList); } - List propertyList = getBillNotifyList(EnumBillAllType.PROPERTY,wxMerchant); + List propertyList = getBillNotifyList(EnumBillAllType.PROPERTY,wxMerchant,notifyed); if (null != propertyList) { retList.addAll(propertyList); } - List propertyDepositList = getBillNotifyList(EnumBillAllType.PROPERTY_DEPOSIT,wxMerchant); + List propertyDepositList = getBillNotifyList(EnumBillAllType.PROPERTY_DEPOSIT,wxMerchant,notifyed); if (null != propertyDepositList) { retList.addAll(propertyDepositList); } - List dailyList = getBillNotifyList(EnumBillAllType.DAILY,wxMerchant); + List dailyList = getBillNotifyList(EnumBillAllType.DAILY,wxMerchant,notifyed); if (null != dailyList) { retList.addAll(dailyList); } - List otherList = getBillNotifyList(EnumBillAllType.OTHER,wxMerchant); + List otherList = getBillNotifyList(EnumBillAllType.OTHER,wxMerchant,notifyed); if (null != otherList) { retList.addAll(otherList); } - List otherDepositList = getBillNotifyList(EnumBillAllType.OTHER_DEPOSIT,wxMerchant); + List otherDepositList = getBillNotifyList(EnumBillAllType.OTHER_DEPOSIT,wxMerchant,notifyed); if (null != otherDepositList) { retList.addAll(otherDepositList); } @@ -642,11 +642,11 @@ public class WxBillAllHelper { return retList; } - private List getBillNotifyList(EnumBillAllType billType,WxMerchant wxMerchant) { + private List getBillNotifyList(EnumBillAllType billType,WxMerchant wxMerchant,Integer notifyed) { if (billType == EnumBillAllType.RENT) { WxBillRent wxBillRent = new WxBillRent(); updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillRent.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillRent.setNotifyed(notifyed); wxBillRent.setBillType(EnumBillAllType.RENT.getCode()); wxBillRent.setBillTypeName(EnumBillAllType.RENT.getMessage()); wxBillRent.setSortColumns("starttime asc"); @@ -655,7 +655,7 @@ public class WxBillAllHelper { WxBillRentManage wxBillRentManage = new WxBillRentManage(); wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillRentManage.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillRentManage.setNotifyed(notifyed); wxBillRentManage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); wxBillRentManage.setBillTypeName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage()); wxBillRentManage.setSortColumns("starttime asc"); @@ -664,7 +664,7 @@ public class WxBillAllHelper { WxBillRentManage wxBillRentManage = new WxBillRentManage(); wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillRentManage.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillRentManage.setNotifyed(notifyed); wxBillRentManage.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); wxBillRentManage.setBillTypeName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage()); wxBillRentManage.setSortColumns("starttime asc"); @@ -672,7 +672,7 @@ public class WxBillAllHelper { }else if (billType == EnumBillAllType.RENT_DEPOSIT) { WxBillDeposit wxBillDeposit = new WxBillDeposit(); updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillDeposit.setNotifyed(notifyed); wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); wxBillDeposit.setBillTypeName(EnumBillAllType.RENT_DEPOSIT.getMessage()); wxBillDeposit.setSortColumns("starttime asc"); @@ -680,7 +680,7 @@ public class WxBillAllHelper { }else if (billType == EnumBillAllType.PROPERTY) { WxBillProperty wxBillProperty = new WxBillProperty(); updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillProperty.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillProperty.setNotifyed(notifyed); wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode()); wxBillProperty.setBillTypeName(EnumBillAllType.PROPERTY.getMessage()); wxBillProperty.setSortColumns("starttime asc"); @@ -688,7 +688,7 @@ public class WxBillAllHelper { }else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillPropertyDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillPropertyDeposit.setNotifyed(notifyed); wxBillPropertyDeposit.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); wxBillPropertyDeposit.setBillTypeName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); wxBillPropertyDeposit.setSortColumns("starttime asc"); @@ -696,7 +696,7 @@ public class WxBillAllHelper { }else if (billType == EnumBillAllType.DAILY) { WxBillDaily wxBillDaily = new WxBillDaily(); updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillDaily.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillDaily.setNotifyed(notifyed); wxBillDaily.setBillType(EnumBillAllType.DAILY.getCode()); wxBillDaily.setBillTypeName(EnumBillAllType.DAILY.getMessage()); wxBillDaily.setSortColumns("starttime asc"); @@ -704,7 +704,7 @@ public class WxBillAllHelper { }else if (billType == EnumBillAllType.OTHER) { WxBillOther wxBillOther = new WxBillOther(); updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillOther.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillOther.setNotifyed(notifyed); wxBillOther.setBillType(EnumBillAllType.OTHER.getCode()); wxBillOther.setBillTypeName(EnumBillAllType.OTHER.getMessage()); wxBillOther.setSortColumns("starttime asc"); @@ -712,7 +712,7 @@ public class WxBillAllHelper { }else if (billType == EnumBillAllType.OTHER_DEPOSIT) { WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); - wxBillOtherDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); + wxBillOtherDeposit.setNotifyed(notifyed); wxBillOtherDeposit.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); wxBillOtherDeposit.setBillTypeName(EnumBillAllType.OTHER_DEPOSIT.getMessage()); wxBillOtherDeposit.setSortColumns("starttime asc");