| @@ -637,6 +637,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | wxMerchant.updateTenantInfo(getTenantInfo()); | ||||
| //放开时间 | //放开时间 | ||||
| //wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); | //wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); | ||||
| wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); | |||||
| List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant); | List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant); | ||||
| if (null != list && list.size() > 0 ) { | if (null != list && list.size() > 0 ) { | ||||
| List<Long> merchnatIds = new ArrayList<Long>(); | List<Long> merchnatIds = new ArrayList<Long>(); | ||||
| @@ -362,4 +362,6 @@ public class WxAllBill extends TenantEntity { | |||||
| public String moneyChangeDetail; | public String moneyChangeDetail; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| public Integer noExtraCreateFrom; | public Integer noExtraCreateFrom; | ||||
| @TableField(exist = false) | |||||
| private Integer needPayNoDays; | |||||
| } | } | ||||
| @@ -471,6 +471,8 @@ public class WxMerchant extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer needPayPreDays; | private Integer needPayPreDays; | ||||
| @TableField(exist = false) | |||||
| private Integer needPayNoDays; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| public Integer onlyOweOrNear; | public Integer onlyOweOrNear; | ||||
| @@ -101,6 +101,7 @@ public class WxBillAllHelper { | |||||
| } | } | ||||
| bill.setToPayMerchant(wxMerchant.getToPayMerchant()); | bill.setToPayMerchant(wxMerchant.getToPayMerchant()); | ||||
| bill.setIsPreview(wxMerchant.getIsPreview()); | bill.setIsPreview(wxMerchant.getIsPreview()); | ||||
| bill.setNeedPayNoDays(wxMerchant.getNeedPayNoDays()); | |||||
| } | } | ||||
| public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { | public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { | ||||
| @@ -98,6 +98,13 @@ | |||||
| (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) | (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) | ||||
| ) | ) | ||||
| </if> | </if> | ||||
| <if test=" null != needPayNoDays"> | |||||
| and ( | |||||
| ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7,9) and bill_type not in (13,21,5)) | |||||
| or | |||||
| ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) | |||||
| ) | |||||
| </if> | |||||
| <if test=" null != toPayMerchant"> | <if test=" null != toPayMerchant"> | ||||
| and ( | and ( | ||||
| ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5)) | ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5)) | ||||