@@ -47,37 +47,29 @@ public class WxMerchantTradeDailyController extends BaseController {
}
@ApiOperation("获得昨日 解单列表")
@GetMapping("/listYesterday ")
@ApiOperation("获得解单列表")
@GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "商户-获得昨日解单列表")
public ResultData listYesterday (@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, Integer pageNum, Integer pageSize) {
public ResultData list(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday");
if (wxMerchantTradeDaily == null) wxMerchantTradeDaily = new WxMerchantTradeDailyVo();
wxMerchantTradeDaily.setTenantId(getTenantId());
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.DAY_OF_YEAR, -1);
SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime()));
if (wxMerchantTradeDaily.getReportDate() == null) {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.DAY_OF_YEAR, -1);
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime()));
}
wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC);
PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize);
// 判断第1条是否是当天
List<WxMerchantTradeDailyVo> resultList = page.getList();
if(CollectionUtils.isNotEmpty(resultList)){
try{
if(fmt.parse(resultList.get(0).getReportDate()).equals(fmt.format(new Date()))){
resultList.get(0).setIsToday(1);
}
}catch (Exception e){
e.printStackTrace();
}
}
page.setList(resultList);
return new ResultData(page);
}
@@ -98,12 +90,23 @@ public class WxMerchantTradeDailyController extends BaseController {
}
@ApiOperation("更新解单数据")
@PostMapping("/updateYesterday ")
@PostMapping("/update")
@SystemControllerLog(description = "商户-更新解单数据")
public ResultData updateYesterday (@RequestBody WxMerchantTradeDailyVo wxMerchantTradeDaily) {
public ResultData update(@RequestBody WxMerchantTradeDailyVo wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::updateYesterday");
if (wxMerchantTradeDaily == null ||
wxMerchantTradeDaily.getMerchantId() == null ||
wxMerchantTradeDaily.getTradeAmt() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
wxMerchantTradeDaily.setTenantId(getTenantId());
return wxMerchantTradeDailyService.updateYesterday(wxMerchantTradeDaily);
if (wxMerchantTradeDaily.getReportDate() == null) {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.DAY_OF_YEAR, -1);
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime()));
}
return wxMerchantTradeDailyService.update(wxMerchantTradeDaily);
}
@ApiOperation("查询解单数据")
@@ -115,100 +118,4 @@ public class WxMerchantTradeDailyController extends BaseController {
return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily);
}
/**
* 列表
*
* @param wxMerchantTradeDaily
* @return
*/
@GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)
})
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());
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;
// String endTime;
// //month为空取查询区间开始时间 结束时间
// if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){
// startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate());
// 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());
// }
// }
// List<String> days = DateUtils.getTjTimeList(startTime, endTime,"0");
//
// Map<String,WxMerchantTradeDaily> resultMap = getMap(days);
//
// for (WxMerchantTradeDaily wx:tradeDailyList) {
// resultMap.put(sd.format(wx.getCreateDate()),wx);
// }
// List<WxMerchantTradeDaily> resultList = mapToList(resultMap);
// //判断第1条是否是当天
// if(CollectionUtils.isNotEmpty(resultList)){
// if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){
// resultList.get(0).setIsToday(1);
// }
// }
// pageInfo.setList(resultList);
// 判断第1条是否是当天
List<WxMerchantTradeDaily> resultList = pageInfo.getList();
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);
}
}
for (WxMerchantTradeDaily w:resultList) {
System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt());
System.out.println("---------");
}
return new ResultData(pageInfo);
}
public List<WxMerchantTradeDaily> mapToList(Map<String,WxMerchantTradeDaily> map){
List<WxMerchantTradeDaily> result = new ArrayList<>();
for (String k:map.keySet()) {
result.add(map.get(k));
}
return result;
}
public Map<String,WxMerchantTradeDaily> getMap(List<String> days) throws Exception{
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
Map<String,WxMerchantTradeDaily> map = new LinkedMap();
for (int i = days.size()-1; i >=0 ; i--) {
WxMerchantTradeDaily w = new WxMerchantTradeDaily();
w.setCreateDate(sd.parse(days.get(i)));
map.put(days.get(i),w);
}
return map;
}
}