售后订单

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/Order.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseTimeEntity;
 import com.ruoyi.info.order.enums.CancellationMethod;
 import com.ruoyi.info.order.enums.OrderStatus;
+import com.ruoyi.info.order.enums.PayMethod;
 import com.ruoyi.info.service.enums.ServiceUnit;
 import lombok.Data;
 
@@ -104,6 +105,22 @@ public class Order extends BaseTimeEntity {
      * 应付价格
      */
     private BigDecimal totalPrice;
+    /**
+     * 实付价格
+     */
+    private BigDecimal payPrice;
+    /**
+     * 支付方式
+     */
+    private PayMethod payMethod;
+    /**
+     * 订单支付时间
+     */
+    private Date payTime;
+    /**
+     * 订单支付流水号
+     */
+    private String payTradeNo;
     /**
      * 护工ID
      */

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/OrderRefund.java

@@ -75,5 +75,12 @@ public class OrderRefund extends BaseTimeEntity {
      * 操作人
      */
     private Long operatorId;
-
+    /**
+     * 退款交易号
+     */
+    private String refundTradeNo;
+    /**
+     * 退款完成时间
+     */
+    private Date completeTime;
 }

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderRefundVo.java

@@ -111,5 +111,16 @@ public class OrderRefundVo {
     @ApiModelProperty("操作人")
     private Long operatorId;
 
-
+    /**
+     * 退款交易号
+     */
+    @ExcelProperty(value = "退款交易号")
+    @ApiModelProperty("退款交易号")
+    private String refundTradeNo;
+    /**
+     * 退款完成时间
+     */
+    @ExcelProperty(value = "退款完成时间")
+    @ApiModelProperty("退款完成时间")
+    private Date completeTime;
 }

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderVo.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.order.enums.CancellationMethod;
 import com.ruoyi.info.order.enums.OrderStatus;
+import com.ruoyi.info.order.enums.PayMethod;
 import com.ruoyi.info.patient.domain.vo.PatientVo;
 import com.ruoyi.info.service.enums.ServiceUnit;
 import io.swagger.annotations.ApiModel;
@@ -183,6 +184,31 @@ public class OrderVo {
     @ExcelProperty(value = "应付金额", order = 15)
     @ApiModelProperty("应付价格")
     private BigDecimal totalPrice;
+    /**
+     * 实付价格
+     */
+    @ExcelProperty(value = "实付金额")
+    @ApiModelProperty("实付价格")
+    private BigDecimal payPrice;
+    /**
+     * 支付方式
+     */
+    @ExcelProperty(value = "支付方式", converter = ExcelEnumConvert.class)
+    @ExcelDictFormat(readConverterExp = "wx=微信")
+    @ApiModelProperty("支付方式")
+    private PayMethod payMethod;
+    /**
+     * 订单支付时间
+     */
+    @ExcelProperty(value = "订单支付时间")
+    @ApiModelProperty("订单支付时间")
+    private Date payTime;
+    /**
+     * 订单支付流水号
+     */
+    @ExcelProperty(value = "订单支付流水号")
+    @ApiModelProperty("订单支付流水号")
+    private String payTradeNo;
     /**
      * 护工ID
      */

ruoyi-info/src/main/java/com/ruoyi/info/order/enums/PayMethod.java

@@ -0,0 +1,68 @@
+package com.ruoyi.info.order.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.ruoyi.common.enums.IIntegerEnum;
+
+import java.util.Objects;
+
+public enum PayMethod implements IIntegerEnum<Integer> {
+
+    wx(1, "微信"),
+    ;
+
+    PayMethod(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @EnumValue
+    @JsonValue
+    private Integer code;
+
+    private String msg;
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @JsonCreator
+    public static PayMethod getByCode(Integer code) {
+        for (PayMethod value : PayMethod.values()) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    //转成jsonarray
+    public static JSONArray toJsonArray() {
+        JSONArray jsonArray = new JSONArray();
+        for (PayMethod value : PayMethod.values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("code", value.getCode());
+            jsonObject.put("value", value.getMsg());
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+
+}

ruoyi-info/src/main/resources/mapper/order/OrderMapper.xml

@@ -25,6 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderNum" column="order_num"/>
         <result property="sellingPrice" column="selling_price"/>
         <result property="totalPrice" column="total_price"/>
+        <result property="payPrice" column="pay_price"/>
+        <result property="payMethod" column="pay_method"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="payTradeNo" column="pay_trade_no"/>
         <result property="workerId" column="worker_id"/>
         <result property="cancellationMethod" column="cancellation_method"/>
         <result property="cancellationTime" column="cancellation_time"/>

ruoyi-info/src/main/resources/mapper/order/OrderRefundMapper.xml

@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="operationReason" column="operation_reason"/>
         <result property="operationTime" column="operation_time"/>
         <result property="operatorId" column="operator_id"/>
+        <result property="refundTradeNo" column="refund_trade_no"/>
+        <result property="completeTime" column="complete_time"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>

script/sql/baifc-0928.sql

@@ -105,6 +105,8 @@ CREATE TABLE `tb_order_refund`  (
     `operation_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作原因',
     `operation_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
     `operator_id` bigint(0) NULL DEFAULT NULL COMMENT '操作人',
+    `refund_trade_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '退款交易号',
+    `complete_time` datetime DEFAULT NULL COMMENT '退款完成时间',
     `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
     `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`) USING BTREE,
@@ -146,5 +148,9 @@ CREATE TABLE `tb_order_worker_change_record`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单更换分配护工记录' ROW_FORMAT = Dynamic;
 
 ALTER TABLE `tb_order`
-    ADD COLUMN `worker_id` bigint NULL COMMENT '护工ID' AFTER `total_price`,
-ADD INDEX `inx_worker_id`(`worker_id`);
+    ADD COLUMN `pay_price` decimal(10, 2) NULL COMMENT '实际支付金额' AFTER `total_price`,
+    ADD COLUMN `pay_method` tinyint DEFAULT NULL COMMENT '支付方式' AFTER `pay_price`,
+    ADD COLUMN `pay_time` datetime NULL COMMENT '支付时间' AFTER `pay_method`,
+    ADD COLUMN `pay_trade_no` varchar(100) NULL COMMENT '第三方支付交易号' AFTER `pay_time`,
+    ADD COLUMN `worker_id` bigint NULL COMMENT '护工ID' AFTER `pay_trade_no`,
+    ADD INDEX `inx_worker_id`(`worker_id`);