订单售后代码提交

nightFragrance-massage/src/main/java/com/ylx/order/controller/RefundController.java → nightFragrance-massage/src/main/java/com/ylx/order/controller/AfterSalesServiceController.java

@@ -2,6 +2,7 @@ package com.ylx.order.controller;
 
 import com.ylx.common.core.domain.R;
 import com.ylx.order.domain.vo.RegulationConfigVO;
+import com.ylx.order.service.IAfterSalesServiceService;
 import com.ylx.order.service.RegulationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,13 +15,15 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @RestController
-@RequestMapping("/order/refund")
-@Api(tags = {"订单退款模块"})
+@RequestMapping("/order/after/sale")
+@Api(tags = {"订单售后模块"})
 @Slf4j
-public class RefundController {
+public class AfterSalesServiceController {
 
     @Resource
     private RegulationService regulationService;
+    @Resource
+    private IAfterSalesServiceService afterSalesServiceService;
 
     @ApiOperation("根据商户履约状态获取退款描述")
     @GetMapping("/desc/list")

nightFragrance-massage/src/main/java/com/ylx/order/domain/AfterSalesService.java

@@ -0,0 +1,61 @@
+package com.ylx.order.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.ylx.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "AfterSalesService", description = "售后服务表")
+public class AfterSalesService extends BaseEntity {
+    private static final long serialVersionUID = -4127766374308440702L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("售后单号")
+    private String serviceNo;
+
+    @ApiModelProperty("关联的主订单ID")
+    private Long orderId;
+
+    @ApiModelProperty("发起售后的用户ID")
+    private Long userId;
+
+    @ApiModelProperty("售后状态：0=待审核, 1=审核通过(退款中), 2=审核拒绝, 3=退款成功, 4=退款失败 ")
+    private Integer status;
+
+    @ApiModelProperty("退款金额")
+    private BigDecimal actualRefundAmount;
+
+    @ApiModelProperty("退款规则描述")
+    private String refundDesc;
+
+    @ApiModelProperty("审核人ID")
+    private Long auditUserId;
+
+    @ApiModelProperty("审核时间")
+    private LocalDateTime auditTime;
+
+    @ApiModelProperty("拒绝原因")
+    private String rejectReason;
+
+    @ApiModelProperty("审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty("退款成功时间")
+    private LocalDateTime refundSuccessTime;
+
+    @TableLogic
+    @ApiModelProperty("是否删除 0=否，1=是")
+    private Integer isDelete;
+}

nightFragrance-massage/src/main/java/com/ylx/order/enums/AfterSaleServiceStatusEnum.java

@@ -0,0 +1,22 @@
+package com.ylx.order.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum AfterSaleServiceStatusEnum {
+
+    PENDING_AUDIT(0, "待审核"),
+    APPROVED(1, "审核通过(退款中)"),
+    REJECTED(2, "审核拒绝"),
+    REFUND_SUCCESS(3, "退款成功"),
+    REFUND_FAILED(4, "退款失败");
+
+    private final Integer code;
+    private final String desc;
+
+    AfterSaleServiceStatusEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/order/enums/OrderStatusEnum.java

@@ -10,12 +10,11 @@ public enum OrderStatusEnum {
     PENDING_ACCEPT(2, "待接单"),
     PENDING_SERVICE(3, "待服务"),
     IN_SERVICE(4, "服务中"),
-    IN_AFTER_SALE(5, "售后中"),
-    COMPLETED(6, "已完成"),
-    REFUNDED(7, "已退款"),
-    CANCELLED(8, "已取消"),
-    CLOSED(9, "已关闭"),
-    REJECTED(10, "拒绝接单");
+    COMPLETED(5, "已完成"),
+    REFUNDED(6, "已退款"),
+    CANCELLED(7, "已取消"),
+    CLOSED(8, "已关闭"),
+    REJECTED(9, "拒绝接单");
 
     private final Integer code;
     private final String info;

nightFragrance-massage/src/main/java/com/ylx/order/mapper/AfterSalesServiceMapper.java

@@ -0,0 +1,7 @@
+package com.ylx.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ylx.order.domain.AfterSalesService;
+
+public interface AfterSalesServiceMapper extends BaseMapper<AfterSalesService> {
+}

nightFragrance-massage/src/main/java/com/ylx/order/service/IAfterSalesServiceService.java

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

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

@@ -0,0 +1,14 @@
+package com.ylx.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.order.domain.AfterSalesService;
+import com.ylx.order.mapper.AfterSalesServiceMapper;
+import com.ylx.order.service.IAfterSalesServiceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class AfterSalesServiceServiceImpl extends ServiceImpl<AfterSalesServiceMapper, AfterSalesService>
+        implements IAfterSalesServiceService {
+}

nightFragrance-massage/src/main/resources/mapper/order/AfterSalesServiceMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ylx.order.mapper.AfterSalesServiceMapper">
+
+</mapper>