puzhibing
2026-07-21 08fb8959d247cea649723c7589494b7eafb047ba
修改日志路径
修改支付宝查询退款数据bug
6个文件已修改
50 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundResp.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/resources/logback.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/model/QueryRefundResp.java
@@ -13,40 +13,44 @@
@Data
public class QueryRefundResp {
    /**
     * 支付宝交易号
     * 状态 10000
     */
    @JsonSetter("trade_no")
    private String tradeNo;
    @JsonSetter("code")
    private String code;
    /**
     * 支付业务流水号
     * 状态 10000
     */
    @JsonSetter("out_trade_no")
    private String outTradeNo;
    @JsonSetter("Success")
    private String msg;
    /**
     * 退款业务流水号
     */
    @JsonSetter("out_request_no")
    private String outRequestNo;
    /**
     * 交易金额
     * 支付业务流水号
     */
    @JsonSetter("total_amount")
    private Double totalAmount;
    @JsonSetter("out_trade_no")
    private String outTradeNo;
    /**
     * 本次退款金额
     */
    @JsonSetter("refund_amount")
    private Double refundAmount;
    /**
     * 本次退款金额
     */
    @JsonSetter("gmt_refund_pay")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private String refundTime;
    /**
     * 退款状态
     * REFUND_SUCCESS 退款处理成功; 未返回该字段表示退款请求未收到或者退款失败; 注:如果退款查询发起时间早于退款时间,或者间隔退款发起时间太短,可能出现退款查询时还没处理成功,后面又处理成功的情况,建议商户在退款发起后间隔10秒以上再发起退款查询请求。
     */
    @JsonSetter("refund_status")
    private String refundStatus;
    /**
     * 交易金额
     */
    @JsonSetter("total_amount")
    private Double totalAmount;
    /**
     * 支付宝交易号
     */
    @JsonSetter("trade_no")
    private String tradeNo;
}
ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml
@@ -7,8 +7,7 @@
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后,可以使“${}”来使用变量。 -->
<!--    <property name="log.path" value="/data/log/app/ruoyi-chargingPile"/>-->
    <property name="log.path" value="/Users/mitao/Documents/log/mx_charging_pile/log/app/ruoyi-chargingPile"/>
    <property name="log.path" value="/data/log/app/ruoyi-chargingPile"/>
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->
ruoyi-service/ruoyi-integration/src/main/resources/logback.xml
@@ -7,8 +7,7 @@
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后,可以使“${}”来使用变量。 -->
<!--    <property name="log.path" value="/data/log/app/ruoyi-integration"/>-->
    <property name="log.path" value="/Users/mitao/Documents/log/mx_charging_pile/log/app/ruoyi-integration"/>
    <property name="log.path" value="/data/log/app/ruoyi-integration"/>
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -2370,7 +2370,7 @@
    }
    /**
    /**+。
     * 手动添加完善订单费用明细
     *
     * @param orderId
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -5441,7 +5441,8 @@
            }
            if (2 == chargingOrder.getRechargePaymentType()) {
                QueryRefundReq dto = new QueryRefundReq();
                dto.setOutTradeNo(refund_out_trade_no);
                dto.setOutTradeNo(chargingOrder.getCode());
                dto.setOutRequestNo(refund_out_trade_no);
                QueryRefundResp data = aliPaymentClient.queryRefund(dto).getData();
                if (null == data) {
                    throw new ServiceException("退款查询失败");
@@ -5453,7 +5454,7 @@
                chargingOrderRefund.setRefundStatus(2);
                chargingOrderRefund.setPayType(1);
                chargingOrderRefund.setRefundSerialNumber(data.getOutRequestNo());
                chargingOrderRefund.setRefundTime(LocalDateTime.parse(data.getRefundTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                chargingOrderRefund.setRefundTime(null != chargingOrder.getEndTime() ? chargingOrder.getEndTime() : chargingOrder.getPayTime());
                chargingOrderRefund.setCode(chargingOrder.getCode());
                chargingOrderRefund.setRefundTitle(rechargeAmount.compareTo(chargingOrderRefund.getRefundAmount()) == 0 ? "充电失败" : "充电完成退款");
                chargingOrderRefund.setRefundContent(rechargeAmount.compareTo(chargingOrderRefund.getRefundAmount()) == 0 ? "充电失败" : "充电完成退款");
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
@@ -163,7 +163,8 @@
            log.info("请求参数:{}", req);
            log.info("返回结果:{}", response.getBody());
            if (response.isSuccess()) {
                return JSON.parseObject(response.getBody(), QueryRefundResp.class);
                JSONObject jsonObject = JSON.parseObject(response.getBody());
                return jsonObject.getObject("alipay_trade_fastpay_refund_query_response", QueryRefundResp.class);
            }
        }catch (Exception e){
            e.printStackTrace();