From 571020c9e12a1b2817dcdf5b542f13de6a575eb5 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Wed, 22 Aug 2018 21:29:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BA=A4=E6=98=93=E9=87=91=E9=A2=9D=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E9=87=91=E9=A2=9D=E8=AE=B0=E5=BD=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxDateAmountRecordController.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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)); } }