From e6ad0efb2bf901629778f0958bb9ec8841a25032 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 12 May 2021 10:46:55 +0800 Subject: [PATCH] fix neupos --- .../controller/NeuPosAdminController.java | 54 +++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 1b4a5cd33..f08a304d7 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -1,6 +1,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.NeuPosOrderMasterExt; import com.iformall.domain.po.WxActivity; @@ -33,16 +34,34 @@ public class NeuPosAdminController extends BaseController { private NeuPosOrderService neuPosOrderService; + private boolean tenantValid(String tenantId) { + if (tenantId.equals("1013")) { + return true; + } + return false; + } + @ApiOperation("查询门店") @GetMapping("shoplist") - public ResultData shoplist() { + @ApiImplicitParams({ + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData shoplist(String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(); + } + List maplist = neuPosOrderService.selectShopList(24); return new ResultData(maplist); } @ApiOperation("查询支付类型") @GetMapping("payTypelist") - public ResultData payTypelist() { + @ApiImplicitParams({ + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData payTypelist(String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(); + } List maplist = neuPosOrderService.selectPayTypeList(); return new ResultData(maplist); } @@ -51,8 +70,12 @@ public class NeuPosAdminController extends BaseController { @GetMapping("payTypeOrderlist") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(Result.ERROR,"未安装POS系统"); + } example.setOrgId(24); PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); return new ResultData(maplist); @@ -60,7 +83,12 @@ public class NeuPosAdminController extends BaseController { @ApiOperation("集团类型流水总数") @GetMapping("payTypeOrderSum") - public ResultData payTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example) { + @ApiImplicitParams({ + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData payTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example,String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(Result.ERROR,"未安装POS系统"); + } example.setOrgId(24); List maplist = neuPosOrderService.queryShopPayOrderSum(example); return new ResultData(maplist); @@ -70,8 +98,12 @@ public class NeuPosAdminController extends BaseController { @GetMapping("shopOrderlist") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(Result.ERROR,"未安装POS系统"); + } example.setOrgId(24); PageInfo maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize); return new ResultData(maplist); @@ -81,8 +113,12 @@ public class NeuPosAdminController extends BaseController { @GetMapping("orderlist") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData orderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData orderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(Result.ERROR,"未安装POS系统"); + } example.setOrgId(24); PageInfo maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize); return new ResultData(maplist);