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

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

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
f2b7faee3e
2 измененных файлов: 22 добавлений и 16 удалений
  1. +17
    -14
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +5
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java

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

@@ -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);
}



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

@@ -113,13 +113,16 @@ public class WxMerchantTradeDailyController extends BaseController {
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());


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