|
|
|
@@ -129,17 +129,7 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
if(CollectionUtils.isNotEmpty(resultList)){ |
|
|
|
if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){ |
|
|
|
resultList.get(0).setIsToday(1); |
|
|
|
}else{ |
|
|
|
WxMerchantTradeDaily wx = new WxMerchantTradeDaily(); |
|
|
|
wx.setIsToday(1); |
|
|
|
wx.setCreateDate(new Date()); |
|
|
|
resultList.add(0,wx); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
WxMerchantTradeDaily wx = new WxMerchantTradeDaily(); |
|
|
|
wx.setIsToday(1); |
|
|
|
wx.setCreateDate(new Date()); |
|
|
|
resultList.add(0,wx); |
|
|
|
} |
|
|
|
pageInfo.setList(resultList); |
|
|
|
return new ResultData(pageInfo); |
|
|
|
|