合并代码

Pu Zhibing

2024-11-06 73be7ff2317fea8194b7a6dc0452b64a511c7836

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

@@ -373,18 +373,14 @@
            req.setSubject("购买商品");
            req.setBuyerOpenId(user.getAliOpenid());
            req.setBody("购买商品");
            req.setNotifyUrl("/payment/ali/callBack");
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setNotifyUrl(data.getNotifyUrl() + "/callBack/ali/all");
                data.setOrderId(shopOrder.getId().toString());
                return AjaxResult.success(data);
            }
            //todo 罗 支付宝支付
            return R.ok();
        }




        return AjaxResult.success();
    }