linxk 3 тижнів тому
батько
коміт
32194b023c

+ 1 - 2
cif-service/src/main/java/com/txz/cif/service/UserService.java

@@ -2,7 +2,6 @@ package com.txz.cif.service;
 
 import com.txz.cif.core.Service;
 import com.txz.cif.model.User;
-import com.txz.cif.param.MessageParam;
 import com.txz.cif.web.para.UserAddParam;
 import com.txz.cif.core.Result;
 
@@ -34,5 +33,5 @@ public interface UserService extends Service<User> {
      */
     Long createUser(UserAddParam param, String userName, Integer type);
 
-    boolean sendMsg(MessageParam param);
+//    boolean sendMsg(MessageParam param);
 }

+ 26 - 27
cif-service/src/main/java/com/txz/cif/service/impl/UserServiceImpl.java

@@ -11,7 +11,6 @@ import com.txz.cif.core.*;
 import com.txz.cif.dubbo.client.OperatingConfigDubboServiceClient;
 import com.txz.cif.enums.MessageBizTypeEnum;
 import com.txz.cif.model.*;
-import com.txz.cif.param.MessageParam;
 import com.txz.cif.dao.UserMapper;
 import com.txz.cif.service.*;
 import com.txz.cif.web.para.UserAddParam;
@@ -177,32 +176,32 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
        return user.getId();
     }
 
-    @Override
-    public boolean sendMsg(MessageParam param) {
-        if (param == null){
-            return false;
-        }
-        if (param.getUserId() == null){
-            log.info("[发送消息]失败,未传用户id");
-            return false;
-        }
-        if (param.getBizType() == null){
-            log.info("[发送消息]失败,业务类型为空");
-            return false;
-        }
-        User user = findById(param.getUserId());
-        if (user == null){
-            log.info("[发送消息]失败,用户未找到");
-            return false;
-        }
-        if (user.getLastLoginTime()!= null && DateUtil.between(user.getLastLoginTime(),DateUtil.date(), DateUnit.MINUTE)<=30
-            && !MessageBizTypeEnum.getActiveByKey(param.getBizType())){
-            log.info("[发送消息]未发送,用户处于活跃状态,不发送消息");
-            return true;
-        }
-
-        return false;
-    }
+//    @Override
+//    public boolean sendMsg(MessageParam param) {
+//        if (param == null){
+//            return false;
+//        }
+//        if (param.getUserId() == null){
+//            log.info("[发送消息]失败,未传用户id");
+//            return false;
+//        }
+//        if (param.getBizType() == null){
+//            log.info("[发送消息]失败,业务类型为空");
+//            return false;
+//        }
+//        User user = findById(param.getUserId());
+//        if (user == null){
+//            log.info("[发送消息]失败,用户未找到");
+//            return false;
+//        }
+//        if (user.getLastLoginTime()!= null && DateUtil.between(user.getLastLoginTime(),DateUtil.date(), DateUnit.MINUTE)<=30
+//            && !MessageBizTypeEnum.getActiveByKey(param.getBizType())){
+//            log.info("[发送消息]未发送,用户处于活跃状态,不发送消息");
+//            return true;
+//        }
+//
+//        return false;
+//    }
 
     private boolean checkSend(Integer bizType, Integer message, int type) {
         boolean isSend = false;

+ 1 - 1
cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.txz.cif.core.AuthService;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.Goods;
@@ -18,6 +17,7 @@ import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.core.AuthService;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;