Просмотр исходного кода

[商户账单][修改][生成催缴单]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
12b99debe4
2 измененных файлов: 11 добавлений и 9 удалений
  1. +10
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 10
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -603,19 +603,15 @@ public class WxBillAllServiceImpl implements WxBillAllService {
//付款方式
WxPayAccountBill wxPayAccountBill = new WxPayAccountBill();
wxPayAccountBill.setTenantId(wxBillAll.getTenantId());
wxPayAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill);
if (wxPayAccountBill != null) {
result.put("accountNumber", wxPayAccountBill.getBankCardId());
result.put("accountName", wxPayAccountBill.getBankAccountName());
WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill);
if (payAccountBill != null) {
result.put("accountNumber", payAccountBill.getBankCardId());
result.put("accountName", payAccountBill.getBankAccountName());
} else {
result.put("accountNumber", " ");
result.put("accountName", " ");
}

//账单时间段
result.put("starttime", wxBillAll.getStarttime());
result.put("endtime", wxBillAll.getEndtime().substring(0, 10));

//编号
String number = "JF" + DateUtils.getSystemTime("yyyyMMddHHmmss");
result.put("number", number);
@@ -627,6 +623,12 @@ public class WxBillAllServiceImpl implements WxBillAllService {
statusList.add(EnumBillRentStatus.WAIT_PAY.getCode());
statusList.add(EnumBillRentStatus.NOT_EXPIRED.getCode());
wxBillAll.setStatusList(statusList);
//账单时间段
result.put("starttime", wxBillAll.getStarttime());
result.put("endtime", wxBillAll.getEndtime().substring(0, 10));
} else {
result.put("starttime", " ");
result.put("endtime", " ");
}
Integer filterHasPay = wxBillAll.getFilterHasPay();
List<WxBillAllVo> list = wxBillAllMapper.list(wxBillAll);


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

@@ -85,7 +85,7 @@
rent_shop_type,'[]' shop_info
from wx_bill_other
union
select id,merchant_id,shop_id,tenant_id,name,8 bill_type_value,'其他押金' bill_type,0 as
select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
from wx_bill_other_deposit


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