|
|
@@ -108,7 +108,7 @@ public class NeuPosAdminController extends BaseController { |
|
|
return new ResultData(maplist); |
|
|
return new ResultData(maplist); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@GetMapping("exportPayTypeOrderlist") |
|
|
|
|
|
|
|
|
@GetMapping("exportMerchantOrderlist") |
|
|
@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), |
|
|
@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<Map> 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<Map> maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); |
|
|
|
|
|
return new ResultData(maplist); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("集团类型流水总数") |
|
|
@ApiOperation("集团类型流水总数") |
|
|
@GetMapping("payTypeOrderSum") |
|
|
@GetMapping("payTypeOrderSum") |
|
|
|