|
|
|
@@ -94,37 +94,6 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 详情 |
|
|
|
* @param wxMerchantTradeDaily |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@ApiOperation("详情") |
|
|
|
@GetMapping("findById") |
|
|
|
public ResultData findById(WxMerchantTradeDaily wxMerchantTradeDaily) { |
|
|
|
logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::findById"); |
|
|
|
String tenantId = getTenantId(); |
|
|
|
wxMerchantTradeDaily.setTenantId(tenantId); |
|
|
|
return new ResultData(wxMerchantTradeDailyService.getById(wxMerchantTradeDaily.getId())); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 保存或编辑 |
|
|
|
* @param wxMerchantTradeDaily |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@ApiOperation("保存或编辑") |
|
|
|
@PostMapping("saveOrUpdate") |
|
|
|
public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { |
|
|
|
logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); |
|
|
|
wxMerchantTradeDaily.setTenantId(super.getTenantId()); |
|
|
|
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 列表 |
|
|
|
* |
|
|
|
@@ -153,9 +122,9 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
|
|
|
|
String startTime; |
|
|
|
String endTime; |
|
|
|
//month为空默认本月第一天到今天 |
|
|
|
//month为空取查询区间开始时间 结束时间 |
|
|
|
if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ |
|
|
|
startTime = sd.format(DateUtils.getFirstDayForCurrMonth()); |
|
|
|
startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate()); |
|
|
|
endTime = sd.format(new Date()); |
|
|
|
}else { |
|
|
|
startTime = wxMerchantTradeDaily.getMonth()+"-01"; |
|
|
|
@@ -183,10 +152,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("---------"); |
|
|
|
} |
|
|
|
|
|
|
|
// for (WxMerchantTradeDaily w:resultList) { |
|
|
|
// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); |
|
|
|
// System.out.println("---------"); |
|
|
|
// } |
|
|
|
return new ResultData(pageInfo); |
|
|
|
} |
|
|
|
|
|
|
|
|