diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 6a8d99548..02f486ef1 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -121,6 +121,7 @@ public class WxBillAllHelper { public WxBillSum getBillSum(WxShop wxShop,Date starttime, Date enttime) { WxAllBill br = new WxAllBill(); + br.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, br,starttime,enttime); WxBillSum rentSum = wxAllBillService.getBillMonthSum(br); if (null == rentSum) { @@ -131,12 +132,14 @@ public class WxBillAllHelper { public List getFeesBillSum(WxShop wxShop,Date starttime, Date enttime) { WxAllBill br = new WxAllBill(); + br.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, br,starttime,enttime); return wxAllBillService.getFeesBillSum(br); } public List getBillHotNotify(WxShop wxShop,Date starttime, Date enttime) { WxAllBill br = new WxAllBill(); + br.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, br,starttime,enttime); br.setIsPreview(EnumYesOrNo.NO.getCode()); return wxAllBillService.getBillHotNotify(br); @@ -200,6 +203,7 @@ public class WxBillAllHelper { public List getOwdShopIds(WxShop wxShop,Date starttime, Date enttime) { WxAllBill br = new WxAllBill(); + br.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, br,starttime,enttime); return wxAllBillService.getShopIds(br); } @@ -209,6 +213,7 @@ public class WxBillAllHelper { bq.updateTenantInfo(tenantEntity); bq.setRentContractId(rentContractId); bq.setIsPreview(EnumYesOrNo.NO.getCode()); + bq.setIsDel(EnumYesOrNo.NO.getCode()); //bq.setBillType(EnumBillAllType.RENT.getCode()); //bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); //bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); @@ -234,6 +239,7 @@ public class WxBillAllHelper { public PageInfo getBillList(WxShop wxShop,Integer pageNum, Integer pageSize) { WxAllBill wxAllBill = new WxAllBill(); + wxAllBill.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, wxAllBill,wxShop.getStarttime(),wxShop.getEndtime()); wxAllBill.setIsPreview(EnumYesOrNo.NO.getCode()); wxAllBill.setSortColumns("starttime asc"); @@ -242,7 +248,9 @@ public class WxBillAllHelper { public List getMerchantBillList(WxShop wxShop) { WxAllBill wxBillRent = new WxAllBill(); + wxBillRent.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime()); + wxBillRent.setIsDel(EnumYesOrNo.NO.getCode()); wxBillRent.setSortColumns("starttime asc"); return wxAllBillService.list(wxBillRent); } @@ -254,6 +262,7 @@ public class WxBillAllHelper { public List getBillNotifyList(WxShop wxShop,Integer notifyed) { WxAllBill wxBillRent = new WxAllBill(); + wxBillRent.setIsDel(EnumYesOrNo.NO.getCode()); updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime()); wxBillRent.setNotifyed(notifyed); wxBillRent.setSortColumns("starttime asc"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 7ae5a2558..05e593950 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -394,6 +394,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxAllBill abq = new WxAllBill(); abq.updateTenantInfo(record); abq.setShopId(record.getId()); + abq.setIsDel(EnumYesOrNo.NO.getCode()); //abq.setDepositHasMoney(EnumYesOrNo.YES.getCode()); BigDecimal total = wxAllBillService.getRemainAdvanceSum(abq); if (null == total) { @@ -408,6 +409,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { //查询预存账单 WxAllBill abq = new WxAllBill(); abq.updateTenantInfo(record); + abq.setIsDel(EnumYesOrNo.NO.getCode()); //TODO 查预存的科目 //abq.setBillType(EnumBillAllType.ADVANCE.getCode()); abq.setShopId(record.getId()); @@ -436,6 +438,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { //查询预存账单 WxAllBill abq = new WxAllBill(); abq.updateTenantInfo(record); + abq.setIsDel(EnumYesOrNo.NO.getCode()); //TODO 查预存的科目 //abq.setBillType(EnumBillAllType.ADVANCE.getCode()); abq.setShopId(record.getId()); @@ -558,6 +561,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxAllBill abq = new WxAllBill(); abq.updateTenantInfo(dto); abq.setNotInIds(billIdList); + abq.setIsDel(EnumYesOrNo.NO.getCode()); //abq.setDepositHasMoney(EnumYesOrNo.YES.getCode()); abq.setSortColumns(SortField.Createtime_ASC); abq.setShopId(shopId);; @@ -579,6 +583,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxAllBill abq = new WxAllBill(); abq.updateTenantInfo(dto); abq.setEnergyFeesId(dto.getFeesId()); + abq.setIsDel(EnumYesOrNo.NO.getCode()); //TODO 查预存的科目 //abq.setBillType(EnumBillAllType.ADVANCE.getCode()); abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode());