Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-11 ae84ae528290f44c66ef14c92f4a68bd3c1ce617

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

@@ -373,7 +373,7 @@
            req.setSubject("购买商品");
            req.setBuyerOpenId(user.getAliOpenid());
            req.setBody("购买商品");
            req.setNotifyUrl("/payment/callBack/ali/all");
            req.setNotifyUrl("/payment/ali/callBack");
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setOrderId(shopOrder.getId().toString());