diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index f24b062d5..c9426f3ad 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -185,6 +185,14 @@ public class WxBillController extends BaseController { return new ResultData(Result.ERROR,"分类非法"); } } + if (null != wxMerchant.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxMerchant.getOnlyOweOrNear().intValue()) { + wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxMerchant.getOnlyOweOrNear().intValue()) { + wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); + } + } wxMerchant.setId(this.getLoginBUser().getMerchantId()); wxMerchant.updateTenantInfo(getTenantInfo()); return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index 39832c0a7..3c79f66b7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -218,6 +218,14 @@ public class WxMallAdminController extends BaseController { return new ResultData(Result.ERROR,"分类非法"); } } + if (null != wxMerchant.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxMerchant.getOnlyOweOrNear().intValue()) { + wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxMerchant.getOnlyOweOrNear().intValue()) { + wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); + } + } return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 430716426..fadf08e4f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -472,4 +472,7 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private Integer needPayPreDays; + @TableField(exist = false) + public Integer onlyOweOrNear; + } 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 7ef99d940..fb9549b90 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -19,9 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.github.pagehelper.PageInfo; +import com.iformall.common.SysConfigConstant; import com.iformall.domain.dto.WxBillPayDTO; import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillAdvance; import com.iformall.domain.po.WxBillDaily; @@ -45,6 +47,7 @@ import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillDailyType; +import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumBillType; import com.iformall.enums.EnumRentContractManageFeeType; @@ -137,7 +140,6 @@ public class WxBillAllHelper { if (null != wxMerchant.getNeedPayPreDays()) { bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); } - } public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) {