winter 1 год назад
Родитель
Сommit
a612412d9f
4 измененных файлов: 22 добавлений и 1 удалений
  1. +8
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  2. +8
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  4. +3
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java

+ 8
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Просмотреть файл

@@ -185,6 +185,14 @@ public class WxBillController extends BaseController {
return new ResultData(Result.ERROR,"分类非法"); 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.setId(this.getLoginBUser().getMerchantId());
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize));


+ 8
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java Просмотреть файл

@@ -218,6 +218,14 @@ public class WxMallAdminController extends BaseController {
return new ResultData(Result.ERROR,"分类非法"); 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)); return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize));
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -472,4 +472,7 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private Integer needPayPreDays; private Integer needPayPreDays;
@TableField(exist = false)
public Integer onlyOweOrNear;
} }

+ 3
- 1
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 org.springframework.stereotype.Service;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.SysConfigConstant;
import com.iformall.domain.dto.WxBillPayDTO; import com.iformall.domain.dto.WxBillPayDTO;
import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.dto.WxBillReceiveUpdateDTO;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxBillAdvance; import com.iformall.domain.po.WxBillAdvance;
import com.iformall.domain.po.WxBillDaily; 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.EnumBillAction;
import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumBillDailyType; import com.iformall.enums.EnumBillDailyType;
import com.iformall.enums.EnumBillOweOrNearType;
import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumBillStatus;
import com.iformall.enums.EnumBillType; import com.iformall.enums.EnumBillType;
import com.iformall.enums.EnumRentContractManageFeeType; import com.iformall.enums.EnumRentContractManageFeeType;
@@ -137,7 +140,6 @@ public class WxBillAllHelper {
if (null != wxMerchant.getNeedPayPreDays()) { if (null != wxMerchant.getNeedPayPreDays()) {
bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays()));
} }
} }
public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) { public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) {


Загрузка…
Отмена
Сохранить