|
|
|
@@ -86,6 +86,15 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
if(wxMerchantTradeDaily.getTradeAmt()!= null){ |
|
|
|
wxMerchantTradeDaily.setTradeAmt(wxMerchantTradeDaily.getTradeAmt()*100); |
|
|
|
} |
|
|
|
|
|
|
|
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()); |
|
|
|
|
|
|
|
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
@@ -102,6 +111,8 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true) |
|
|
|
}) |
|
|
|
public ResultData list(WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum,Integer pageSize) throws Exception{ |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
|
|
|
//根据userid查询merchantId |
|
|
|
WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); |
|
|
|
if (user==null) |
|
|
|
@@ -112,6 +123,25 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
wxMerchantTradeDaily.setMerchantId(merchant.getId()); |
|
|
|
|
|
|
|
PageInfo<WxMerchantTradeDaily> pageInfo = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum,pageSize); |
|
|
|
|
|
|
|
List<WxMerchantTradeDaily> resultList = pageInfo.getList(); |
|
|
|
// 判断第1条是否是当天 |
|
|
|
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); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
WxMerchantTradeDaily wx = new WxMerchantTradeDaily(); |
|
|
|
wx.setIsToday(1); |
|
|
|
wx.setCreateDate(new Date()); |
|
|
|
resultList.add(0,wx); |
|
|
|
} |
|
|
|
pageInfo.setList(resultList); |
|
|
|
return new ResultData(pageInfo); |
|
|
|
} |
|
|
|
|
|
|
|
|