Просмотр исходного кода

[解单][添加][开发解单api]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
2631bd2c79
2 измененных файлов: 34 добавлений и 93 удалений
  1. +34
    -34
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +0
    -59
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java

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

@@ -116,42 +116,42 @@ public class WxMerchantTradeDailyController extends BaseController {
// 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> 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);
}
}
// 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);
// pageInfo.setList(resultList);

// for (WxMerchantTradeDaily w:resultList) {
// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt());


+ 0
- 59
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java Просмотреть файл

@@ -112,66 +112,7 @@ public class WxMerchantTradeDailyController extends BaseController {
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);

// 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;
}

}

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