PC举报修改

alien-entity/src/main/java/shop/alien/entity/second/vo/SecondUserViolationVo.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import shop.alien.entity.store.LifeUserViolation;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,7 +18,7 @@ import java.util.Date;
 @JsonInclude
 @NoArgsConstructor
 @ApiModel(value = "SecondUserViolation对象", description = "二手交易平台管理举报")
-public class SecondUserViolationVo implements Serializable {
+public class SecondUserViolationVo extends LifeUserViolation {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "分页页数")
@@ -26,49 +27,16 @@ public class SecondUserViolationVo implements Serializable {
     @ApiModelProperty(value = "分页条数")
     private Integer pageSize;
 
-    @ApiModelProperty(value = "主键ID")
-    private Integer id;
-
-    @ApiModelProperty(value = "被举报用户名称")
-    private String reportedUserName;
-
-    @ApiModelProperty(value = "被举报用户电话")
-    private String reportedUserPhone;
-
     @ApiModelProperty(value = "举报用户名称")
     private String reportingUserName;
 
     @ApiModelProperty(value = "举报用户电话")
     private String reportingUserPhone;
 
-    @ApiModelProperty(value = "举报类型")
-    private String reportContext;
-
-    @ApiModelProperty(value = "举报类型 4:二手商品 5:二手用户")
-    private Integer reportContextType;
-
-    @ApiModelProperty(value = "举报枚举")
-    private String dictDetail;
-
-    @ApiModelProperty(value = "举报状态")
-    private String processingContext;
-
-    @ApiModelProperty(value = "举报状态 0:待处理 1:已通过 2:已驳回")
-    private String processingStatus;
-
     @ApiModelProperty(value = "举报时间")
     private String reportingDate;
 
-    @ApiModelProperty(value = "举报时间")
-    private String createdTime;
-
-    @ApiModelProperty(value = "业务id")
-    private Integer businessId;
-
-    @ApiModelProperty(value = "处理时间")
-    private String processingTime;
-
-    @ApiModelProperty(value = "举报结果")
-    private String reportResult;
+    @ApiModelProperty(value = "商品图片")
+    private List<String> imgUrl;
 
 }

alien-entity/src/main/java/shop/alien/mapper/second/SecondUserViolationMapper.java

@@ -14,7 +14,7 @@ public interface SecondUserViolationMapper extends BaseMapper<SecondUserViolatio
 
     IPage<SecondUserViolationVo> getUserViolationByPage(IPage<SecondUserViolationVo> page, @Param("reportingUserName") String reportingUserName,
                                                         @Param("reportingDate") String reportingDate, @Param("processingStatus") String processingStatus,
-                                                        @Param("reportContextType") Integer reportContextType);
+                                                        @Param("reportContextType") String reportContextType);
 
     SecondUserViolationDetailVo getUserViolationInfo(@Param("id") Integer id);
 }

alien-second/src/main/java/shop/alien/second/service/PlatformUserViolationService.java

@@ -8,7 +8,7 @@ import shop.alien.entity.store.LifeUserViolation;
 
 public interface PlatformUserViolationService extends IService<SecondUserViolationVo> {
 
-    IPage<SecondUserViolationVo> getUserViolationByPage(IPage<SecondUserViolationVo> page, String reportingUserName, String reportingDate, String processingStatus, Integer reportContextType) throws Exception;
+    IPage<SecondUserViolationVo> getUserViolationByPage(IPage<SecondUserViolationVo> page, String reportingUserName, String reportingDate, String processingStatus, String reportContextType) throws Exception;
 
     SecondUserViolationDetailVo getUserViolationDetail(Integer id) throws Exception;
 

alien-second/src/main/java/shop/alien/second/service/impl/PlatformUserViolationServiceImpl.java

@@ -45,7 +45,7 @@ public class PlatformUserViolationServiceImpl extends ServiceImpl<SecondUserViol
 
     @Override
     public IPage<SecondUserViolationVo> getUserViolationByPage(IPage<SecondUserViolationVo> page, String reportingUserName,
-                                                               String reportingDate, String processingStatus, Integer reportContextType) throws Exception {
+                                                               String reportingDate, String processingStatus, String reportContextType) throws Exception {
         try {
             return mapper.getUserViolationByPage(page, reportingUserName, reportingDate, processingStatus, reportContextType);
         } catch (Exception e) {
@@ -61,7 +61,7 @@ public class PlatformUserViolationServiceImpl extends ServiceImpl<SecondUserViol
             SecondUserViolationDetailVo item =mapper.getUserViolationInfo(id);
 
             // 商品的时候查询商品信息
-            if (item.getReportContextType() == 4) {
+            if ("4".equals(item.getReportContextType())) {
                 SecondGoodsVo secondGoods = secondGoodsService.dealSecondGoodsRecordInfo(item.getBusinessId());
                 item.setSecondGoods(secondGoods);
             }