|
|
|
@@ -9,6 +9,7 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.WxMerchantTradeDaily; |
|
|
|
import com.iformall.domain.po.WxMerchantTradeDailyHistory; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.BaseEntity.SortField; |
|
|
|
import com.iformall.domain.vo.WxMerchantTradeDailyVo; |
|
|
|
@@ -48,7 +49,11 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
if (wxMerchantTradeDaily == null) |
|
|
|
wxMerchantTradeDaily = new WxMerchantTradeDaily(); |
|
|
|
wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); |
|
|
|
PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); |
|
|
|
|
|
|
|
|