winter 10 месяцев назад
Родитель
Сommit
2d667e9928
2 измененных файлов: 14 добавлений и 0 удалений
  1. +9
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 9
- 0
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) { public WxBillSum getBillSum(WxShop wxShop,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill(); WxAllBill br = new WxAllBill();
br.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, br,starttime,enttime); updateQueryParm(wxShop, br,starttime,enttime);
WxBillSum rentSum = wxAllBillService.getBillMonthSum(br); WxBillSum rentSum = wxAllBillService.getBillMonthSum(br);
if (null == rentSum) { if (null == rentSum) {
@@ -131,12 +132,14 @@ public class WxBillAllHelper {
public List<WxBillSum> getFeesBillSum(WxShop wxShop,Date starttime, Date enttime) { public List<WxBillSum> getFeesBillSum(WxShop wxShop,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill(); WxAllBill br = new WxAllBill();
br.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, br,starttime,enttime); updateQueryParm(wxShop, br,starttime,enttime);
return wxAllBillService.getFeesBillSum(br); return wxAllBillService.getFeesBillSum(br);
} }
public List<WxBillHotNotify> getBillHotNotify(WxShop wxShop,Date starttime, Date enttime) { public List<WxBillHotNotify> getBillHotNotify(WxShop wxShop,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill(); WxAllBill br = new WxAllBill();
br.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, br,starttime,enttime); updateQueryParm(wxShop, br,starttime,enttime);
br.setIsPreview(EnumYesOrNo.NO.getCode()); br.setIsPreview(EnumYesOrNo.NO.getCode());
return wxAllBillService.getBillHotNotify(br); return wxAllBillService.getBillHotNotify(br);
@@ -200,6 +203,7 @@ public class WxBillAllHelper {
public List<Long> getOwdShopIds(WxShop wxShop,Date starttime, Date enttime) { public List<Long> getOwdShopIds(WxShop wxShop,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill(); WxAllBill br = new WxAllBill();
br.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, br,starttime,enttime); updateQueryParm(wxShop, br,starttime,enttime);
return wxAllBillService.getShopIds(br); return wxAllBillService.getShopIds(br);
} }
@@ -209,6 +213,7 @@ public class WxBillAllHelper {
bq.updateTenantInfo(tenantEntity); bq.updateTenantInfo(tenantEntity);
bq.setRentContractId(rentContractId); bq.setRentContractId(rentContractId);
bq.setIsPreview(EnumYesOrNo.NO.getCode()); bq.setIsPreview(EnumYesOrNo.NO.getCode());
bq.setIsDel(EnumYesOrNo.NO.getCode());
//bq.setBillType(EnumBillAllType.RENT.getCode()); //bq.setBillType(EnumBillAllType.RENT.getCode());
//bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); //bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId());
//bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); //bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode());
@@ -234,6 +239,7 @@ public class WxBillAllHelper {
public PageInfo<WxAllBill> getBillList(WxShop wxShop,Integer pageNum, Integer pageSize) { public PageInfo<WxAllBill> getBillList(WxShop wxShop,Integer pageNum, Integer pageSize) {
WxAllBill wxAllBill = new WxAllBill(); WxAllBill wxAllBill = new WxAllBill();
wxAllBill.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, wxAllBill,wxShop.getStarttime(),wxShop.getEndtime()); updateQueryParm(wxShop, wxAllBill,wxShop.getStarttime(),wxShop.getEndtime());
wxAllBill.setIsPreview(EnumYesOrNo.NO.getCode()); wxAllBill.setIsPreview(EnumYesOrNo.NO.getCode());
wxAllBill.setSortColumns("starttime asc"); wxAllBill.setSortColumns("starttime asc");
@@ -242,7 +248,9 @@ public class WxBillAllHelper {
public List<WxAllBill> getMerchantBillList(WxShop wxShop) { public List<WxAllBill> getMerchantBillList(WxShop wxShop) {
WxAllBill wxBillRent = new WxAllBill(); WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime()); updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime());
wxBillRent.setIsDel(EnumYesOrNo.NO.getCode());
wxBillRent.setSortColumns("starttime asc"); wxBillRent.setSortColumns("starttime asc");
return wxAllBillService.list(wxBillRent); return wxAllBillService.list(wxBillRent);
} }
@@ -254,6 +262,7 @@ public class WxBillAllHelper {
public List<WxBillNotify> getBillNotifyList(WxShop wxShop,Integer notifyed) { public List<WxBillNotify> getBillNotifyList(WxShop wxShop,Integer notifyed) {
WxAllBill wxBillRent = new WxAllBill(); WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setIsDel(EnumYesOrNo.NO.getCode());
updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime()); updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime());
wxBillRent.setNotifyed(notifyed); wxBillRent.setNotifyed(notifyed);
wxBillRent.setSortColumns("starttime asc"); wxBillRent.setSortColumns("starttime asc");


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

@@ -394,6 +394,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxAllBill abq = new WxAllBill(); WxAllBill abq = new WxAllBill();
abq.updateTenantInfo(record); abq.updateTenantInfo(record);
abq.setShopId(record.getId()); abq.setShopId(record.getId());
abq.setIsDel(EnumYesOrNo.NO.getCode());
//abq.setDepositHasMoney(EnumYesOrNo.YES.getCode()); //abq.setDepositHasMoney(EnumYesOrNo.YES.getCode());
BigDecimal total = wxAllBillService.getRemainAdvanceSum(abq); BigDecimal total = wxAllBillService.getRemainAdvanceSum(abq);
if (null == total) { if (null == total) {
@@ -408,6 +409,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
//查询预存账单 //查询预存账单
WxAllBill abq = new WxAllBill(); WxAllBill abq = new WxAllBill();
abq.updateTenantInfo(record); abq.updateTenantInfo(record);
abq.setIsDel(EnumYesOrNo.NO.getCode());
//TODO 查预存的科目 //TODO 查预存的科目
//abq.setBillType(EnumBillAllType.ADVANCE.getCode()); //abq.setBillType(EnumBillAllType.ADVANCE.getCode());
abq.setShopId(record.getId()); abq.setShopId(record.getId());
@@ -436,6 +438,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
//查询预存账单 //查询预存账单
WxAllBill abq = new WxAllBill(); WxAllBill abq = new WxAllBill();
abq.updateTenantInfo(record); abq.updateTenantInfo(record);
abq.setIsDel(EnumYesOrNo.NO.getCode());
//TODO 查预存的科目 //TODO 查预存的科目
//abq.setBillType(EnumBillAllType.ADVANCE.getCode()); //abq.setBillType(EnumBillAllType.ADVANCE.getCode());
abq.setShopId(record.getId()); abq.setShopId(record.getId());
@@ -558,6 +561,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxAllBill abq = new WxAllBill(); WxAllBill abq = new WxAllBill();
abq.updateTenantInfo(dto); abq.updateTenantInfo(dto);
abq.setNotInIds(billIdList); abq.setNotInIds(billIdList);
abq.setIsDel(EnumYesOrNo.NO.getCode());
//abq.setDepositHasMoney(EnumYesOrNo.YES.getCode()); //abq.setDepositHasMoney(EnumYesOrNo.YES.getCode());
abq.setSortColumns(SortField.Createtime_ASC); abq.setSortColumns(SortField.Createtime_ASC);
abq.setShopId(shopId);; abq.setShopId(shopId);;
@@ -579,6 +583,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxAllBill abq = new WxAllBill(); WxAllBill abq = new WxAllBill();
abq.updateTenantInfo(dto); abq.updateTenantInfo(dto);
abq.setEnergyFeesId(dto.getFeesId()); abq.setEnergyFeesId(dto.getFeesId());
abq.setIsDel(EnumYesOrNo.NO.getCode());
//TODO 查预存的科目 //TODO 查预存的科目
//abq.setBillType(EnumBillAllType.ADVANCE.getCode()); //abq.setBillType(EnumBillAllType.ADVANCE.getCode());
abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode());


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