Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

Pu Zhibing

2025-05-08 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java

@@ -124,7 +124,7 @@
            paymentOrder.setAmount(shopOrder.getPaymentAmount());
            paymentOrder.setOpenId(user.getWxOpenid());
            paymentOrder.setDescription("购买会员");
            return    AjaxResult.success(wxPaymentClient.orderPay(paymentOrder).getData());
            return AjaxResult.success(wxPaymentClient.orderPay(paymentOrder).getData());
        }else {
            AliPaymentReq req = new AliPaymentReq();
            req.setOutTradeNo(shopOrder.getCode());