From 9a0a9b3aaae6b2d0a2f6be65f3b09a9f9e0a29c6 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 19 Aug 2018 13:42:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E4=BA=A4=E6=98=93=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=A0=B8=E9=94=80=E9=87=91=E9=A2=9D=E8=AE=B0=E5=BD=95?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9]=E5=8E=BB=E6=8E=89=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxDateAmountRecordController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index 4a5ae7c7c..f8861544c 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -14,6 +14,7 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxDateAmountRecord; +import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.vo.AmountRecordVo; import com.simple.service.WxDateAmountRecordService; @@ -34,17 +35,15 @@ public class WxDateAmountRecordController extends BaseController @ApiOperation("首页查询交易金额记录和核销记录接口") - @ApiImplicitParams({ - @ApiImplicitParam(name="tenantId",value="租户id",dataType="String", paramType = "query",required=true), - @ApiImplicitParam(name="merchantId",value="商户id",dataType="long", paramType = "query",required=true)}) @GetMapping("list") - public ResultData getRecord(String tenantId,Long merchantId) { + public ResultData getRecord() { Calendar c =Calendar.getInstance(); int weekOfYear =c.get(Calendar.WEEK_OF_YEAR); WxDateAmountRecord temp = new WxDateAmountRecord(); temp.setDayOfWeek(weekOfYear); - temp.setTenantId(tenantId); - temp.setMerchantId(merchantId); + 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));