diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index ab19f5c69..2e9b30366 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -108,7 +108,7 @@ public class NeuPosAdminController extends BaseController { return new ResultData(maplist); } - @GetMapping("exportPayTypeOrderlist") + @GetMapping("exportMerchantOrderlist") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @@ -126,6 +126,32 @@ public class NeuPosAdminController extends BaseController { } } + @ApiOperation("集团单一商户流水") + @GetMapping("oneMerchantOrderlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "phone", value = "账号", dataType = "String", paramType = "query", required = true)}) + public ResultData oneMerchantOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String phone) { +// if (!tenantValid(tenantId)) { +// return new ResultData(Result.ERROR,"未安装POS系统"); +// } + setDate(example); + example.setOrgId(24); + //phone账号登录名 + List ushops = neuPosOrderService.selectUserShopList(24, phone); + if (null == ushops || ushops.size() <= 0 ) { + return new ResultData(); + } + Map us = ushops.get(0); + Integer shopId = (Integer) us.get("shop"); + //Long uid = (Long) us.get("id"); + //String nickname = (String) us.get("nickname"); + example.setShopId(shopId); + PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); + return new ResultData(maplist); + } + @ApiOperation("集团类型流水总数") @GetMapping("payTypeOrderSum") diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index e9305852c..5482ea6e7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -38,5 +38,7 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper queryDeviceList(@Param("organizationId") Long organizationId,@Param("shopId") Long shopId ); + + List queryUserShop(@Param("orgId")Integer orgId,@Param("username") String username); } diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java index 8cda3d1a8..e5319400f 100644 --- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java @@ -43,4 +43,6 @@ public interface NeuPosOrderService { void updatePayStatus(NeuPosUpdatePayDto updatePay); List selectDeviceList(Long orgId,Long shopId); + + List selectUserShopList(Integer orgId,String username); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index 9c20958ab..c835ff1f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -192,6 +192,11 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { return neuPosOrderMasterExtMapper.queryDeviceList(orgId, shopId); } + @Override + public List selectUserShopList(Integer orgId, String username) { + return neuPosOrderMasterExtMapper.queryUserShop(orgId, username); + } + } diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index df01ecf4a..602095e6e 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -351,4 +351,9 @@ SELECT + + \ No newline at end of file