Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-05 44f81d63412eac4e3442cf6005ea18b22ee2175b

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java

@@ -375,11 +375,9 @@
            req.setBody("购买商品");
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setNotifyUrl(data.getNotifyUrl() + "/callBack/ali/all");
                data.setNotifyUrl(data.getNotifyUrl() + "/payment/callBack/ali/all");
                return AjaxResult.success(data);
            }
            //todo 罗 支付宝支付
            return R.ok();
        }