44323
2024-06-06 b679205246bbe94e1e83db6f8e26d04668afd402
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -109,29 +109,27 @@
    @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 pay(Integer payType, Integer orderId, Integer id) throws Exception {
        TVipOrder tVipOrder = vipOrderService.getById(orderId);
        switch (payType) {
    public AjaxResult pay(@RequestBody PayDTO dto) throws Exception {
        TVipOrder tVipOrder = vipOrderService.getById(dto.getOrderId());
        switch (dto.getPayType()) {
            case 1:
                return payMoneyUtil.weixinpay
                        ("购买会员", "",
                                id + "_" + tVipOrder.getId() + "_" +
                                dto.getId() + "_" + tVipOrder.getId() + "_" +
                                        UUIDUtil.getRandomCode(8),
                                tVipOrder.getMoney().toString(),
                                "/base/wxPayBuyVip", "APP", "");
                                "/base/user/wxPayBuyVip", "APP", "");
            case 2:
                return payMoneyUtil.alipay
                        ("购买会员",
                                "购买会员下单支付",
                                "",
                                id + "_" + tVipOrder.getId() + "_" +
                                dto.getId() + "_" + tVipOrder.getId() + "_" +
                                        UUIDUtil.getRandomCode(8),
                                tVipOrder.getMoney().toString(),
                                "/base/aliPayBuyVip");
                                "/base/user/aliPayBuyVip");
        }
        return AjaxResult.success();
    }
@@ -189,7 +187,7 @@
    }
    @ResponseBody
    @PostMapping("/base/aliPayBuyVip")
    @PostMapping("/aliPayBuyVip")
    public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
        try {
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
@@ -270,7 +268,7 @@
    }
    @ResponseBody
    @PostMapping("/base/wxPayBuyVip")
    @PostMapping("/wxPayBuyVip")
    public void wxPayBuyPackage(HttpServletRequest request, HttpServletResponse response) {
        try {
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
@@ -417,8 +415,26 @@
    @ApiOperation(value = "使用指南", tags = {"家长端-使用指南"})
    public R<PageInfo<TUseGuide>> useGuide(@RequestBody UseGuideQuery query) {
        PageInfo<TUseGuide> data = managementClient.useGuide1(query).getData();
        for (TUseGuide record : data.getRecords()) {
            String plainTextContent = record.getAnswer().replaceAll("\\<.*?\\>", "");
            record.setCount(plainTextContent);
        }
        return R.ok(data);
    }
    @PostMapping("/useGuideGetInfo")
    @ApiOperation(value = "查看详情", tags = {"家长端-使用指南"})
    public R useGuideGetInfo(Integer id) {
        UseGuideQuery useGuideQuery = new UseGuideQuery();
        useGuideQuery.setPageNumber(1);
        useGuideQuery.setPageSize(300);
        PageInfo<TUseGuide> data = managementClient.useGuide1(useGuideQuery).getData();
        for (TUseGuide record : data.getRecords()) {
            if (record.getId() == id){
                return R.ok(record.getAnswer());
            }
        }
        return R.ok();
    }
    @PostMapping("/feedBack")
    @ApiOperation(value = "反馈", tags = {"家长端-意见反馈"})