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

无关风月

2024-11-06 6ec6f5336755da695378850d9fd960f6498a20e3

 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();
    }