| @@ -14,6 +14,7 @@ import com.github.pagehelper.PageInfo; | |||||
| import com.simple.common.Result; | import com.simple.common.Result; | ||||
| import com.simple.common.ResultData; | import com.simple.common.ResultData; | ||||
| import com.simple.domain.po.WxDateAmountRecord; | import com.simple.domain.po.WxDateAmountRecord; | ||||
| import com.simple.domain.po.WxMerchantBUser; | |||||
| import com.simple.domain.vo.AmountRecordVo; | import com.simple.domain.vo.AmountRecordVo; | ||||
| import com.simple.service.WxDateAmountRecordService; | import com.simple.service.WxDateAmountRecordService; | ||||
| @@ -34,17 +35,15 @@ public class WxDateAmountRecordController extends BaseController | |||||
| @ApiOperation("首页查询交易金额记录和核销记录接口") | @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") | @GetMapping("list") | ||||
| public ResultData getRecord(String tenantId,Long merchantId) { | |||||
| 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); | ||||
| WxDateAmountRecord temp = new WxDateAmountRecord(); | WxDateAmountRecord temp = new WxDateAmountRecord(); | ||||
| temp.setDayOfWeek(weekOfYear); | temp.setDayOfWeek(weekOfYear); | ||||
| temp.setTenantId(tenantId); | |||||
| temp.setMerchantId(merchantId); | |||||
| WxMerchantBUser u = getUser(); | |||||
| temp.setTenantId(u.getTenantId()); | |||||
| temp.setMerchantId(u.getMerchantId()); | |||||
| AmountRecordVo vo = new AmountRecordVo(); | AmountRecordVo vo = new AmountRecordVo(); | ||||
| vo.setOrderAmountList(getAmountRecord(temp, 0)); | vo.setOrderAmountList(getAmountRecord(temp, 0)); | ||||
| vo.setVerifyAmountList(getAmountRecord(temp, 0)); | vo.setVerifyAmountList(getAmountRecord(temp, 0)); | ||||