Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-06 dc75a139edc58a71bbbd8b94ed94287b7f3727fe

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

@@ -375,16 +375,12 @@
            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");
                data.setOrderId(shopOrder.getId().toString());
                return AjaxResult.success(data);
            }
            //todo 罗 支付宝支付
            return R.ok();
        }




        return AjaxResult.success();
    }