winter 1 год назад
Родитель
Сommit
6d9f0811e9
5 измененных файлов: 13 добавлений и 0 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  5. +7
    -0
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Просмотреть файл

@@ -637,6 +637,7 @@ public class WxAllBillController extends BillBaseController {
wxMerchant.updateTenantInfo(getTenantInfo());
//放开时间
//wxMerchant.setNeedPayPreDays(getNearBillBeforeDays());
wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode());
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
if (null != list && list.size() > 0 ) {
List<Long> merchnatIds = new ArrayList<Long>();


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

@@ -362,4 +362,6 @@ public class WxAllBill extends TenantEntity {
public String moneyChangeDetail;
@TableField(exist = false)
public Integer noExtraCreateFrom;
@TableField(exist = false)
private Integer needPayNoDays;
}

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

@@ -471,6 +471,8 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false)
private Integer needPayPreDays;
@TableField(exist = false)
private Integer needPayNoDays;
@TableField(exist = false)
public Integer onlyOweOrNear;


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Просмотреть файл

@@ -101,6 +101,7 @@ public class WxBillAllHelper {
}
bill.setToPayMerchant(wxMerchant.getToPayMerchant());
bill.setIsPreview(wxMerchant.getIsPreview());
bill.setNeedPayNoDays(wxMerchant.getNeedPayNoDays());
}
public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) {


+ 7
- 0
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -98,6 +98,13 @@
(`starttime` &lt;= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') &gt; 0 and status not in (3,6,7,9) and bill_type in (13,21,5))
)
</if>
<if test=" null != needPayNoDays">
and (
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') &gt; 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') &gt; 0 and status not in (3,6,7,9) and bill_type in (13,21,5))
)
</if>
<if test=" null != toPayMerchant">
and (
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') &lt; 0 and bill_type not in (13,21,5))


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