Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
89e9a4c2b1
2 changed files with 45 additions and 0 deletions
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +40
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java View File

@@ -132,6 +132,11 @@ public class WxBillAllController extends BillBaseController {
vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(),
propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe()));
vo.setMinDate(billAllHelper.getMinDate(rentSum.getMinDate(),rentManageSum.getMinDate(),rentDepositSum.getMinDate(),propertySum.getMinDate(),
propertyDepositSum.getMinDate(),dailySum.getMinDate(),otherSum.getMinDate(),otherDepositSum.getMinDate()));
vo.setMaxDate(billAllHelper.getMaxDate(rentSum.getMaxDate(),rentManageSum.getMaxDate(),rentDepositSum.getMaxDate(),propertySum.getMaxDate(),
propertyDepositSum.getMaxDate(),dailySum.getMaxDate(),otherSum.getMaxDate(),otherDepositSum.getMaxDate()));
retList.add(vo);
}


+ 40
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java View File

@@ -406,6 +406,46 @@ public class WxBillAllHelper {
return "0";
}
public Date getMinDate(Date... date) {
if (null != date && date.length > 0 ) {
Date minDate = null;
for (int i =0 ; i < date.length; i ++) {
Date ndate = date[i];
if (null != ndate) {
if (null == minDate) {
minDate = ndate;
}else {
if (minDate.after(ndate)) {
minDate = ndate;
}
}
}
}
return minDate;
}
return null;
}
public Date getMaxDate(Date... date) {
if (null != date && date.length > 0 ) {
Date maxDate = null;
for (int i =0 ; i < date.length; i ++) {
Date ndate = date[i];
if (null != ndate) {
if (null == maxDate) {
maxDate = ndate;
}else {
if (maxDate.before(ndate)) {
maxDate = ndate;
}
}
}
}
return maxDate;
}
return null;
}
public String getMerchantShopNumber(WxMerchant merchant) {
List<WxShopVo> shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId());
if (null != shopList && shopList.size() > 0 ) {


Loading…
Cancel
Save