From c60c188c2e2fee202a99da63261c7c1dd18ee71f Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Sat, 5 Jul 2025 12:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8F=90=E7=8E=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/AppletMoneyLogController.java | 5 +++++ .../api/controller/AppletPromotionController.java | 5 +++++ .../org/jeecg/api/service/AppletMoneyLogService.java | 2 ++ .../jeecg/api/service/AppletPromotionService.java | 2 ++ .../api/service/impl/AppletMoneyLogServiceImpl.java | 20 +++++++++++++++++--- .../api/service/impl/AppletOrderTeamServiceImpl.java | 2 +- .../api/service/impl/AppletPromotionServiceImpl.java | 16 ++++++++++++++++ 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java index 476f5e8..ab16614 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java @@ -41,4 +41,9 @@ public class AppletMoneyLogController { return appletMoneyLogService.getIncome(token, pageBean); } + @ApiOperation( value="提现领取成功", notes="提现领取成功") + @PostMapping(value = "/withdrawSUccess") + public Result withdrawSUccess(@RequestHeader("X-Access-Token") String token, String id){ + return appletMoneyLogService.withdrawSUccess(token, id); + } } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java index 6ae4487..8459b73 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java @@ -111,4 +111,9 @@ public class AppletPromotionController { return Result.OK(appletPromotionService.relievePromotion(token, id)); } + @ApiOperation(value="查询当前用户直推间推了多少人", notes="查询当前用户直推间推了多少人") + @GetMapping(value = "/getPromotionCount") + public Result getPromotionCount(@RequestHeader("X-Access-Token") String token){ + return Result.OK(appletPromotionService.getPromotionCount(token)); + } } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java b/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java index d27b30f..a8279bf 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java @@ -14,4 +14,6 @@ public interface AppletMoneyLogService { Result withdraw(String token, CommonMoneyLog log); Result getIncome(String token, PageBean pageBean); + + Result withdrawSUccess(String token, String id); } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletPromotionService.java b/module-common/src/main/java/org/jeecg/api/service/AppletPromotionService.java index 096e964..b270d95 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletPromotionService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletPromotionService.java @@ -40,4 +40,6 @@ public interface AppletPromotionService { Result getPromotionList(PageBean pageBean); Result relievePromotion(String token, String id); + + Result getPromotionCount(String token); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java index c673258..d6f81ce 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.Map; @Slf4j @@ -92,8 +93,8 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService { } if(commonMoneyLog.getMoney().compareTo(balance)>0){ //提现金额大于推广佣金 - log.info("推广佣金不足，当前推广佣金：{}", balance); - return Result.error("推广佣金不足"); + log.info("用户余额不足，当前用户余额：{}", balance); + return Result.error("用户余额不足"); } //提现金额要为整数 if(commonMoneyLog.getMoney().scale()>0){ @@ -195,6 +196,7 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService { commonMoneyLog.setState(0); // 待处理状态 commonMoneyLog.setIsBrokerage("N"); // 不是佣金 commonMoneyLog.setOldMoney(member.getMoney()); // 记录原始余额 + commonMoneyLog.setPackageInfo(response.packageInfo);//参数 // 更新用户余额 BigDecimal newMoney = member.getMoney().subtract(commonMoneyLog.getMoney()); @@ -211,9 +213,13 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService { hanHaiMemberService.updateById(member); commonMoneyLogService.save(commonMoneyLog); + HashMap m = new HashMap<>(); + + m.put("response", response); + m.put("id", commonMoneyLog.getId()); //5、返回信息 - return Result.OK(massage, response); + return Result.OK(massage, m); }catch (Exception e){ e.printStackTrace(); log.info("提现失败：" + e.getMessage()); @@ -273,4 +279,12 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService { return Result.OK(pageList); } + + @Override + public Result withdrawSUccess(String token, String id) { + CommonMoneyLog log = commonMoneyLogService.getById(id); + log.setState(1); + commonMoneyLogService.updateById(log); + return Result.OK(); + } } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java index e6bccd6..996d4ec 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java @@ -425,7 +425,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService { commonOrderService.updateById(order); // 添加最近回收 - addCommonGet(order, member); +// addCommonGet(order, member); amountSettlement(order); return Result.OK("提交成功"); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java index 28caa95..b6389e7 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java @@ -286,6 +286,8 @@ public class AppletPromotionServiceImpl implements AppletPromotionService { pageListFans.getRecords().add(fansPageBean1); }); + pageListFans.setTotal(pageList.getTotal()); + return Result.OK(pageListFans); } @@ -370,4 +372,18 @@ public class AppletPromotionServiceImpl implements AppletPromotionService { return Result.OK(); } + + @Override + public Result getPromotionCount(String token) { + HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Long count = hanHaiMemberService. + lambdaQuery() + .eq(HanHaiMember::getShareId, member.getId()) + .or() + .eq(HanHaiMember::getVid, member.getId()) + .count(); + + return Result.OK(count); + } }