diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index f54259d8e..6b259c324 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -39,24 +39,32 @@ public class WxDateAmountRecordController extends BaseController public ResultData getRecord() { Calendar c =Calendar.getInstance(); int weekOfYear =c.get(Calendar.WEEK_OF_YEAR); + int day =c.get(Calendar.DAY_OF_WEEK); WxDateAmountRecord temp = new WxDateAmountRecord(); - temp.setDayOfWeek(weekOfYear); + temp.setWeekOfYear(weekOfYear); WxMerchantBUser u = getUser(); temp.setTenantId(u.getTenantId()); temp.setMerchantId(u.getMerchantId()); AmountRecordVo vo = new AmountRecordVo(); - vo.setOrderAmountList(getAmountRecord(temp, 0)); - vo.setVerifyAmountList(getAmountRecord(temp, 0)); + vo.setOrderAmountList(getAmountRecord(temp, day,0,vo)); + vo.setVerifyAmountList(getAmountRecord(temp,day, 1,vo)); return new ResultData(Result.SUCCESS,"ok",vo); } - private List getAmountRecord( WxDateAmountRecord temp,int type){ + private List getAmountRecord( WxDateAmountRecord temp,int day ,int type,AmountRecordVo vo){ temp.setType(type); List list =new ArrayList<>(); for(int i=1;i<=7;i++) {//周日是1 temp.setDayOfWeek(i); PageInfo page = wxDateAmountRecordService.listAsPage(temp, 1, 1); if(page.getSize()>0) { + if(i==day ) { + if(type==0) { + vo.setOrderAmount(page.getList().get(0).getPayPrice()); + }else { + vo.setVerifyAmount(page.getList().get(0).getPayPrice()); + } + } list.add(page.getList().get(0)); } }