合并代码

Pu Zhibing

2024-11-06 e9d4746af2164d4dbff94bd7736b28072b44fc57

合并代码

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/PaymentReq.java

@@ -41,6 +41,10 @@
     * 如果请求时传递了该参数，支付宝会在异步通知时将该参数原样返回。
     */
    private String passbackParams;
    /**
     * 支付回调通知
     */
    private String notifyUrl;
    
    /**
     * 初始化默认数据

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliPaymentReq.java

@@ -42,6 +42,10 @@
     */
    private String passbackParams;
    /**
     * 支付回调通知
     */
    private String notifyUrl;
    /**
     * 初始化默认数据
     */
    public AliPaymentReq() {

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliPaymentResp.java

@@ -16,10 +16,5 @@
     */
    @ApiModelProperty("支付单号")
    private String tradeNo;
    /**
     * 回调通知地址
     */
    @ApiModelProperty("回调通知地址")
    private String notifyUrl;
    private String orderId;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -528,9 +528,9 @@
            req.setSubject("充电充值");
            req.setBuyerOpenId(appUser.getAliOpenid());
            req.setBody("充电充值");
            req.setNotifyUrl("/payment/callBack/ali/all");
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setNotifyUrl(data.getNotifyUrl() + "/order/t-charging-order/chargingOrderALICallback");
                return AjaxResult.success(data);
            }
        }

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

@@ -373,9 +373,9 @@
            req.setSubject("购买商品");
            req.setBuyerOpenId(user.getAliOpenid());
            req.setBody("购买商品");
            req.setNotifyUrl("/payment/callBack/ali/all");
            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);
            }

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java

@@ -132,9 +132,9 @@
            req.setSubject("充电充值");
            req.setBuyerOpenId(user.getAliOpenid());
            req.setBody("充电充值");
            req.setNotifyUrl("/payment/callBack/ali/all");
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setNotifyUrl(data.getNotifyUrl() + "/payment/callBack/ali/all");
                return AjaxResult.success(data);
            }
        }

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java

@@ -60,6 +60,7 @@
            //异步返回参数
            model.setPassbackParams(pojo.getPassbackParams());
            request.setBizModel(model);
            request.setNotifyUrl(aliProperties.getNotifyUrl() + pojo.getNotifyUrl());
            
            AlipayTradeCreateResponse response = alipayClient.execute(request);
            log.info("-----调起支付宝支付-----");