| @@ -39,24 +39,32 @@ public class WxDateAmountRecordController extends BaseController | |||||
| public ResultData getRecord() { | public ResultData getRecord() { | ||||
| Calendar c =Calendar.getInstance(); | Calendar c =Calendar.getInstance(); | ||||
| int weekOfYear =c.get(Calendar.WEEK_OF_YEAR); | int weekOfYear =c.get(Calendar.WEEK_OF_YEAR); | ||||
| int day =c.get(Calendar.DAY_OF_WEEK); | |||||
| WxDateAmountRecord temp = new WxDateAmountRecord(); | WxDateAmountRecord temp = new WxDateAmountRecord(); | ||||
| temp.setDayOfWeek(weekOfYear); | |||||
| temp.setWeekOfYear(weekOfYear); | |||||
| WxMerchantBUser u = getUser(); | WxMerchantBUser u = getUser(); | ||||
| temp.setTenantId(u.getTenantId()); | temp.setTenantId(u.getTenantId()); | ||||
| temp.setMerchantId(u.getMerchantId()); | temp.setMerchantId(u.getMerchantId()); | ||||
| AmountRecordVo vo = new AmountRecordVo(); | 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); | return new ResultData(Result.SUCCESS,"ok",vo); | ||||
| } | } | ||||
| private List<WxDateAmountRecord> getAmountRecord( WxDateAmountRecord temp,int type){ | |||||
| private List<WxDateAmountRecord> getAmountRecord( WxDateAmountRecord temp,int day ,int type,AmountRecordVo vo){ | |||||
| temp.setType(type); | temp.setType(type); | ||||
| List<WxDateAmountRecord> list =new ArrayList<>(); | List<WxDateAmountRecord> list =new ArrayList<>(); | ||||
| for(int i=1;i<=7;i++) {//周日是1 | for(int i=1;i<=7;i++) {//周日是1 | ||||
| temp.setDayOfWeek(i); | temp.setDayOfWeek(i); | ||||
| PageInfo<WxDateAmountRecord> page = wxDateAmountRecordService.listAsPage(temp, 1, 1); | PageInfo<WxDateAmountRecord> page = wxDateAmountRecordService.listAsPage(temp, 1, 1); | ||||
| if(page.getSize()>0) { | 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)); | list.add(page.getList().get(0)); | ||||
| } | } | ||||
| } | } | ||||