Merge remote-tracking branch 'origin/master'

xuhy

2024-09-02 cb63313e5e30efc4f246546c9c7f07ffeff4a0e2

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java

@@ -122,7 +122,7 @@
    @ApiModelProperty(value = "充值支付第三方流水号")
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;
    

    @ApiModelProperty(value = "剩余金额（用于前端展示）")
    @TableField("residual_amount")
    private BigDecimal residualAmount;
@@ -185,5 +185,4 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;
    
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -142,6 +142,12 @@
    public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) {
        return chargingOrderService.payOrderQuery(payOrderQueryDto);
    }
    @ResponseBody
    @PostMapping(value = "/pay/order/refund")
    @ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
    public R refund(@RequestBody PayOrderRefundDto payOrderQueryDto) {
        return chargingOrderService.payRefund(payOrderQueryDto);
    }

    @ResponseBody
    @GetMapping(value = "/pay/order/pay/detail")

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderRefundDto.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;

@Data
public class PayOrderRefundDto{
    private Long orderId;
    @ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
    private Integer type;
    private BigDecimal refundAmount;
    private String reason;
    private String remark;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -130,6 +130,8 @@

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);

    R payRefund(PayOrderRefundDto payOrderQueryDto);

    ChargingOrderListInfoVO chargingInfo(String uid);



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

@@ -361,6 +361,7 @@
        if(1 == paymentType){
            WxPaymentRefundModel model = new WxPaymentRefundModel();
            model.setOut_trade_no(shoppingOrder.getCode());
            model.setTransaction_id(shoppingOrder.getSerialNumber());
            model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
            model.setReason("取消订单");
            model.setNotify_url("http://127.0.0.1:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");