winter 1 год назад
Родитель
Сommit
ee8f48811c
17 измененных файлов: 80 добавлений и 24 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java
  5. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
  6. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
  7. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
  9. +24
    -24
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  10. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  11. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  12. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
  13. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
  14. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  15. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  16. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  17. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

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

@@ -35,6 +35,7 @@ public interface WxBillDailyService {
* @return
*/
PageInfo<WxBillDaily> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize);
List<WxBillDaily> list(WxBillDaily record);
List<WxBillNotify> notifyList(WxBillDaily record);

void updateBillStatus(WxBillDaily record);


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

@@ -34,6 +34,7 @@ public interface WxBillDepositService {
* @return
*/
PageInfo<WxBillDeposit> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize);
List<WxBillDeposit> list(WxBillDeposit record);
List<WxBillNotify> notifyList(WxBillDeposit record);

void updateBillStatus(WxBillDeposit record);


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

@@ -34,6 +34,7 @@ public interface WxBillOtherDepositService {
* @return
*/
PageInfo<WxBillOtherDeposit> listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize);
List<WxBillOtherDeposit> list(WxBillOtherDeposit record);
List<WxBillNotify> notifyList(WxBillOtherDeposit record);

void updateBillStatus(WxBillOtherDeposit record);


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

@@ -34,6 +34,7 @@ public interface WxBillOtherService {
* @return
*/
PageInfo<WxBillOther> listAsPage(WxBillOther record, Integer pageIndex, Integer pageSize);
List<WxBillOther> list(WxBillOther record);
List<WxBillNotify> notifyList(WxBillOther record);

void updateBillStatus(WxBillOther record);


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

@@ -37,6 +37,7 @@ public interface WxBillPropertyDepositService {
* @return
*/
PageInfo<WxBillPropertyDeposit> listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize);
List<WxBillPropertyDeposit> list(WxBillPropertyDeposit record);
List<WxBillNotify> notifyList(WxBillPropertyDeposit record);

void updateBillStatus(WxBillPropertyDeposit record);


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

@@ -37,6 +37,7 @@ public interface WxBillPropertyService {
* @return
*/
PageInfo<WxBillProperty> listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize);
List<WxBillProperty> list(WxBillProperty record);
List<WxBillNotify> notifyList(WxBillProperty record);

void updateBillStatus(WxBillProperty record);


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

@@ -34,6 +34,7 @@ public interface WxBillRentManageService {
* @return
*/
PageInfo<WxBillRentManage> listAsPage(WxBillRentManage wxBillRentManage, Integer pageIndex, Integer pageSize);
List<WxBillRentManage> list(WxBillRentManage wxBillRentManage);
List<WxBillNotify> notifyList(WxBillRentManage wxBillRentManage);

void updateBillStatus(WxBillRentManage record);


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

@@ -34,6 +34,7 @@ public interface WxBillRentService {
* @return
*/
PageInfo<WxBillRent> listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize);
List<WxBillRent> list(WxBillRent record);
List<WxBillNotify> notifyList(WxBillRent record);

void updateBillStatus(WxBillRent record);


+ 24
- 24
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Просмотреть файл

@@ -581,65 +581,65 @@ public class WxBillAllHelper {
WxBillRent wxBillRent = new WxBillRent();
updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillRent.setSortColumns("starttime asc");
PageInfo<WxBillRent> rentpage = wxBillRentService.listAsPage(wxBillRent, 1, 30);
if (null != rentpage && null != rentpage.getList() && rentpage.getList().size() > 0 ) {
retList.addAll(rentpage.getList());
List<WxBillRent> rentpage = wxBillRentService.list(wxBillRent);
if (null != rentpage && rentpage.size() > 0 ) {
retList.addAll(rentpage);
}
WxBillRentManage wxBillRentManage = new WxBillRentManage();
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillRentManage.setSortColumns("starttime asc");
PageInfo<WxBillRentManage> managepage = wxBillRentManageService.listAsPage(wxBillRentManage, 1, 30);
if (null != managepage && null != managepage.getList() && managepage.getList().size() > 0 ) {
retList.addAll(managepage.getList());
List<WxBillRentManage> managepage = wxBillRentManageService.list(wxBillRentManage);
if (null != managepage && managepage.size() > 0 ) {
retList.addAll(managepage);
}
WxBillDeposit wxBillDeposit = new WxBillDeposit();
updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillDeposit.setSortColumns("starttime asc");
PageInfo<WxBillDeposit> rentdepostpage = wxBillRentDepositService.listAsPage(wxBillDeposit, 1, 30);
if (null != rentdepostpage && null != rentdepostpage.getList() && rentdepostpage.getList().size() > 0 ) {
retList.addAll(rentdepostpage.getList());
List<WxBillDeposit> rentdepostpage = wxBillRentDepositService.list(wxBillDeposit);
if (null != rentdepostpage && rentdepostpage.size() > 0 ) {
retList.addAll(rentdepostpage);
}
WxBillProperty wxBillProperty = new WxBillProperty();
updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillProperty.setSortColumns("starttime asc");
PageInfo<WxBillProperty> propertypage = wxBillPropertyService.listAsPage(wxBillProperty, 1, 30);
if (null != propertypage && null != propertypage.getList() && propertypage.getList().size() > 0 ) {
retList.addAll(propertypage.getList());
List<WxBillProperty> propertypage = wxBillPropertyService.list(wxBillProperty);
if (null != propertypage && propertypage.size() > 0 ) {
retList.addAll(propertypage);
}
WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit();
updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillPropertyDeposit.setSortColumns("starttime asc");
PageInfo<WxBillPropertyDeposit> propertyDepositpage = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, 1, 30);
if (null != propertyDepositpage && null != propertyDepositpage.getList() && propertyDepositpage.getList().size() > 0 ) {
retList.addAll(propertyDepositpage.getList());
List<WxBillPropertyDeposit> propertyDepositpage = wxBillPropertyDepositService.list(wxBillPropertyDeposit);
if (null != propertyDepositpage && propertyDepositpage.size() > 0 ) {
retList.addAll(propertyDepositpage);
}
WxBillDaily wxBillDaily = new WxBillDaily();
updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillDaily.setSortColumns("starttime asc");
PageInfo<WxBillDaily> dailypage = wxBillDailyService.listAsPage(wxBillDaily, 1, 30);
if (null != dailypage && null != dailypage.getList() && dailypage.getList().size() > 0 ) {
retList.addAll(dailypage.getList());
List<WxBillDaily> dailypage = wxBillDailyService.list(wxBillDaily);
if (null != dailypage && dailypage.size() > 0 ) {
retList.addAll(dailypage);
}
WxBillOther wxBillOther = new WxBillOther();
updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillOther.setSortColumns("starttime asc");
PageInfo<WxBillOther> otherpage = wxBillOtherService.listAsPage(wxBillOther, 1, 30);
if (null != otherpage && null != otherpage.getList() && otherpage.getList().size() > 0 ) {
retList.addAll(otherpage.getList());
List<WxBillOther> otherpage = wxBillOtherService.list(wxBillOther);
if (null != otherpage && otherpage.size() > 0 ) {
retList.addAll(otherpage);
}
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit();
updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime());
wxBillOtherDeposit.setSortColumns("starttime asc");
PageInfo<WxBillOtherDeposit> odpage = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, 1, 30);
if (null != odpage && null != odpage.getList() && odpage.getList().size() > 0 ) {
retList.addAll(odpage.getList());
List<WxBillOtherDeposit> odpage = wxBillOtherDepositService.list(wxBillOtherDeposit);
if (null != odpage && odpage.size() > 0 ) {
retList.addAll(odpage);
}
return retList;
}


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

@@ -104,6 +104,12 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill);
}
@Override
public List<WxBillDaily> list(WxBillDaily record) {
updateQueryParam(record);
return wxBillDailyMapper.queryBillDailyList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillDaily record) {
updateQueryParam(record);


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

@@ -109,6 +109,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize);
}
@Override
public List<WxBillDeposit> list(WxBillDeposit record) {
setQueryParam(record);
return wxBillDepositMapper.queryBillDepositList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillDeposit record) {
setQueryParam(record);


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

@@ -98,6 +98,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill);
}
@Override
public List<WxBillOtherDeposit> list(WxBillOtherDeposit record) {
updateQueryParam(record);
return wxBillOtherDepositMapper.queryBillList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillOtherDeposit record) {
updateQueryParam(record);


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

@@ -97,6 +97,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
return getBillOtherPropertyList(pageIndex, pageSize, record, wxPayAccountBill);
}
@Override
public List<WxBillOther> list(WxBillOther record) {
updateQueryParam(record);
return wxBillOtherMapper.queryBillList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillOther record) {
updateQueryParam(record);


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

@@ -103,6 +103,12 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize);
}
@Override
public List<WxBillPropertyDeposit> list(WxBillPropertyDeposit record) {
updateQueryParam(record);
return wxBillPropertyDepositMapper.queryBillDepositList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillPropertyDeposit record) {
updateQueryParam(record);


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

@@ -119,6 +119,12 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
return getBillPropertyList(pageIndex, pageSize, wxPayAccountBill, record);
}
@Override
public List<WxBillProperty> list(WxBillProperty record) {
updateQueryParam(record);
return wxBillPropertyMapper.queryBillPropertyList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillProperty record) {
updateQueryParam(record);


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

@@ -104,6 +104,12 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
return getBillRentManageList(pageIndex, pageSize, wxBillRentManage, wxPayAccountBill);
}
@Override
public List<WxBillRentManage> list(WxBillRentManage wxBillRentManage) {
updateQueryParam(wxBillRentManage);
return wxBillRentManageMapper.queryBillManageList(wxBillRentManage);
}
@Override
public List<WxBillNotify> notifyList(WxBillRentManage record) {
updateQueryParam(record);


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

@@ -123,6 +123,12 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
return getBillRentPropertyList(pageIndex,pageSize,record,wxPayAccountBill);
}
@Override
public List<WxBillRent> list(WxBillRent record) {
updateQueryParam(record);
return wxBillRentMapper.queryBillRentList(record);
}
@Override
public List<WxBillNotify> notifyList(WxBillRent record) {
updateQueryParam(record);


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