Browse Source

[修改][结算单][修改跳点率计算]

release_toaliyun_real
luozukai 6 years ago
parent
commit
a4af8cb56b
2 changed files with 12 additions and 0 deletions
  1. +2
    -0
      mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
  2. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 2
- 0
mallinkAdmin/src/test/java/com/iformall/service/test/Test.java View File

@@ -148,6 +148,8 @@ public class Test {
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setTenantId("456");
wxBillAll.setMerchantId(324754110547066880l);
wxBillAll.setPageIndex(1);
wxBillAll.setPageSize(6);
System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll)));
}
}

+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java View File

@@ -191,6 +191,16 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (wxBillAll.getPageIndex() != null && wxBillAll.getPageIndex() != null) {
PageHelper.startPage(wxBillAll.getPageIndex(), wxBillAll.getPageSize());
List<Map<String, Object>> maps = wxBillAllMapper.listData(wxBillAll);
for (Map<String, Object> map:maps) {
Integer billType = ((Long)map.get("billTypeValue")).intValue();
if(EnumBillType.SETTLE.getCode().equals(billType)){
BigDecimal rp = (BigDecimal)map.get("receivePay");
WxBillSettle query = new WxBillSettle();
query.setId((Long)map.get("id"));
Long sum = wxBillSettleRecordMapper.getSumMoneyBySettleId(query);
map.put("owe",rp.subtract(new BigDecimal(sum)));
}
}
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(maps);
return new ResultData(pageInfo);
}


Loading…
Cancel
Save