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

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

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
b557b2d658
2 измененных файлов: 25 добавлений и 0 удалений
  1. +14
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java

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

@@ -55,6 +55,7 @@ public class WxMerchantTradeDailyController extends BaseController {
@SystemControllerLog(description = "商户-获得昨日解单列表")
public ResultData listYesterday(@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();
@@ -64,6 +65,19 @@ public class WxMerchantTradeDailyController extends BaseController {
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);
}



+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java Просмотреть файл

@@ -80,6 +80,17 @@ public class WxMerchantTradeDailyVo extends BaseEntity {
@Transient
private String proof;

@Transient
private Integer isToday;

public Integer getIsToday() {
return isToday;
}

public void setIsToday(Integer isToday) {
this.isToday = isToday;
}

public String getTradeCount() {
return tradeCount;
}


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