From 0be3fb121faead65246a567574ac062a601411b0 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 08 八月 2023 18:01:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java index 145c72f..215daa3 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java @@ -121,15 +121,14 @@ List<RechargeCentVo> getSysRechargeConfig(Integer appUserId); - PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis); + List<Goods> queryAppUserIntegral(MallRequest request); - ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request); ProductDetailsVo productDetails(Integer goodId, Integer goodsType ); StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis ,Integer pointsMerId, String lat, String lon,Integer isCourse); - ResultUtil productRedemptionOperation(Integer userIdFormRedis, Integer goodId, Integer goodsType,Integer nums,Integer exchangeType,Integer payType,List<Integer> stuIds); + ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeVo); ResultUtil exchangeAddPaymentCallback(String code, String orderNumber,Integer payType); -- Gitblit v1.7.1