维权开发

ruoyi-shop/src/main/java/com/ruoyi/shop/enums/RightsOperatePerson.java

@@ -0,0 +1,53 @@
+package com.ruoyi.shop.enums;
+
+import com.ruoyi.common.enums.IIntegerEnum;
+
+import java.util.Objects;
+
+/**
+ * 维权单操作人（0会员，1商家，2系统）
+ */
+public enum RightsOperatePerson implements IIntegerEnum<Integer> {
+    USER(0, "会员"),
+    SYSTEM(1, "系统"),
+    SHOP(2, "商家"),
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    RightsOperatePerson(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+
+    @Override
+    public String getMsg() {
+        return msg;
+    }
+
+    public static RightsOperatePerson getByCode(Integer code, RightsOperatePerson[] values) {
+        for (RightsOperatePerson value : values) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static RightsOperatePerson getByCode(Integer code) {
+        for (RightsOperatePerson value : RightsOperatePerson.values()) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/SaleRightsOrderOperateRecord.java

@@ -1,13 +1,22 @@
 package com.ruoyi.shop.rights.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+import com.ruoyi.common.utils.ClassConvertUtils;
+import com.ruoyi.shop.enums.RightsOperatePerson;
+import com.ruoyi.shop.enums.RightsOperateStatus;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
+import org.apache.commons.lang3.StringUtils;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 维权单操作记录对象 tb_sale_rights_order_operate_record
@@ -22,7 +31,7 @@ public class SaleRightsOrderOperateRecord extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -33,7 +42,7 @@ public class SaleRightsOrderOperateRecord extends BaseEntity {
     /**
      * 维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消
      */
-    private Integer rightsOperateStatus;
+    private RightsOperateStatus rightsOperateStatus;
     /**
      * 操作理由
      */
@@ -42,10 +51,43 @@ public class SaleRightsOrderOperateRecord extends BaseEntity {
      * 操作凭证图
      */
     private String voucherImagesValue;
+    @TableField(exist = false)
+    @FilePathValue
+    private List<String> voucherImages;
+
+    public void setVoucherImages(List<String> voucherImages) {
+        this.voucherImages = voucherImages;
+        if(voucherImages.size()==0)
+        {
+            this.voucherImagesValue = "";
+        }
+        else
+        {
+            this.voucherImagesValue = JSONUtil.toJsonStr(this.voucherImages );
+        }
+
+    }
+    /**
+     * 把字符串映射成对象（多图）
+     */
+    public void setVoucherImagesValue(String voucherImagesValue) {
+        this.voucherImagesValue = voucherImagesValue;
+        if (StringUtils.isEmpty(this.voucherImagesValue)) {
+            setVoucherImages(new ArrayList<>());
+        } else {
+            try {
+                setVoucherImages(ClassConvertUtils.stringToClassSnake(voucherImagesValue, new TypeReference<List< String>>() {
+                }));
+            } catch (IOException e) {
+                throw new ServiceException("图片无法转List");
+            }
+
+        }
+    }
     /**
      * 操作人（0会员，1商家，2系统）
      */
-    private Integer rightsOperatePerson;
+    private RightsOperatePerson rightsOperatePerson;
     /**
      * 操作人
      */

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/bo/SaleRightsOrderBo.java

@@ -1,17 +1,24 @@
 package com.ruoyi.shop.rights.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+import com.ruoyi.shop.enums.RightsCargoStatus;
+import com.ruoyi.shop.enums.RightsOperateStatus;
+import com.ruoyi.shop.enums.RightsRefundStatus;
+import com.ruoyi.shop.enums.RightsType;
+import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.shop.order.enums.PaymentMethod;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.List;
 
 /**
  * 维权单业务对象 tb_sale_rights_order
@@ -25,7 +32,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class SaleRightsOrderBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空", groups = { EditGroup.class })
@@ -64,7 +71,7 @@ public class SaleRightsOrderBo extends BaseEntity {
      */
     @ApiModelProperty(value = "支付方式（0余额，1微信，2支付宝）", required = true)
     @NotNull(message = "支付方式（0余额，1微信，2支付宝）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer payMode;
+    private PaymentMethod payMode;
 
     /**
      * 退款总金额
@@ -99,28 +106,28 @@ public class SaleRightsOrderBo extends BaseEntity {
      */
     @ApiModelProperty(value = "维权的货物状态（（0未收货，1已收货）", required = true)
     @NotNull(message = "维权的货物状态（（0未收货，1已收货）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer rightsCargoStatus;
+    private RightsCargoStatus rightsCargoStatus;
 
     /**
      * 维权退款状态（0待退款，1退款成功，2退款失败）
      */
     @ApiModelProperty(value = "维权退款状态（0待退款，1退款成功，2退款失败）", required = true)
     @NotNull(message = "维权退款状态（0待退款，1退款成功，2退款失败）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer rightsRefundStatus;
+    private RightsRefundStatus rightsRefundStatus;
 
     /**
      * 维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消
      */
     @ApiModelProperty(value = "维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消", required = true)
     @NotNull(message = "维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer rightsOperateStatus;
+    private RightsOperateStatus rightsOperateStatus;
 
     /**
      * 0没有，1仅退款,2退款退货
      */
     @ApiModelProperty(value = "0没有，1仅退款,2退款退货", required = true)
     @NotNull(message = "0没有，1仅退款,2退款退货不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer rightsType;
+    private RightsType rightsType;
 
     /**
      * 维权原因
@@ -141,21 +148,21 @@ public class SaleRightsOrderBo extends BaseEntity {
      */
     @ApiModelProperty(value = "是否失效", required = true)
     @NotNull(message = "是否失效不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer valid;
+    private Boolean valid;
 
     /**
      * 维权证明图片
      */
     @ApiModelProperty(value = "维权证明图片", required = true)
-    @NotBlank(message = "维权证明图片不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String voucherImagesValue;
+    @FilePathValue
+    private List<String> voucherImages;
 
     /**
      * 是否是全订单维权（一个主订单只能有一个全维权订单），可以有多个子订单维权（一个子订单也只能有一个维权订单）
      */
     @ApiModelProperty(value = "是否是全订单维权（一个主订单只能有一个全维权订单），可以有多个子订单维权（一个子订单也只能有一个维权订单）", required = true)
     @NotNull(message = "是否是全订单维权（一个主订单只能有一个全维权订单），可以有多个子订单维权（一个子订单也只能有一个维权订单）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer isAllRights;
+    private Boolean isAllRights;
 
     /**
      * 维权单号
@@ -218,7 +225,7 @@ public class SaleRightsOrderBo extends BaseEntity {
      */
     @ApiModelProperty(value = "订单类型(0普通订单,2服务商品订单)", required = true)
     @NotNull(message = "订单类型(0普通订单,2服务商品订单)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer orderType;
+    private OrderType orderType;
 
 
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/bo/SaleRightsOrderOperateRecordBo.java

@@ -1,16 +1,19 @@
 package com.ruoyi.shop.rights.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+import com.ruoyi.shop.enums.RightsOperatePerson;
+import com.ruoyi.shop.enums.RightsOperateStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 维权单操作记录业务对象 tb_sale_rights_order_operate_record
@@ -24,7 +27,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class SaleRightsOrderOperateRecordBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空", groups = { EditGroup.class })
@@ -42,7 +45,7 @@ public class SaleRightsOrderOperateRecordBo extends BaseEntity {
      */
     @ApiModelProperty(value = "维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消", required = true)
     @NotNull(message = "维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer rightsOperateStatus;
+    private RightsOperateStatus rightsOperateStatus;
 
     /**
      * 操作理由
@@ -55,15 +58,15 @@ public class SaleRightsOrderOperateRecordBo extends BaseEntity {
      * 操作凭证图
      */
     @ApiModelProperty(value = "操作凭证图", required = true)
-    @NotBlank(message = "操作凭证图不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String voucherImagesValue;
+    @FilePathValue
+    private List<String> voucherImages;
 
     /**
      * 操作人（0会员，1商家，2系统）
      */
     @ApiModelProperty(value = "操作人（0会员，1商家，2系统）", required = true)
     @NotNull(message = "操作人（0会员，1商家，2系统）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer rightsOperatePerson;
+    private RightsOperatePerson rightsOperatePerson;
 
     /**
      * 操作人

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/vo/SaleRightsOrderOperateRecordVo.java

@@ -4,10 +4,14 @@ 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.shop.enums.RightsOperatePerson;
+import com.ruoyi.shop.enums.RightsOperateStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
+
+import java.util.List;
 
 
 /**
@@ -24,7 +28,7 @@ public class SaleRightsOrderOperateRecordVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     @ApiModelProperty("")
@@ -43,7 +47,7 @@ public class SaleRightsOrderOperateRecordVo {
     @ExcelProperty(value = "维权订单操作状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消")
     @ApiModelProperty("维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消")
-    private Integer rightsOperateStatus;
+    private RightsOperateStatus rightsOperateStatus;
 
     /**
      * 操作理由
@@ -56,8 +60,8 @@ public class SaleRightsOrderOperateRecordVo {
      * 操作凭证图
      */
     @ExcelProperty(value = "操作凭证图")
-    @ApiModelProperty("操作凭证图")
-    private String voucherImagesValue;
+    @FilePathValue
+    private List<String> voucherImages;
 
     /**
      * 操作人（0会员，1商家，2系统）
@@ -65,7 +69,7 @@ public class SaleRightsOrderOperateRecordVo {
     @ExcelProperty(value = "操作人", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=会员，1商家，2系统")
     @ApiModelProperty("操作人（0会员，1商家，2系统）")
-    private Integer rightsOperatePerson;
+    private RightsOperatePerson rightsOperatePerson;
 
     /**
      * 操作人

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/vo/SaleRightsOrderVo.java

@@ -1,14 +1,22 @@
 package com.ruoyi.shop.rights.domain.vo;
 
-import java.math.BigDecimal;
 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.shop.enums.RightsCargoStatus;
+import com.ruoyi.shop.enums.RightsOperateStatus;
+import com.ruoyi.shop.enums.RightsRefundStatus;
+import com.ruoyi.shop.enums.RightsType;
+import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.shop.order.enums.PaymentMethod;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
+
+import java.math.BigDecimal;
+import java.util.List;
 
 
 /**
@@ -25,7 +33,7 @@ public class SaleRightsOrderVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     @ApiModelProperty("")
@@ -65,7 +73,7 @@ public class SaleRightsOrderVo {
     @ExcelProperty(value = "支付方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=余额，1微信，2支付宝")
     @ApiModelProperty("支付方式（0余额，1微信，2支付宝）")
-    private Integer payMode;
+    private PaymentMethod payMode;
 
     /**
      * 退款总金额
@@ -101,7 +109,7 @@ public class SaleRightsOrderVo {
     @ExcelProperty(value = "维权的货物状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "（=0未收货，1已收货")
     @ApiModelProperty("维权的货物状态（（0未收货，1已收货）")
-    private Integer rightsCargoStatus;
+    private RightsCargoStatus rightsCargoStatus;
 
     /**
      * 维权退款状态（0待退款，1退款成功，2退款失败）
@@ -109,7 +117,7 @@ public class SaleRightsOrderVo {
     @ExcelProperty(value = "维权退款状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=待退款，1退款成功，2退款失败")
     @ApiModelProperty("维权退款状态（0待退款，1退款成功，2退款失败）")
-    private Integer rightsRefundStatus;
+    private RightsRefundStatus rightsRefundStatus;
 
     /**
      * 维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消
@@ -117,14 +125,14 @@ public class SaleRightsOrderVo {
     @ExcelProperty(value = "维权订单操作状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消")
     @ApiModelProperty("维权订单操作状态（0申请，1同意，2买家已发货，3商家已收到退货商品,4商家发起退款支付，5已支付退款,6拒绝，7自动关闭,8主动撤消")
-    private Integer rightsOperateStatus;
+    private RightsOperateStatus rightsOperateStatus;
 
     /**
      * 0没有，1仅退款,2退款退货
      */
     @ExcelProperty(value = "0没有，1仅退款,2退款退货")
     @ApiModelProperty("0没有，1仅退款,2退款退货")
-    private Integer rightsType;
+    private RightsType rightsType;
 
     /**
      * 维权原因
@@ -145,14 +153,14 @@ public class SaleRightsOrderVo {
      */
     @ExcelProperty(value = "是否失效")
     @ApiModelProperty("是否失效")
-    private Integer valid;
+    private Boolean valid;
 
     /**
      * 维权证明图片
      */
-    @ExcelProperty(value = "维权证明图片")
     @ApiModelProperty("维权证明图片")
-    private String voucherImagesValue;
+    @FilePathValue
+    private List<String> voucherImages;
 
     /**
      * 是否是全订单维权（一个主订单只能有一个全维权订单），可以有多个子订单维权（一个子订单也只能有一个维权订单）
@@ -160,7 +168,7 @@ public class SaleRightsOrderVo {
     @ExcelProperty(value = "是否是全订单维权", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "一=个主订单只能有一个全维权订单")
     @ApiModelProperty("是否是全订单维权（一个主订单只能有一个全维权订单），可以有多个子订单维权（一个子订单也只能有一个维权订单）")
-    private Integer isAllRights;
+    private Boolean isAllRights;
 
     /**
      * 维权单号
@@ -223,7 +231,7 @@ public class SaleRightsOrderVo {
      */
     @ExcelProperty(value = "订单类型(0普通订单,2服务商品订单)")
     @ApiModelProperty("订单类型(0普通订单,2服务商品订单)")
-    private Integer orderType;
+    private OrderType orderType;
 
 
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/service/impl/SaleRightsOrderOperateRecordServiceImpl.java

@@ -66,7 +66,6 @@ public class SaleRightsOrderOperateRecordServiceImpl implements ISaleRightsOrder
         lqw.eq(bo.getRightsId() != null, SaleRightsOrderOperateRecord::getRightsId, bo.getRightsId());
         lqw.eq(bo.getRightsOperateStatus() != null, SaleRightsOrderOperateRecord::getRightsOperateStatus, bo.getRightsOperateStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getReason()), SaleRightsOrderOperateRecord::getReason, bo.getReason());
-        lqw.eq(StringUtils.isNotBlank(bo.getVoucherImagesValue()), SaleRightsOrderOperateRecord::getVoucherImagesValue, bo.getVoucherImagesValue());
         lqw.eq(bo.getRightsOperatePerson() != null, SaleRightsOrderOperateRecord::getRightsOperatePerson, bo.getRightsOperatePerson());
         lqw.eq(bo.getRightsOperateId() != null, SaleRightsOrderOperateRecord::getRightsOperateId, bo.getRightsOperateId());
         return lqw;

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/service/impl/SaleRightsOrderServiceImpl.java

@@ -79,7 +79,6 @@ public class SaleRightsOrderServiceImpl implements ISaleRightsOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getReason()), SaleRightsOrder::getReason, bo.getReason());
         lqw.eq(StringUtils.isNotBlank(bo.getCaption()), SaleRightsOrder::getCaption, bo.getCaption());
         lqw.eq(bo.getValid() != null, SaleRightsOrder::getValid, bo.getValid());
-        lqw.eq(StringUtils.isNotBlank(bo.getVoucherImagesValue()), SaleRightsOrder::getVoucherImagesValue, bo.getVoucherImagesValue());
         lqw.eq(bo.getIsAllRights() != null, SaleRightsOrder::getIsAllRights, bo.getIsAllRights());
         lqw.eq(StringUtils.isNotBlank(bo.getRightsCode()), SaleRightsOrder::getRightsCode, bo.getRightsCode());
         lqw.eq(StringUtils.isNotBlank(bo.getThirdRefundCode()), SaleRightsOrder::getThirdRefundCode, bo.getThirdRefundCode());