售后费用代码提交

nightFragrance-massage/src/main/java/com/ylx/massage/domain/AfterSaleOrderFee.java

@@ -0,0 +1,44 @@
+package com.ylx.massage.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("after_sale_order")
+public class AfterSaleOrderFee implements Serializable {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 原订单编号 */
+    private String orderNo;
+
+    /** 售后单ID */
+    private Long afterSaleOrderId;
+
+    /** 费用类型 */
+    private String type;
+
+    /** 金额 */
+    private BigDecimal fee;
+
+    /** 描述 */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/AfterSaleOrderFeeDTO.java

@@ -0,0 +1,21 @@
+package com.ylx.massage.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("售后费用详情dto")
+public class AfterSaleOrderFeeDTO {
+
+    @ApiModelProperty("费用类型")
+    private String type;
+
+    @ApiModelProperty("金额")
+    private BigDecimal fee;
+
+    @ApiModelProperty("描述")
+    private String remark;
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/AfterSaleOrderFeeVo.java

@@ -0,0 +1,22 @@
+package com.ylx.massage.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("售后费用详情vo")
+public class AfterSaleOrderFeeVo {
+
+    @ApiModelProperty("费用类型")
+    private String type;
+
+    @ApiModelProperty("金额")
+    private BigDecimal fee;
+
+    @ApiModelProperty("描述")
+    private String remark;
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/OrderAfterSaleVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @ApiModel("商品售后vo")
@@ -13,91 +14,22 @@ public class OrderAfterSaleVo {
     @ApiModelProperty("售后信息ID")
     private Long id;
 
-    /** 售后单号（唯一） */
-    private String afterSaleNo;
-
-    /** 原订单ID */
-    private Long orderId;
-
-    /** 原订单编号 */
-    private String orderNo;
-
-    /** 用户ID */
-    private Long userId;
-
-    /**
-     * 收货状态
-     * 1未收货 2已收货
-     */
-    private Integer receiptStatus;
-
     @ApiModelProperty("售后类型:1退货 2换货")
     private Integer afterSaleType;
 
-    /**
-     * 售后状态
-     * 0待审核 1审核通过 2审核拒绝 3待买家退货 4待商家收货 5退款处理中 6售后完成
-     */
-    private Integer afterSaleStatus;
+    @ApiModelProperty("申请时间")
+    private LocalDateTime createTime;
 
     @ApiModelProperty("申请原因")
     private Integer applyReason;
 
-    /** 问题描述 */
-    private String applyDesc;
-
-    /** 凭证图片URL，多个逗号分隔（最多3张） */
-    private String applyImages;
-
-    /** 申请退款金额（分） */
-    private Integer applyAmount;
-
-    /** 实际退款金额（分） */
-    private Integer actualRefundAmount;
-
-    /**
-     * 退款方式
-     * 1原路退回 2退至余额
-     */
-    private Integer refundType;
-
-    /** 审核人ID */
-    private Long auditUserId;
-
-    /** 审核时间 */
-    private LocalDateTime auditTime;
-
-    /** 审核备注（拒绝原因等） */
-    private String auditRemark;
-
-    /**
-     * 拒绝原因
-     * 1超过售后期限 2不符合售后条件 3凭证不足 4其他
-     */
-    private Integer rejectReason;
-
-    /** 退款完成时间 */
-    private LocalDateTime refundTime;
-
-    /** 退款流水号（第三方） */
-    private String refundNo;
-
-    /** 换货新订单ID */
-    private Long exchangeOrderId;
-
-    /** 换货新订单编号 */
-    private String exchangeOrderNo;
-
-    /** 售后申请过期时间 */
-    private LocalDateTime expireTime;
-
-    /** 售后完成时间 */
-    private LocalDateTime finishTime;
+    @ApiModelProperty("售后状态:0待审核 1审核通过 2审核拒绝 3待买家退货 4待商家收货 5退款处理中 6售后完成")
+    private Integer afterSaleStatus;
 
-    /** 备注 */
-    private String remark;
+    @ApiModelProperty("物流单号")
+    private String logisticsNo;
 
-    @ApiModelProperty("申请时间")
-    private LocalDateTime createTime;
+    @ApiModelProperty("费用")
+    private List<AfterSaleOrderFeeVo> feeList;
 
 }

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/AfterSaleOrderFeeMapper.java

@@ -0,0 +1,9 @@
+package com.ylx.massage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ylx.massage.domain.AfterSaleOrderFee;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AfterSaleOrderFeeMapper extends BaseMapper<AfterSaleOrderFee> {
+}

nightFragrance-massage/src/main/java/com/ylx/massage/service/IAfterSaleOrderFeeService.java

@@ -0,0 +1,7 @@
+package com.ylx.massage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ylx.massage.domain.AfterSaleOrderFee;
+
+public interface IAfterSaleOrderFeeService extends IService<AfterSaleOrderFee> {
+}

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AfterSaleOrderFeeServiceImpl.java

@@ -0,0 +1,17 @@
+package com.ylx.massage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.massage.domain.AfterSaleOrderFee;
+import com.ylx.massage.mapper.AfterSaleOrderFeeMapper;
+import com.ylx.massage.service.IAfterSaleOrderFeeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class AfterSaleOrderFeeServiceImpl extends ServiceImpl<AfterSaleOrderFeeMapper, AfterSaleOrderFee> implements IAfterSaleOrderFeeService {
+
+    @Resource
+    private AfterSaleOrderFeeMapper afterSaleOrderFeeMapper;
+
+}