diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index f4d1fbaf1..840b83e94 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -9,45 +9,22 @@ import com.iformall.common.ResultData; import com.iformall.common.SysConfigConstant; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.SysConfig; -import com.iformall.domain.po.WxBillDaily; -import com.iformall.domain.po.WxBillDeposit; -import com.iformall.domain.po.WxBillOther; -import com.iformall.domain.po.WxBillOtherDeposit; -import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxBillPropertyDeposit; -import com.iformall.domain.po.WxBillRent; -import com.iformall.domain.po.WxBillRentManage; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxShop; import com.iformall.domain.po.WxUserDataRule; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.domain.vo.WxBillAll; -import com.iformall.domain.vo.WxBillAllVo; import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.domain.vo.WxBillHotNotify; 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.SysConfigService; import com.iformall.service.WxBillAllService; -import com.iformall.service.WxBillDailyService; -import com.iformall.service.WxBillDepositService; -import com.iformall.service.WxBillOtherDepositService; -import com.iformall.service.WxBillOtherService; -import com.iformall.service.WxBillPropertyDepositService; -import com.iformall.service.WxBillPropertyService; -import com.iformall.service.WxBillRentManageService; -import com.iformall.service.WxBillRentService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; -import com.iformall.service.WxShopService; import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.Constant; @@ -59,12 +36,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -126,7 +99,7 @@ public class WxBillAllController extends BaseController { 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) { + if (null != config && null != config.getConfigItemValue()) { oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); } wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); @@ -298,7 +271,7 @@ public class WxBillAllController extends BaseController { } SysConfig lqconfig = sysConfigService.getByKey(SysConfigConstant.bill_near_days, getTenantInfo()); Integer nearBillBeforeDays = Constant.bill_near_default_days ; - if (null != lqconfig) { + if (null != lqconfig && null != lqconfig.getConfigItemValue()) { nearBillBeforeDays = Integer.parseInt(lqconfig.getConfigItemValue()); } return new ResultData(getBillList(wxMerchant, btype, nearBillBeforeDays, pageNum, pageSize)); @@ -313,7 +286,7 @@ public class WxBillAllController extends BaseController { } SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); Integer oweBillBeforeDays = 0 ; - if (null != config) { + if (null != config && null != config.getConfigItemValue()) { oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); } wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); @@ -357,7 +330,7 @@ public class WxBillAllController extends BaseController { } SysConfig lqconfig = sysConfigService.getByKey(SysConfigConstant.bill_near_days, getTenantInfo()); Integer nearBillBeforeDays = Constant.bill_near_default_days ; - if (null != lqconfig) { + if (null != lqconfig && null != lqconfig.getConfigItemValue()) { nearBillBeforeDays = Integer.parseInt(lqconfig.getConfigItemValue()); } PageInfo page = getBillList(wxMerchant, btype, nearBillBeforeDays, 1, 10000); @@ -384,7 +357,7 @@ public class WxBillAllController extends BaseController { public ResultData nearBillHot() { SysConfig lqconfig = sysConfigService.getByKey(SysConfigConstant.bill_near_days, getTenantInfo()); Integer nearBillBeforeDays = Constant.bill_near_default_days ; - if (null != lqconfig) { + if (null != lqconfig && null != lqconfig.getConfigItemValue()) { nearBillBeforeDays = Integer.parseInt(lqconfig.getConfigItemValue()); } return new ResultData(getHots(nearBillBeforeDays)); @@ -400,7 +373,7 @@ public class WxBillAllController extends BaseController { } SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); Integer oweBillBeforeDays = 0 ; - if (null != config) { + if (null != config && null != config.getConfigItemValue()) { oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); } wxMerchant.setOweBillBeforeDays(oweBillBeforeDays); @@ -439,7 +412,7 @@ public class WxBillAllController extends BaseController { } SysConfig lqconfig = sysConfigService.getByKey(SysConfigConstant.bill_near_days, getTenantInfo()); Integer nearBillBeforeDays = Constant.bill_near_default_days ; - if (null != lqconfig) { + if (null != lqconfig && null != lqconfig.getConfigItemValue()) { nearBillBeforeDays = Integer.parseInt(lqconfig.getConfigItemValue()); } return new ResultData(getBillSum(wxMerchant, btype, nearBillBeforeDays)); @@ -454,7 +427,7 @@ public class WxBillAllController extends BaseController { } SysConfig config = sysConfigService.getByKey(SysConfigConstant.bill_before_days, getTenantInfo()); Integer oweBillBeforeDays = 0 ; - if (null != config) { + if (null != config && null != config.getConfigItemValue()) { oweBillBeforeDays = Integer.parseInt(config.getConfigItemValue()); } wxMerchant.setOweBillBeforeDays(oweBillBeforeDays);