Pu Zhibing
2024-11-06 dc75a139edc58a71bbbd8b94ed94287b7f3727fe
Merge remote-tracking branch 'origin/master'
2个文件已修改
2 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliPaymentResp.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliPaymentResp.java
@@ -21,4 +21,5 @@
     */
    @ApiModelProperty("回调通知地址")
    private String notifyUrl;
    private String orderId;
}
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -376,6 +376,7 @@
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setNotifyUrl(data.getNotifyUrl() + "/payment/callBack/ali/all");
                data.setOrderId(shopOrder.getId().toString());
                return AjaxResult.success(data);
            }
        }