From 2e99dd574547398dafdd91b3b0824ca690b69705 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Sep 2025 17:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ShopUserController.java | 236 +++++++++--------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java index 4aa1345b..b8b49cd3 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java @@ -32,129 +32,129 @@ public class ShopUserController { @Resource private ShopUserFlowService shopUserFlowService; -// /** -// * 获取店铺用户概述信息 -// * -// * @param isVip 0 非vip 1 vip -// * @return 概述信息 -// */ -// @SaAdminCheckPermission(value = "shopUser:summary", name = "店铺用户概述信息") -// @GetMapping("/summary") -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// public CzgResult summary(Integer isVip) { -// return CzgResult.success(shopUserService.getSummary(StpKit.USER.getHeadShopIdBySession(), isVip)); -// } -// -// /** -// * 获取店铺用户充值记录 -// * @param userId 用户id -// * @param startTime 开始时间 -// * @param endTime 结束时间 -// * @param bizCode 充值类型 类型： -// * cashIn 现金充值， -// * wechatIn 微信小程序充值， -// * alipayIn 支付宝小程序充值， -// * awardIn 充值奖励， -// * rechargeRefund 充值退款 -// * orderPay 订单消费， -// * orderRefund 订单退款， -// * adminIn 管理员充值 -// * adminOut管理员消费 -// * @return 充值记录 -// */ -// @SaAdminCheckPermission(value = "shopUser:flow", name = "店铺用户充值记录") -// @GetMapping("/flow") -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// public CzgResult> flow(Integer userId, String bizCode, String startTime, String endTime) { -// return CzgResult.success(shopUserFlowService.pageInfo(StpKit.USER.getHeadShopIdBySession(), userId, bizCode, startTime, endTime)); -// } -// -// /** -// * 余额明细记录导出 -// * @param userId 用户id -// * @param bizCode 代码 -// * @param startTime 开始时间 -// * @param endTime 结束时间 -// * @param response 响应 -// * @throws IOException 异常 -// */ -// @SaAdminCheckPermission(value = "shopUser:flow:downLoad", name = "店铺用户充值记录导出") -// @GetMapping("/flow/download") -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// public void flowDownload(Integer userId, String bizCode, String startTime, String endTime, HttpServletResponse response) throws IOException { -// shopUserFlowService.flowDownload(StpKit.USER.getHeadShopIdBySession(), userId, bizCode, startTime, endTime, response); -// } -// -// /** -// * 获取店铺用户列表 -// * -// * @param key 昵称或手机号 -// * @param isVip 0 非vip 1 vip -// * @return 用户列表 -// */ -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// @SaAdminCheckPermission(value = "shopUser:list", name = "店铺用户列表") -// @GetMapping -// public CzgResult> list(String key, Integer isVip, BigDecimal amount) { -// return CzgResult.success(shopUserService.getPage(key, isVip, amount)); -// } + /** + * 获取店铺用户概述信息 + * + * @param isVip 0 非vip 1 vip + * @return 概述信息 + */ + @SaAdminCheckPermission(value = "shopUser:summary", name = "店铺用户概述信息") + @GetMapping("/summary") +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + public CzgResult summary(Integer isVip) { + return CzgResult.success(shopUserService.getSummary(StpKit.USER.getHeadShopIdBySession(), isVip)); + } + + /** + * 获取店铺用户充值记录 + * @param userId 用户id + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param bizCode 充值类型 类型： + * cashIn 现金充值， + * wechatIn 微信小程序充值， + * alipayIn 支付宝小程序充值， + * awardIn 充值奖励， + * rechargeRefund 充值退款 + * orderPay 订单消费， + * orderRefund 订单退款， + * adminIn 管理员充值 + * adminOut管理员消费 + * @return 充值记录 + */ + @SaAdminCheckPermission(value = "shopUser:flow", name = "店铺用户充值记录") + @GetMapping("/flow") +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + public CzgResult> flow(Integer userId, String bizCode, String startTime, String endTime) { + return CzgResult.success(shopUserFlowService.pageInfo(StpKit.USER.getHeadShopIdBySession(), userId, bizCode, startTime, endTime)); + } + + /** + * 余额明细记录导出 + * @param userId 用户id + * @param bizCode 代码 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param response 响应 + * @throws IOException 异常 + */ + @SaAdminCheckPermission(value = "shopUser:flow:downLoad", name = "店铺用户充值记录导出") + @GetMapping("/flow/download") +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + public void flowDownload(Integer userId, String bizCode, String startTime, String endTime, HttpServletResponse response) throws IOException { + shopUserFlowService.flowDownload(StpKit.USER.getHeadShopIdBySession(), userId, bizCode, startTime, endTime, response); + } + + /** + * 获取店铺用户列表 + * + * @param key 昵称或手机号 + * @param isVip 0 非vip 1 vip + * @return 用户列表 + */ +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + @SaAdminCheckPermission(value = "shopUser:list", name = "店铺用户列表") + @GetMapping + public CzgResult> list(String key, Integer isVip, BigDecimal amount) { + return CzgResult.success(shopUserService.getPage(key, isVip, amount)); + } @GetMapping("/getPage") public CzgResult> getPage(@RequestParam(required = false)String key,@RequestParam(required = false) Integer isVip) { return CzgResult.success(shopUserService.getPage(key, isVip)); } -// /** -// * 获取店铺用户详情 -// * @param id 会员用户id -// * @param userId 用户id -// * @return 用户详情 -// */ -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// @SaAdminCheckPermission(value = "shopUser:detail", name = "店铺用户详情") -// @GetMapping("/detail") -// public CzgResult detail(Integer id, Integer userId) { -// if (id == null && userId == null) { -// return CzgResult.failure("id和userId不能重复为空"); -// } -// return CzgResult.success(shopUserService.getDetail(id, userId)); -// } -// -// /** -// * 店铺用户信息添加 -// * -// * @return 是否成功 -// */ -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// @SaAdminCheckPermission(value = "shopUser:add", name = "店铺用户添加") -// @PostMapping -// public CzgResult add(@RequestBody @Validated ShopUserAddDTO shopUserAddDTO) { -// return CzgResult.success(shopUserService.add(StpKit.USER.getHeadShopIdBySession(), shopUserAddDTO)); -// } -// -// /** -// * 店铺用户信息修改 -// * -// * @return 是否成功 -// */ -//// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") -// @SaAdminCheckPermission(value = "shopUser:edit", name = "店铺用户修改") -// @PutMapping -// public CzgResult edit(@RequestBody @Validated ShopUserEditDTO shopUserEditDTO) { -// return CzgResult.success(shopUserService.updateInfo(StpKit.USER.getHeadShopIdBySession(), shopUserEditDTO)); -// } -// -// /** -// * 店铺用户余额修改 -// * -// * @return 是否成功 -// */ -//// @SaStaffCheckPermission("yun_xu_xiu_gai_hui_yuan_yu_e") -// @SaAdminCheckPermission(value = "shopUser:editFlow", name = "店铺用户余额修改") -// @PutMapping("/money") -// public CzgResult editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) { -// shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.ADMIN_IN); -// return CzgResult.success(shopUserService.updateMoney(shopUserMoneyEditDTO) > 0L); -// } + /** + * 获取店铺用户详情 + * @param id 会员用户id + * @param userId 用户id + * @return 用户详情 + */ +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + @SaAdminCheckPermission(value = "shopUser:detail", name = "店铺用户详情") + @GetMapping("/detail") + public CzgResult detail(Integer id, Integer userId) { + if (id == null && userId == null) { + return CzgResult.failure("id和userId不能重复为空"); + } + return CzgResult.success(shopUserService.getDetail(id, userId)); + } + + /** + * 店铺用户信息添加 + * + * @return 是否成功 + */ +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + @SaAdminCheckPermission(value = "shopUser:add", name = "店铺用户添加") + @PostMapping + public CzgResult add(@RequestBody @Validated ShopUserAddDTO shopUserAddDTO) { + return CzgResult.success(shopUserService.add(StpKit.USER.getHeadShopIdBySession(), shopUserAddDTO)); + } + + /** + * 店铺用户信息修改 + * + * @return 是否成功 + */ +// @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") + @SaAdminCheckPermission(value = "shopUser:edit", name = "店铺用户修改") + @PutMapping + public CzgResult edit(@RequestBody @Validated ShopUserEditDTO shopUserEditDTO) { + return CzgResult.success(shopUserService.updateInfo(StpKit.USER.getHeadShopIdBySession(), shopUserEditDTO)); + } + + /** + * 店铺用户余额修改 + * + * @return 是否成功 + */ +// @SaStaffCheckPermission("yun_xu_xiu_gai_hui_yuan_yu_e") + @SaAdminCheckPermission(value = "shopUser:editFlow", name = "店铺用户余额修改") + @PutMapping("/money") + public CzgResult editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) { + shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.ADMIN_IN); + return CzgResult.success(shopUserService.updateMoney(shopUserMoneyEditDTO) > 0L); + } }