bug修改

无关风月

2024-07-03 931af81cc474249f60ac7b352adbdd693ef27b15

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -175,7 +175,7 @@
        try {
            System.err.println("进入支付宝回调");
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            System.err.println("返回参数");
            System.err.println("返回参数"+map);
            if (null != map) {
                String out_trade_no = map.get("out_trade_no");
                String trade_no = map.get("trade_no");
@@ -474,12 +474,16 @@
                    if (!rCode.equalsIgnoreCase(phoneCode)) {
                        return R.errorCode("登录失败，手机验证码无效!");
                    } else {
                        tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                        tUser1 = getUser(phone);
                        tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
                        userService.save(tUser1);
                    }
                }
            } else {
                tUser1 = getUser(phone);
                tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
                userService.save(tUser1);
            }
        }
@@ -550,6 +554,8 @@
            }
        } else {
            user = getUser(phone);
            user.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
            user.setAccount("用户"+UUIDUtil.getNumberRandom(6));
            userService.save(user);
        }
        // 生成登录用户信息
@@ -734,6 +740,18 @@
            return R.tokenError("登录失效！");
        }
        TUser byId = userService.getById(loginUserStudy.getUserid());
        // 判断用户会员到期时间 用于判断这个用户到底是不是会员
        if (null != byId.getVipEndTime()) {
            Date vipEndTime = byId.getVipEndTime();
            Date now = new Date();
            if (vipEndTime.before(now)) {
                byId.setIsVip(Constants.ZERO);
            } else {
                byId.setIsVip(Constants.ONE);
            }
        }else{
            byId.setIsVip(Constants.ZERO);
        }
        return R.ok(byId);
    }

@@ -809,7 +827,7 @@
                Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
                if (null == redisPhoneCode) {
                    return R.errorCode("手机验证码无效");
                } else {
                }else{
                    // redis 验证码的value 为 code:时间戳
                    String rCodeAndTime = String.valueOf(redisPhoneCode);
                    String rCode = rCodeAndTime.split(":")[0];
@@ -896,6 +914,7 @@
            case 2:
                // 支付宝退款
                Map<String, String> stringStringMap1 = payMoneyUtil.aliRefund(transactionId, byId.getMoney().toString());
                System.err.println("支付宝退款数据"+ stringStringMap1);
                if (null == stringStringMap1) {
                    return R.fail("取消退款异常");
                }