菜单提示相关数量查询接口、插入消息接口调整；如果是投诉平台则跳过不必要的逻辑处理

src/main/java/com/sqx/modules/coupon/controller/CouponController.java

@@ -47,10 +47,10 @@ public class CouponController extends AbstractController {
 
     @ApiOperation("管理端赠送用户优惠券")
     @GetMapping(value = "/giveCoupon")
-    public Result giveCoupon(Long couponId, String userIds, Long shopId){
+    public Result giveCoupon(Long couponId, String userIds, Long shopId,@RequestParam(value = "amount",required = false) Integer amount){
         String[] userId = userIds.split(",");
         List<String> userIdList = Arrays.asList(userId);
-        return couponService.giveCoupon(couponId, userIdList, shopId);
+        return couponService.giveCoupon(couponId, userIdList, shopId,amount);
     }
 
-}
+}

src/main/java/com/sqx/modules/coupon/service/CouponService.java

@@ -18,6 +18,6 @@ public interface CouponService extends IService<Coupon> {
 
     Result selectCouponList(Integer page, Integer limit);
 
-    Result giveCoupon(Long couponId, List<String> userIdList, Long shopId);
+    Result giveCoupon(Long couponId, List<String> userIdList, Long shopId, Integer amount);
 
 }

src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java

@@ -60,7 +60,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, Coupon> implements
 
     @Transactional
     @Override
-    public Result giveCoupon(Long couponId, List<String> userIdList, Long shopId) {
+    public Result giveCoupon(Long couponId, List<String> userIdList, Long shopId, Integer amount) {
         Coupon coupon = couponDao.selectById(couponId);
         //计算优惠券过期时间
         Integer endDate = coupon.getEndDate();
@@ -70,8 +70,11 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, Coupon> implements
         Date date = calendar.getTime();
         String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String expirationTime = new SimpleDateFormat("yyyy-MM-dd").format(date);
-        couponUserDao.giveCoupon(userIdList, coupon.getCouponName(), coupon.getCouponPicture(), createTime, expirationTime, coupon.getMinMoney(),
+        if(amount == null) amount = 3;
-                coupon.getMoney(), 0,coupon.getEndDate().toString());
+        for (Integer i = 0; i < amount; i++) {
+            couponUserDao.giveCoupon(userIdList, coupon.getCouponName(), coupon.getCouponPicture(), createTime, expirationTime, coupon.getMinMoney(),
+                    coupon.getMoney(), 0, coupon.getEndDate().toString());
+        }
         return Result.success();
     }
 

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);
     }
 
-}
+    @GetMapping("/dataSelectXxzx")
+    @ApiOperation("获取消息中心未读数据")
+    public Result dataSelectXxzx(){
+        QueryWrapper<MessageInfo> 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));
+    }
+}

src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java

@@ -136,4 +136,4 @@ public class AppMessageController {
     }
 
 
-}
+}

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() {}
 
-}
+    //投诉类型时，记录被举报对象类型，技师：null，平台：PT
+    @TableField(exist = false)
+    private String obj;
+
+}

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());