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

[修改][结算单][修改结算单]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
760a7fb179
2 измененных файлов: 8 добавлений и 8 удалений
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml

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

@@ -194,11 +194,11 @@ public class WxBillAllServiceImpl implements WxBillAllService {
for (Map<String, Object> map:maps) {
Integer billType = ((Long)map.get("billTypeValue")).intValue();
if(EnumBillType.SETTLE.getCode().equals(billType)){
logger.info("-----------------");
Long id = (Long)map.get("id");
WxBillSettle settle = wxBillSettleService.getById(id,EnumFilterSettle.YES.getCode());
BigDecimal money = new BigDecimal(settle.getBalance()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
map.put("owe",money);
map.put("owe",settle.getBalance());
settle = wxBillSettleService.getById(id,EnumFilterSettle.NO.getCode());
map.put("receivePay",settle.getBalance());
}
}
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(maps);
@@ -208,11 +208,11 @@ public class WxBillAllServiceImpl implements WxBillAllService {
for (Map<String, Object> map:maps) {
Integer billType = ((Long)map.get("billTypeValue")).intValue();
if(EnumBillType.SETTLE.getCode().equals(billType)){
logger.info("-----------------");
Long id = (Long)map.get("id");
WxBillSettle settle = wxBillSettleService.getById(id,EnumFilterSettle.YES.getCode());
BigDecimal money = new BigDecimal(settle.getBalance()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
map.put("owe",money);
map.put("owe",settle.getBalance());
settle = wxBillSettleService.getById(id,EnumFilterSettle.NO.getCode());
map.put("receivePay",settle.getBalance());
}
}
return new ResultData(maps);


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

@@ -111,7 +111,7 @@

union all
select id, id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as
need_pay,subsidy receive_pay,0 pay,0 owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy
need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy
) bill
on(bl.bill_id = bill.id)
where 1=1
@@ -186,7 +186,7 @@

union all
select id, id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as
need_pay,subsidy receive_pay,0 pay,0 owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy
need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy
) bill

where 1=1


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