winter 2 лет назад
Родитель
Сommit
71cde179c5
2 измененных файлов: 7 добавлений и 2 удалений
  1. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java

+ 6
- 1
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Просмотреть файл

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




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

@@ -185,7 +185,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
private void handleQueryParam(WxMerchantTradeDaily record) { private void handleQueryParam(WxMerchantTradeDaily record) {
//楼层楼座 //楼层楼座
List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, null, record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode());
List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode());
if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) {
WxMerchant m = new WxMerchant(); WxMerchant m = new WxMerchant();
m.updateTenantInfo(record); m.updateTenantInfo(record);


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