| @@ -0,0 +1,34 @@ | |||
| package com.iformall.controller.base; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| import com.iformall.common.SysConfigConstant; | |||
| import com.iformall.domain.po.SysConfig; | |||
| import com.iformall.service.SysConfigService; | |||
| import com.iformall.utils.Constant; | |||
| @RestController | |||
| public class BillBaseController extends BaseController{ | |||
| @Autowired | |||
| SysConfigService sysConfigService; | |||
| public 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; | |||
| } | |||
| public 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; | |||
| } | |||
| } | |||
| @@ -6,8 +6,8 @@ import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.common.SysConfigConstant; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.SysConfig; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| @@ -18,6 +18,7 @@ import com.iformall.domain.vo.WxBillHotNotify; | |||
| import com.iformall.domain.vo.WxBillSum; | |||
| import com.iformall.domain.vo.WxMerchantBillVo; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumRentContractManageFeeType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.ExcelService; | |||
| @@ -49,7 +50,7 @@ import java.util.Map; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillAll") | |||
| public class WxBillAllController extends BaseController { | |||
| public class WxBillAllController extends BillBaseController { | |||
| @Autowired | |||
| private WxBillAllService wxBillAllService; | |||
| @@ -67,9 +68,6 @@ public class WxBillAllController extends BaseController { | |||
| @Autowired | |||
| ExcelService excelService; | |||
| @Autowired | |||
| SysConfigService sysConfigService; | |||
| /** | |||
| * 商户账单汇总计费列表 | |||
| * @param wxMerchant | |||
| @@ -97,12 +95,7 @@ public class WxBillAllController extends BaseController { | |||
| wxMerchant.setStarttime(null); | |||
| wxMerchant.setEndtime(null); | |||
| if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { | |||
| SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); | |||
| Integer oweBillBeforeDays = 0 ; | |||
| if (null != config && null != config.getConfigItemValue()) { | |||
| oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); | |||
| } | |||
| wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); | |||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | |||
| List<Long> mids = billAllHelper.getOwdMerchantIds(wxMerchant, starttime, enttime); | |||
| if (null != mids && mids.size() > 0 ) { | |||
| wxMerchant.setIds(mids);; | |||
| @@ -232,7 +225,20 @@ public class WxBillAllController extends BaseController { | |||
| tmap.put(t.getCode(), t.getMessage()); | |||
| } | |||
| return new ResultData(tmap); | |||
| } | |||
| } | |||
| /** | |||
| * 账单查询范围 | |||
| * @return | |||
| */ | |||
| @GetMapping("billScales") | |||
| public ResultData billScales() { | |||
| Map<Integer,String> tmap = new HashMap<Integer,String>(); | |||
| for (EnumBillOweOrNearType t : EnumBillOweOrNearType.values()) { | |||
| tmap.put(t.getCode(), t.getMessage()); | |||
| } | |||
| return new ResultData(tmap); | |||
| } | |||
| /** | |||
| @@ -269,12 +275,7 @@ public class WxBillAllController extends BaseController { | |||
| if (null == btype) { | |||
| return new ResultData(Result.ERROR,"分类非法"); | |||
| } | |||
| 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 new ResultData(getBillList(wxMerchant, btype, nearBillBeforeDays, pageNum, pageSize)); | |||
| return new ResultData(getBillList(wxMerchant, btype, getNearBillBeforeDays(), pageNum, pageSize)); | |||
| } | |||
| private PageInfo getBillList(WxMerchant wxMerchant,EnumBillAllType btype,Integer nearBillBeforeDays, Integer pageNum, Integer pageSize) { | |||
| @@ -284,12 +285,7 @@ public class WxBillAllController extends BaseController { | |||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | |||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); | |||
| Integer oweBillBeforeDays = 0 ; | |||
| if (null != config && null != config.getConfigItemValue()) { | |||
| oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); | |||
| } | |||
| wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); | |||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | |||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | |||
| return billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize); | |||
| @@ -328,12 +324,7 @@ public class WxBillAllController extends BaseController { | |||
| if (null == btype) { | |||
| return ; | |||
| } | |||
| 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()); | |||
| } | |||
| PageInfo page = getBillList(wxMerchant, btype, nearBillBeforeDays, 1, 10000); | |||
| PageInfo page = getBillList(wxMerchant, btype, getNearBillBeforeDays(), 1, 10000); | |||
| if (null == page) { | |||
| return; | |||
| } | |||
| @@ -355,12 +346,7 @@ public class WxBillAllController extends BaseController { | |||
| //临期 | |||
| @GetMapping("nearBillHot") | |||
| public ResultData nearBillHot() { | |||
| 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 new ResultData(getHots(nearBillBeforeDays)); | |||
| return new ResultData(getHots(getNearBillBeforeDays())); | |||
| } | |||
| private List<WxBillHotNotify> getHots(Integer nearBillBeforeDays) { | |||
| @@ -371,12 +357,7 @@ public class WxBillAllController extends BaseController { | |||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | |||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); | |||
| Integer oweBillBeforeDays = 0 ; | |||
| if (null != config && null != config.getConfigItemValue()) { | |||
| oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); | |||
| } | |||
| wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); | |||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | |||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | |||
| return billAllHelper.getHotNotify(wxMerchant); | |||
| } | |||
| @@ -410,12 +391,7 @@ public class WxBillAllController extends BaseController { | |||
| if (null == btype) { | |||
| return new ResultData(Result.ERROR,"分类非法"); | |||
| } | |||
| 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 new ResultData(getBillSum(wxMerchant, btype, nearBillBeforeDays)); | |||
| return new ResultData(getBillSum(wxMerchant, btype, getNearBillBeforeDays())); | |||
| } | |||
| private WxBillSum getBillSum(WxMerchant wxMerchant,EnumBillAllType btype,Integer nearBillBeforeDays) { | |||
| @@ -425,12 +401,7 @@ public class WxBillAllController extends BaseController { | |||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | |||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); | |||
| Integer oweBillBeforeDays = 0 ; | |||
| if (null != config && null != config.getConfigItemValue()) { | |||
| oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); | |||
| } | |||
| wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); | |||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | |||
| wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); | |||
| Date starttime = wxMerchant.getStarttime(); | |||
| Date enttime = wxMerchant.getEndtime(); | |||
| @@ -7,14 +7,17 @@ import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.controller.mem.BillDailyAsyncTask; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillDaily; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.enums.EnumBillDailyBuildWay; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.WxBillDailyService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import com.iformall.utils.Constant; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| @@ -40,7 +43,7 @@ import java.util.concurrent.TimeUnit; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillDaily") | |||
| public class WxBillDailyController extends BaseController { | |||
| public class WxBillDailyController extends BillBaseController { | |||
| @Autowired | |||
| private String fmUploadDir; | |||
| @@ -53,6 +56,9 @@ public class WxBillDailyController extends BaseController { | |||
| @Autowired | |||
| private BillDailyAsyncTask billDailyAsyncTask; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| private Logger logger = LoggerFactory.getLogger(this.getClass()); | |||
| @@ -72,6 +78,15 @@ public class WxBillDailyController extends BaseController { | |||
| wxBillDaily.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillDaily.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { | |||
| wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { | |||
| wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -6,10 +6,15 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.WxBillDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.WxBillDepositService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import org.slf4j.Logger; | |||
| @@ -22,9 +27,12 @@ import org.springframework.web.bind.annotation.*; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillDeposit") | |||
| public class WxBillDepositController extends BaseController { | |||
| public class WxBillDepositController extends BillBaseController { | |||
| @Autowired | |||
| private WxBillDepositService wxBillDepositService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| private Logger logger = LoggerFactory.getLogger(WxBillDepositController.class); | |||
| @@ -44,6 +52,15 @@ public class WxBillDepositController extends BaseController { | |||
| wxBillDeposit.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillDeposit.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { | |||
| wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { | |||
| wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -6,11 +6,15 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillOther; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.service.WxBillOtherService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import org.slf4j.Logger; | |||
| @@ -26,9 +30,12 @@ import javax.servlet.http.HttpServletResponse; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillOther") | |||
| public class WxBillOtherController extends BaseController { | |||
| public class WxBillOtherController extends BillBaseController { | |||
| @Autowired | |||
| private WxBillOtherService wxBillOtherService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| private Logger logger = LoggerFactory.getLogger(this.getClass()); | |||
| @@ -46,6 +53,15 @@ public class WxBillOtherController extends BaseController { | |||
| wxBillOther.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillOther.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { | |||
| wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { | |||
| wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| wxBillOther.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -6,11 +6,15 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillOtherDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.service.WxBillOtherDepositService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import org.slf4j.Logger; | |||
| @@ -26,9 +30,12 @@ import javax.servlet.http.HttpServletResponse; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillOtherDeposit") | |||
| public class WxBillOtherDepositController extends BaseController { | |||
| public class WxBillOtherDepositController extends BillBaseController { | |||
| @Autowired | |||
| private WxBillOtherDepositService wxBillOtherDepositService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| private Logger logger = LoggerFactory.getLogger(this.getClass()); | |||
| @@ -47,6 +54,15 @@ public class WxBillOtherDepositController extends BaseController { | |||
| wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillOtherDeposit.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { | |||
| wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { | |||
| wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -6,11 +6,16 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.WxBillProperty; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.domain.po.base.BaseEntity; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.WxBillPropertyService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import io.swagger.annotations.ApiOperation; | |||
| @@ -27,9 +32,12 @@ import javax.servlet.http.HttpServletResponse; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillProperty") | |||
| public class WxBillPropertyController extends BaseController { | |||
| public class WxBillPropertyController extends BillBaseController { | |||
| @Autowired | |||
| private WxBillPropertyService wxBillPropertyService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| private Logger logger = LoggerFactory.getLogger(WxBillPropertyController.class); | |||
| @@ -48,7 +56,15 @@ public class WxBillPropertyController extends BaseController { | |||
| wxBillProperty.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillProperty.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { | |||
| wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { | |||
| wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | |||
| PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | |||
| return new ResultData(result); | |||
| @@ -6,10 +6,15 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.WxBillPropertyDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.WxBillPropertyDepositService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import org.slf4j.Logger; | |||
| @@ -22,9 +27,12 @@ import org.springframework.web.bind.annotation.*; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillPropertyDeposit") | |||
| public class WxBillPropertyDepositController extends BaseController { | |||
| public class WxBillPropertyDepositController extends BillBaseController { | |||
| @Autowired | |||
| private WxBillPropertyDepositService wxBillPropertyDepositService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| private Logger logger = LoggerFactory.getLogger(WxBillPropertyDepositController.class); | |||
| @@ -44,6 +52,15 @@ public class WxBillPropertyDepositController extends BaseController { | |||
| wxBillPropertyDeposit.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillPropertyDeposit.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { | |||
| wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { | |||
| wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | |||
| return new ResultData(result); | |||
| } | |||
| @@ -6,10 +6,15 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.domain.po.base.BaseEntity; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.WxBillRentService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import io.swagger.annotations.ApiOperation; | |||
| @@ -26,11 +31,14 @@ import javax.servlet.http.HttpServletResponse; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillRent") | |||
| public class WxBillRentController extends BaseController { | |||
| public class WxBillRentController extends BillBaseController { | |||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | |||
| @Autowired | |||
| private WxBillRentService wxBillRentService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| @GetMapping("list") | |||
| @ApiImplicitParams({ | |||
| @@ -48,6 +56,15 @@ public class WxBillRentController extends BaseController { | |||
| wxBillRent.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillRent.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | |||
| wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | |||
| wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | |||
| final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -6,12 +6,17 @@ import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.controller.base.BillBaseController; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxBillRentManage; | |||
| import com.iformall.domain.po.WxUserDataRule; | |||
| import com.iformall.domain.po.base.BaseEntity; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumRentContractManageFeeType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.WxBillRentManageService; | |||
| import com.iformall.service.helper.WxBillAllHelper; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import io.swagger.annotations.ApiOperation; | |||
| @@ -28,11 +33,14 @@ import javax.servlet.http.HttpServletResponse; | |||
| */ | |||
| @RestController | |||
| @RequestMapping("wxBillRentManage") | |||
| public class WxBillRentManageController extends BaseController { | |||
| public class WxBillRentManageController extends BillBaseController { | |||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | |||
| @Autowired | |||
| private WxBillRentManageService wxBillRentManageService; | |||
| @Autowired | |||
| WxBillAllHelper wxBillAllHelper; | |||
| @GetMapping("list") | |||
| @ApiImplicitParams({ | |||
| @@ -49,6 +57,15 @@ public class WxBillRentManageController extends BaseController { | |||
| wxBillRentManage.setFloorForRule(dataRule.getFloorIds()); | |||
| wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds()); | |||
| } | |||
| if (null != wxBillRentManage.getOnlyOweOrNear()) { | |||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { | |||
| wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { | |||
| wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); | |||
| wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); | |||
| } | |||
| } | |||
| wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | |||
| final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -98,8 +98,9 @@ public class WxBillBaseEntity extends TenantEntity { | |||
| @TableField(exist = false) | |||
| protected String month; | |||
| // @TableField(exist = false) | |||
| // protected Integer onlyOwe; | |||
| //EnumBillOweOrNearType 逾期 1, 临期 2 | |||
| @TableField(exist = false) | |||
| protected Integer onlyOweOrNear; | |||
| //账单逾期计算截止时间 | |||
| @TableField(exist = false) | |||
| @@ -0,0 +1,35 @@ | |||
| package com.iformall.enums; | |||
| public enum EnumBillOweOrNearType { | |||
| ALL(0,"全部"), | |||
| OWE(1,"逾期"), | |||
| NEAR(2,"临期") | |||
| ; | |||
| public static EnumBillOweOrNearType getEnum(Integer code) { | |||
| for (EnumBillOweOrNearType value : values()) { | |||
| if (value.getCode().equals(code)) { | |||
| return value; | |||
| } | |||
| } | |||
| return null; | |||
| } | |||
| private Integer code; | |||
| private String message; | |||
| EnumBillOweOrNearType(Integer code, String message) { | |||
| this.code = code; | |||
| this.message = message; | |||
| } | |||
| public Integer getCode() { | |||
| return code; | |||
| } | |||
| public String getMessage() { | |||
| return message; | |||
| } | |||
| } | |||
| @@ -92,6 +92,10 @@ public class WxBillAllHelper { | |||
| @Autowired | |||
| private WxMallService wxMallService; | |||
| public Date getDateAfter(Integer afterDays) { | |||
| Date nowBegin = DateUtils.getDayBegin(new Date()); | |||
| return DateUtils.getSecondsTimeAfter(afterDays*3600*24, nowBegin); | |||
| } | |||
| private void updateQueryParm(WxMerchant wxMerchant,WxBillBaseEntity bill,Date starttime,Date enttime) { | |||
| bill.updateTenantInfo(wxMerchant); | |||
| @@ -104,12 +108,11 @@ public class WxBillAllHelper { | |||
| bill.setStarttime(starttime); | |||
| bill.setEndtime(enttime); | |||
| bill.setRentShopType(wxMerchant.getType()); | |||
| Date nowBegin = DateUtils.getDayBegin(new Date()); | |||
| if (null != wxMerchant.getOweBillBeforeDays()) { | |||
| bill.setOweBillLastTime(DateUtils.getSecondsTimeAfter(wxMerchant.getOweBillBeforeDays()*3600*24, nowBegin)); | |||
| bill.setOweBillLastTime(getDateAfter(wxMerchant.getOweBillBeforeDays())); | |||
| } | |||
| if (null != wxMerchant.getNearBillBeforeDays()) { | |||
| bill.setNearBillLastTime(DateUtils.getSecondsTimeAfter(wxMerchant.getNearBillBeforeDays()*3600*24, nowBegin)); | |||
| bill.setNearBillLastTime(getDateAfter(wxMerchant.getNearBillBeforeDays())); | |||
| } | |||
| } | |||