Merge remote-tracking branch 'origin/master'

hjl

2024-05-30 7fcc27e0646032f81df1117257f29206fd0fb9ee

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

@@ -104,32 +104,16 @@

    @Autowired
    private PayMoneyUtil payMoneyUtil;

    @PostMapping("/order")
    @ApiOperation(value = "购买会员下单操作", tags = {"家长端-个人中心"})
    @PostMapping("/pay")
    @ApiOperation(value = "购买会员支付操作", tags = {"家长端-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
            @ApiImplicitParam(name = "payType", value = "支付类型 1=微信 2=支付宝", required = true),
            @ApiImplicitParam(name = "orderId", value = "订单id", required = true),
            @ApiImplicitParam(name = "id", value = "会员规格id", required = true),
    })
    public AjaxResult order(Integer payType, Integer id) throws Exception {
        if (tokenService.getLoginUser1() == null) {
            return AjaxResult.tokenError("登录失效", new Object());
        }
        Integer userid = tokenService.getLoginUser1().getUserid();
        TVipOrder tVipOrder = new TVipOrder();
        List<TVipSet> data = managementClient.getVipSet1().getData();
        Integer time = 0;
        for (TVipSet datum : data) {
            if (datum.getId() == id) {
                tVipOrder.setMoney(datum.getAmount());
                time = datum.getTime();
            }
        }
        tVipOrder.setPayState(1);
        tVipOrder.setUserId(userid);
        tVipOrder.setPayType(payType);
        tVipOrder.setCount(time);
    public AjaxResult pay(Integer payType, Integer orderId, Integer id) throws Exception {
        TVipOrder tVipOrder = vipOrderService.getById(orderId);
        switch (payType) {
            case 1:
                return payMoneyUtil.weixinpay
@@ -150,6 +134,58 @@
        }
        return AjaxResult.success();
    }
    @PostMapping("/order")
    @ApiOperation(value = "购买会员下单操作", tags = {"家长端-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
            @ApiImplicitParam(name = "payType", value = "支付类型 1=微信 2=支付宝", required = true),
            @ApiImplicitParam(name = "id", value = "会员规格id", required = true),
    })
    public R<PayVO> order(Integer payType, Integer id) throws Exception {
        if (tokenService.getLoginUser1() == null) {
            return R.tokenError("登录失效");
        }
        Integer userid = tokenService.getLoginUser1().getUserid();
        TVipOrder tVipOrder = new TVipOrder();
        List<TVipSet> data = managementClient.getVipSet1().getData();
        Integer time = 0;
        for (TVipSet datum : data) {
            if (datum.getId() == id) {
                tVipOrder.setMoney(datum.getAmount());
                time = datum.getTime();
            }
        }
        tVipOrder.setPayState(1);
        tVipOrder.setUserId(userid);
        tVipOrder.setPayType(payType);
        tVipOrder.setCount(time);
        vipOrderService.save(tVipOrder);
        PayVO payVO = new PayVO();
        payVO.setOrderId(tVipOrder.getId());
        payVO.setId(id);


        return R.ok(payVO);
//        switch (payType) {
//            case 1:
//                return payMoneyUtil.weixinpay
//                        ("购买会员", "",
//                                id + "_" + tVipOrder.getId() + "_" +
//                                        UUIDUtil.getRandomCode(8),
//                                tVipOrder.getMoney().toString(),
//                                "/base/wxPayBuyVip", "APP", "");
//            case 2:
//                return payMoneyUtil.alipay
//                        ("购买会员",
//                                "购买会员下单支付",
//                                "",
//                                id + "_" + tVipOrder.getId() + "_" +
//                                        UUIDUtil.getRandomCode(8),
//                                tVipOrder.getMoney().toString(),
//                                "/base/aliPayBuyVip");
//        }

    }

    @ResponseBody
    @PostMapping("/base/aliPayBuyVip")