|
|
|
@@ -138,26 +138,29 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
}) |
|
|
|
public ResultData list(WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum,Integer pageSize) throws Exception{ |
|
|
|
//根据userid查询merchantId |
|
|
|
WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); |
|
|
|
if (user==null) |
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY); |
|
|
|
WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); |
|
|
|
if (merchant==null) |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
wxMerchantTradeDaily.setMerchantId(merchant.getId()); |
|
|
|
// WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); |
|
|
|
// if (user==null) |
|
|
|
// return new ResultData(ErrorCode.USER_IS_EMPTY); |
|
|
|
// WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); |
|
|
|
// if (merchant==null) |
|
|
|
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
// wxMerchantTradeDaily.setMerchantId(merchant.getId()); |
|
|
|
|
|
|
|
PageInfo<WxMerchantTradeDaily> pageInfo = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum,pageSize); |
|
|
|
List<WxMerchantTradeDaily> tradeDailyList = pageInfo.getList(); |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
SimpleDateFormat sdMonth = new SimpleDateFormat("yyyy-MM"); |
|
|
|
|
|
|
|
String startTime = wxMerchantTradeDaily.getMonth()+"-01"; |
|
|
|
String endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); |
|
|
|
String startTime; |
|
|
|
String endTime; |
|
|
|
//month为空默认本月第一天到今天 |
|
|
|
if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ |
|
|
|
startTime = sd.format(DateUtils.getFirstDayForCurrMonth()); |
|
|
|
endTime = sd.format(new Date()); |
|
|
|
}else { |
|
|
|
startTime = wxMerchantTradeDaily.getMonth()+"-01"; |
|
|
|
endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); |
|
|
|
|
|
|
|
//如果是本月,截止到当天 |
|
|
|
if (sdMonth.format(new Date()).equals(wxMerchantTradeDaily.getMonth())) { |
|
|
|
endTime = sd.format(new Date()); |
|
|
|
@@ -179,11 +182,11 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// pageInfo.setList(resultList); |
|
|
|
// for (WxMerchantTradeDaily w:resultList) { |
|
|
|
// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); |
|
|
|
// System.out.println("---------"); |
|
|
|
// } |
|
|
|
pageInfo.setList(resultList); |
|
|
|
for (WxMerchantTradeDaily w:resultList) { |
|
|
|
System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); |
|
|
|
System.out.println("---------"); |
|
|
|
} |
|
|
|
return new ResultData(pageInfo); |
|
|
|
} |
|
|
|
|
|
|
|
|