From a2762d243c7f5585b7996eeb8e9aeb0634af0167 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 五月 2024 15:59:15 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 173 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 107 insertions(+), 66 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 0f9bbac..a1a87bf 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -296,10 +296,41 @@
List<TPage> data = managementClient.getPage1().getData();
for (TPage datum : data) {
if (datum.getType() == 4) {
- return AjaxResult.success(datum);
+ return AjaxResult.success(datum.getImg());
}
}
return AjaxResult.success();
+ }
+ @PostMapping("/parentPage")
+ @ApiOperation(value = "平板", tags = {"家长端-启动页"})
+ public AjaxResult<String> parentPage() {
+ List<TPage> data = managementClient.getPage1().getData();
+ for (TPage datum : data) {
+ if (datum.getType() == 3) {
+ return AjaxResult.success(datum.getImg());
+ }
+ }
+ return AjaxResult.success();
+ }
+ @PostMapping("/parentPage1")
+ @ApiOperation(value = "手机", tags = {"家长端-启动页"})
+ public AjaxResult<String> parentPage1() {
+ List<TPage> data = managementClient.getPage1().getData();
+ for (TPage datum : data) {
+ if (datum.getType() == 2) {
+ return AjaxResult.success(datum.getImg());
+ }
+ }
+ return AjaxResult.success();
+ }
+ @PostMapping("/getProtocol")
+ @ApiOperation(value = "获取协议", tags = {"家长端-协议"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "类型 1用户 2隐私 3注销", name = "type", dataType = "string", required = true),
+ })
+ public AjaxResult<String> getProtocol(Integer type) {
+ String data = managementClient.agreement1(type).getData();
+ return AjaxResult.success(data);
}
@PostMapping("/useGuide")
@@ -496,6 +527,50 @@
userService.saveOrUpdate(byId);
return AjaxResult.success("修改成功");
}
+ @ResponseBody
+ @PostMapping("/base/wxRefund")
+ public void cancelMySiteCallback(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ Map<String, String> map = payMoneyUtil.wxRefundCallback(request);
+ if (null != map) {
+ String code = map.get("out_refund_no");
+ String refund_id = map.get("refund_id");
+ String result = map.get("result");
+ TVipOrder one = vipOrderService.getOne(new QueryWrapper<TVipOrder>()
+ .eq("outTradeNo", code)
+ .eq("payState", 3));
+ one.setBackTime(new Date());
+ vipOrderService.updateById(one);
+ Integer userId = one.getUserId();
+ TUser byId1 = userService.getById(userId);
+ // 判断用户是不是第一次充值
+ List<TVipOrder> list = vipOrderService.list(new QueryWrapper<TVipOrder>()
+ .eq("userId", userId)
+ .eq("payState", 2)
+ .orderByDesc("createTime"));
+ int size = list.size();
+ if (size == 0){
+ // 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
+ byId1.setVipEndTime(null);
+ byId1.setVipPayTime(null);
+ userService.updateById(byId1);
+ }else{
+ // 最近的一次充值会员时间
+ TVipOrder tVipOrder = list.get(0);
+ // 将会员到期时间回退到上一次
+ byId1.setVipEndTime(tVipOrder.getTime());
+ userService.updateById(byId1);
+ }
+
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
@PostMapping("/vipBack/{id}")
@ApiOperation(value = "会员退款", tags = {"管理后台-会员退款"})
public R vipBack(@PathVariable("id") Integer id) throws AlipayApiException {
@@ -506,41 +581,10 @@
String outTradeNo = byId.getOutTradeNo();
switch (byId.getPayType()){
case 1:
- // 微信退款
+ // 微信退款
Map<String, String> stringStringMap = payMoneyUtil.wxRefund(transactionId, outTradeNo, byId.getMoney().toString(), byId.getMoney().toString(), "/base/wxRefund");
- if (stringStringMap.get("code").equals("SUCCESS")){
- byId.setPayState(3);
- byId.setBackTime(new Date());
- vipOrderService.updateById(byId);
- // 用户的vip剩余时间减少
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.add(Calendar.MONTH, -byId.getCount());
- Date dateAfterOneMonth = calendar.getTime();
- Integer userId = byId.getUserId();
- TUser byId1 = userService.getById(userId);
- // 判断用户是不是第一次充值
- List<TVipOrder> list = vipOrderService.list(new QueryWrapper<TVipOrder>()
- .eq("userId", userId)
- .eq("payState", 2)
- .orderByDesc("createTime"));
- int size = list.size();
- if (size == 0) {
- // 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
- byId1.setVipEndTime(null);
- byId1.setVipPayTime(null);
- userService.updateById(byId1);
- } else {
- // 最近的一次充值会员时间
- TVipOrder tVipOrder = list.get(0);
- // 将会员到期时间回退到上一次
- byId1.setVipEndTime(tVipOrder.getTime());
- userService.updateById(byId1);
- }
-
- return R.ok();
- }else{
- return R.fail(stringStringMap.get("msg"));
+ if (null == stringStringMap) {
+ return R.fail("取消退款异常");
}
String result_code = stringStringMap.get("result_code");
if (!"SUCCESS".equals(result_code)) {
@@ -558,38 +602,35 @@
if (!"10000".equals(code)) {
return R.fail(stringStringMap1.get("return_msg"));
}
- byId.setPayState(3);
- byId.setBackTime(new Date());
- vipOrderService.updateById(byId);
- // 用户的vip剩余时间减少
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.add(Calendar.MONTH, -byId.getCount());
- Date dateAfterOneMonth = calendar.getTime();
- Integer userId = byId.getUserId();
- TUser byId1 = userService.getById(userId);
- // 判断用户是不是第一次充值
- List<TVipOrder> list = vipOrderService.list(new QueryWrapper<TVipOrder>()
- .eq("userId", userId)
- .eq("payState", 2)
- .orderByDesc("createTime"));
- int size = list.size();
- if (size == 0) {
- // 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
- byId1.setVipEndTime(null);
- byId1.setVipPayTime(null);
- userService.updateById(byId1);
- } else {
- // 最近的一次充值会员时间
- TVipOrder tVipOrder = list.get(0);
- // 将会员到期时间回退到上一次
- byId1.setVipEndTime(tVipOrder.getTime());
- userService.updateById(byId1);
- }
- return R.ok();
- } else {
- return R.fail(stringStringMap1.get("msg"));
+ byId.setPayState(3);
+ byId.setBackTime(new Date());
+ vipOrderService.updateById(byId);
+ // 用户的vip剩余时间减少
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.add(Calendar.MONTH, -byId.getCount());
+ Date dateAfterOneMonth = calendar.getTime();
+ Integer userId = byId.getUserId();
+ TUser byId1 = userService.getById(userId);
+ // 判断用户是不是第一次充值
+ List<TVipOrder> list = vipOrderService.list(new QueryWrapper<TVipOrder>()
+ .eq("userId", userId)
+ .eq("payState", 2)
+ .orderByDesc("createTime"));
+ int size = list.size();
+ if (size == 0){
+ // 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
+ byId1.setVipEndTime(null);
+ byId1.setVipPayTime(null);
+ userService.updateById(byId1);
+ }else{
+ // 最近的一次充值会员时间
+ TVipOrder tVipOrder = list.get(0);
+ // 将会员到期时间回退到上一次
+ byId1.setVipEndTime(tVipOrder.getTime());
+ userService.updateById(byId1);
}
+ return R.ok();
}
return R.ok();
}
--
Gitblit v1.7.1