Просмотр исходного кода

/、.test

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
e1ba8e5227
3 измененных файлов: 10 добавлений и 2 удалений
  1. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java

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

@@ -338,6 +338,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
pageInfo.setPageNum(couponOrderPage.getPageNum()); pageInfo.setPageNum(couponOrderPage.getPageNum());
pageInfo.setPageSize(couponOrderPage.getPageSize()); pageInfo.setPageSize(couponOrderPage.getPageSize());
pageInfo.setPages(couponOrderPage.getPages()); pageInfo.setPages(couponOrderPage.getPages());
pageInfo.setTotal(couponOrderPage.getTotal());
return pageInfo; return pageInfo;
} }
@@ -370,6 +371,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
pageInfo.setPageNum(couponOrderPage.getPageNum()); pageInfo.setPageNum(couponOrderPage.getPageNum());
pageInfo.setPageSize(couponOrderPage.getPageSize()); pageInfo.setPageSize(couponOrderPage.getPageSize());
pageInfo.setPages(couponOrderPage.getPages()); pageInfo.setPages(couponOrderPage.getPages());
pageInfo.setTotal(couponOrderPage.getTotal());
return pageInfo; return pageInfo;
} }
@@ -537,6 +539,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
cvoPageInfo.setPageNum(pageInfo.getPageNum()); cvoPageInfo.setPageNum(pageInfo.getPageNum());
cvoPageInfo.setPageSize(pageInfo.getPageSize()); cvoPageInfo.setPageSize(pageInfo.getPageSize());
cvoPageInfo.setPages(pageInfo.getPages()); cvoPageInfo.setPages(pageInfo.getPages());
cvoPageInfo.setTotal(pageInfo.getTotal());
return cvoPageInfo; return cvoPageInfo;
} }
@@ -699,6 +702,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
retPageInfo.setPageSize(pageInfo.getPageSize()); retPageInfo.setPageSize(pageInfo.getPageSize());
retPageInfo.setList(couponOrderListToCarVoList(wxCouponOrder,pageInfo.getList())); retPageInfo.setList(couponOrderListToCarVoList(wxCouponOrder,pageInfo.getList()));
retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setPages(pageInfo.getPages());
retPageInfo.setTotal(pageInfo.getTotal());
return retPageInfo; return retPageInfo;
} }
@@ -2140,7 +2144,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
retPageInfo.setPageNum(pageInfo.getPageNum()); retPageInfo.setPageNum(pageInfo.getPageNum());
retPageInfo.setPageSize(pageInfo.getPages()); retPageInfo.setPageSize(pageInfo.getPages());
retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setPages(pageInfo.getPages());
retPageInfo.setList(couponOrderToCardCVoList(record,pageInfo.getList()));;
retPageInfo.setList(couponOrderToCardCVoList(record,pageInfo.getList()));
retPageInfo.setTotal(pageInfo.getTotal());
return new ResultData(retPageInfo); return new ResultData(retPageInfo);
} }


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

@@ -128,6 +128,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
pageInfo.setPageNum(sendPageInfo.getPageNum()); pageInfo.setPageNum(sendPageInfo.getPageNum());
pageInfo.setPageSize(sendPageInfo.getPageSize()); pageInfo.setPageSize(sendPageInfo.getPageSize());
pageInfo.setPages(sendPageInfo.getPages()); pageInfo.setPages(sendPageInfo.getPages());
pageInfo.setTotal(sendPageInfo.getTotal());
pageInfo.setList(couponSendToVoList(record,sendPageInfo.getList(),true,false)); pageInfo.setList(couponSendToVoList(record,sendPageInfo.getList(),true,false));
} else { } else {
record.setStatus(EnumCouponSendStatus.VALID.getCode()); record.setStatus(EnumCouponSendStatus.VALID.getCode());
@@ -136,7 +137,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
pageInfo = new PageInfo<WxCouponSendVo>(); pageInfo = new PageInfo<WxCouponSendVo>();
pageInfo.setPageNum(sendPageInfo.getPageNum()); pageInfo.setPageNum(sendPageInfo.getPageNum());
pageInfo.setPageSize(sendPageInfo.getPageSize()); pageInfo.setPageSize(sendPageInfo.getPageSize());
pageInfo.setPages(sendPageInfo.getPages());
pageInfo.setPages(sendPageInfo.getPages());
pageInfo.setTotal(sendPageInfo.getTotal());
pageInfo.setList(couponSendToVoList(record,sendPageInfo.getList(),false,true)); pageInfo.setList(couponSendToVoList(record,sendPageInfo.getList(),false,true));
} }
return pageInfo; return pageInfo;


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

@@ -325,6 +325,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
retPageInfo.setPageNum(pageInfo.getPageNum()); retPageInfo.setPageNum(pageInfo.getPageNum());
retPageInfo.setPageSize(pageInfo.getPageSize()); retPageInfo.setPageSize(pageInfo.getPageSize());
retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setPages(pageInfo.getPages());
retPageInfo.setTotal(pageInfo.getTotal());
retPageInfo.setList(creditHistoryToVoList(wxCreditHistory,pageInfo.getList())); retPageInfo.setList(creditHistoryToVoList(wxCreditHistory,pageInfo.getList()));
return retPageInfo; return retPageInfo;
} }


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