From eb4168a55e5cbfc04fe4e2b6c99d8a232f85ad2e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 8e09a9d..7c21dbc 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.account.dto.BindDto;
+import com.dsh.account.dto.IntroduceUserQuery;
import com.dsh.account.dto.SelectDto;
import com.dsh.account.dto.UpdateInfoDto;
import com.dsh.account.entity.*;
@@ -18,6 +19,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -51,6 +53,26 @@
@Autowired
private TCourseInfoRecordService courseInfoRecordService;
+ @Autowired
+ private TAppGiftService appGiftService;
+ /**
+ * 根据介绍有礼id查询当前活动参与次数
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/getActivityPeoples")
+ public Integer getActivityPeoples(@RequestBody Integer activityId){
+ int activityId1 = appGiftService.list(new QueryWrapper<TAppGift>().eq("activityId", activityId))
+ .size();
+ return activityId1;
+ }
+ /**
+ * 介绍有礼 -- 参与用户列表
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/queryIntroduceAll")
+ public List<IntroduceUser> queryIntroduceAll(@RequestBody IntroduceUserQuery query){
+ return appGiftService.queryIntroduceAll(query);
+ }
/**
* 获取所有用户
*/
@@ -150,6 +172,7 @@
return appUser;
}
+ // todo 短信验证码
@ResponseBody
@PostMapping("/base/appUser/getSMSCode")
@ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
@@ -449,10 +472,12 @@
@PostMapping("/base/appUser/addVipPaymentAliCallback")
public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response){
try {
+ System.err.println("==============购买优惠卷回调=========");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String out_trade_no = map.get("out_trade_no");
String trade_no = map.get("trade_no");
+ String appUserId = map.get("passback_params");
ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, trade_no);
if(resultUtil.getCode() == 200){
PrintWriter out = response.getWriter();
--
Gitblit v1.7.1