diff --git a/src/main/java/com/sqx/modules/message/controller/MessageController.java b/src/main/java/com/sqx/modules/message/controller/MessageController.java index 64386eb..f17e4f2 100644 --- a/src/main/java/com/sqx/modules/message/controller/MessageController.java +++ b/src/main/java/com/sqx/modules/message/controller/MessageController.java @@ -6,6 +6,7 @@ import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.message.service.MessageService; +import com.sqx.modules.shipinquan.entity.BlShipinquan; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -195,4 +196,12 @@ public class MessageController { return messageService.selectArtificerList(page, limit, artificerName, phone); } -} \ No newline at end of file + @GetMapping("/dataSelectXxzx") + @ApiOperation("获取消息中心未读数据") + public Result dataSelectXxzx(){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("state",2); + qw.and(q->q.isNull("is_see").or().eq("is_see",1)); + return Result.success().put("data",messageService.count(qw)); + } +} diff --git a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java index d213b5e..2a92106 100644 --- a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java +++ b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java @@ -136,4 +136,4 @@ public class AppMessageController { } -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/message/entity/MessageInfo.java b/src/main/java/com/sqx/modules/message/entity/MessageInfo.java index bae5d77..0bf7c5e 100644 --- a/src/main/java/com/sqx/modules/message/entity/MessageInfo.java +++ b/src/main/java/com/sqx/modules/message/entity/MessageInfo.java @@ -50,6 +50,7 @@ public class MessageInfo implements Serializable { /** * 分类 + * 2 消息 * 4 开通会员、取消会员 * 5 系统通知(系统通知、提现通知) * 6 举报 @@ -107,4 +108,8 @@ public class MessageInfo implements Serializable { public MessageInfo() {} -} \ No newline at end of file + //投诉类型时,记录被举报对象类型,技师:null,平台:PT + @TableField(exist = false) + private String obj; + +} diff --git a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java index bf8ac57..fb5cf9b 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java @@ -61,7 +61,7 @@ public class MessageServiceImpl extends for(String id:ids.split(",")){ MessageInfo messageInfo = baseMapper.selectById(Long.parseLong(id)); if("0".equals(messageInfo.getType())){ - if(status==1){ + if(status==1 && !"-1".equals(messageInfo.getByUserId())){ Artificer artificer = artificerService.selectArtificerByUserId(Long.parseLong(messageInfo.getByUserId())); MessageInfo type = baseMapper.selectById(messageInfo.getTypeId()); BigDecimal subtract = artificer.getCreditScore().subtract(new BigDecimal(type.getContent())); @@ -132,7 +132,7 @@ public class MessageServiceImpl extends SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date now = new Date(); messageInfo.setCreateAt(sdf.format(now)); - if(StringUtils.isNotBlank(messageInfo.getState()) && "7".equals(messageInfo.getState())){ + if(StringUtils.isNotBlank(messageInfo.getState()) && "7".equals(messageInfo.getState()) && messageInfo.getObj() == null){ Risk risk=new Risk(); risk.setUserId(Long.parseLong(messageInfo.getByUserId())); risk.setContent("用户被举报:"+messageInfo.getContent());