guomengjiao 2 miesięcy temu
rodzic
commit
417d04dfd7

+ 3 - 0
ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiOrderRefundController.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.info.order.domain.bo.OrderRefundBo;
 import com.ruoyi.info.order.domain.vo.OrderRefundVo;
 import com.ruoyi.info.order.enums.RefundStatus;
@@ -58,6 +60,7 @@ public class ApiOrderRefundController extends AbstractApiController {
     /**
      * 获取售后订单详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取售后订单详细信息")
     @GetMapping("/info/{id}")
     public R<OrderRefundVo> getInfo(@ApiParam("主键")

+ 4 - 6
ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/domain/vo/OrderRefundVo.java

@@ -1,16 +1,14 @@
 package com.ruoyi.info.order.domain.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.info.order.enums.RefundStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -147,7 +145,7 @@ public class OrderRefundVo {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
-
+    @FilePathValue
     @ApiModelProperty("订单信息")
     private OrderVo orderVo;
 

+ 6 - 0
ruoyi-info/ruoyi-info-biz/src/main/resources/mapper/order/OrderRefundMapper.xml

@@ -22,6 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="refundTradeNo" column="refund_trade_no"/>
         <result property="completeTime" column="complete_time"/>
         <result property="createTime" column="create_time"/>
+        <result property="serviceId" column="service_id"/>
+        <result property="serviceInfo" column="service_info"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="sellingPrice" column="selling_price"/>
+        <result property="totalPrice" column="total_price"/>
+        <result property="payPrice" column="pay_price"/>
         <association property="orderVo" javaType="com.ruoyi.info.order.domain.vo.OrderVo">
             <result property="hospitalInfo" column="hospital_info"/>
             <result property="hospitalDepartmentInfo" column="hospital_department_info"/>

+ 1 - 1
script/sql/baifc-0928.sql

@@ -115,7 +115,7 @@ CREATE TABLE `tb_order_refund`  (
     `order_num` int(0) NOT NULL COMMENT '下单数量',
     `selling_price` decimal(10, 2) NOT NULL COMMENT '销售价',
     `total_price` decimal(10, 2) NOT NULL COMMENT '应付价格',
-    `pay_price` decimal(10, 2) NOT NULL COMMENT '实际支付金额',
+    `pay_price` decimal(10, 2) NULL COMMENT '实际支付金额',
     `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
     `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`) USING BTREE,