Kaynağa Gözat

Merge commit 'b1c7f763db21fa4f4a9845ffe6cba649489510f2' into release

release_toaliyun_real
luozukai 6 yıl önce
ebeveyn
işleme
e2e2d6271f
2 değiştirilmiş dosya ile 9 ekleme ve 11 silme
  1. +8
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java

+ 8
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Dosyayı Görüntüle

@@ -194,11 +194,10 @@ public class WxBillAllServiceImpl implements WxBillAllService {
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)));
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);
}
}
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(maps);
@@ -208,11 +207,10 @@ public class WxBillAllServiceImpl implements WxBillAllService {
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)));
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);
}
}
return new ResultData(maps);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java Dosyayı Görüntüle

@@ -169,7 +169,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(wxBillRent.getPay()+ dbBill.getOwe());
wxBillRent.setPay(dbBill.getPay()+ dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}


Yükleniyor…
İptal
Kaydet