| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.NeuPosOrderMasterExt; | import com.iformall.domain.po.NeuPosOrderMasterExt; | ||||
| import com.iformall.domain.po.WxActivity; | import com.iformall.domain.po.WxActivity; | ||||
| @@ -33,16 +34,34 @@ public class NeuPosAdminController extends BaseController { | |||||
| private NeuPosOrderService neuPosOrderService; | private NeuPosOrderService neuPosOrderService; | ||||
| private boolean tenantValid(String tenantId) { | |||||
| if (tenantId.equals("1013")) { | |||||
| return true; | |||||
| } | |||||
| return false; | |||||
| } | |||||
| @ApiOperation("查询门店") | @ApiOperation("查询门店") | ||||
| @GetMapping("shoplist") | @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<Map> maplist = neuPosOrderService.selectShopList(24); | List<Map> maplist = neuPosOrderService.selectShopList(24); | ||||
| return new ResultData(maplist); | return new ResultData(maplist); | ||||
| } | } | ||||
| @ApiOperation("查询支付类型") | @ApiOperation("查询支付类型") | ||||
| @GetMapping("payTypelist") | @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<Map> maplist = neuPosOrderService.selectPayTypeList(); | List<Map> maplist = neuPosOrderService.selectPayTypeList(); | ||||
| return new ResultData(maplist); | return new ResultData(maplist); | ||||
| } | } | ||||
| @@ -51,8 +70,12 @@ public class NeuPosAdminController extends BaseController { | |||||
| @GetMapping("payTypeOrderlist") | @GetMapping("payTypeOrderlist") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @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); | example.setOrgId(24); | ||||
| PageInfo<Map> maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); | PageInfo<Map> maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); | ||||
| return new ResultData(maplist); | return new ResultData(maplist); | ||||
| @@ -60,7 +83,12 @@ public class NeuPosAdminController extends BaseController { | |||||
| @ApiOperation("集团类型流水总数") | @ApiOperation("集团类型流水总数") | ||||
| @GetMapping("payTypeOrderSum") | @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); | example.setOrgId(24); | ||||
| List<Map> maplist = neuPosOrderService.queryShopPayOrderSum(example); | List<Map> maplist = neuPosOrderService.queryShopPayOrderSum(example); | ||||
| return new ResultData(maplist); | return new ResultData(maplist); | ||||
| @@ -70,8 +98,12 @@ public class NeuPosAdminController extends BaseController { | |||||
| @GetMapping("shopOrderlist") | @GetMapping("shopOrderlist") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @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); | example.setOrgId(24); | ||||
| PageInfo<Map> maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize); | PageInfo<Map> maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize); | ||||
| return new ResultData(maplist); | return new ResultData(maplist); | ||||
| @@ -81,8 +113,12 @@ public class NeuPosAdminController extends BaseController { | |||||
| @GetMapping("orderlist") | @GetMapping("orderlist") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @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); | example.setOrgId(24); | ||||
| PageInfo<Map> maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize); | PageInfo<Map> maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize); | ||||
| return new ResultData(maplist); | return new ResultData(maplist); | ||||