nickName 问题修复

fs-admin-saas/src/main/java/com/fs/user/controller/FsUserIntegralController.java

@@ -98,7 +98,6 @@ public class FsUserIntegralController {
         }
         if (StringUtils.isNotEmpty(nickName)) {
             queryUser.setNickName(nickName);
-            queryUser.setNickname(nickName);
         }
         
         // 查询用户列表（只返回需要的字段）

fs-live-app/src/main/java/com/fs/live/websocket/handle/LiveChatHandler.java

@@ -77,7 +77,7 @@ public class LiveChatHandler extends SimpleChannelInboundHandler<TextWebSocketFr
                     sendMsgVo.setCmd("entry");
                     sendMsgVo.setMsg("用户进入");
                     sendMsgVo.setData(JSONObject.toJSONString(liveWatchUser));
-                    sendMsgVo.setNickName(fsUser.getNickname());
+                    sendMsgVo.setNickName(fsUser.getNickName());
                     sendMsgVo.setAvatar(fsUser.getAvatar());
                     broadcastMessage(liveId, JSONObject.toJSONString(R.ok().put("data", sendMsgVo)));
                 } else if (userType == 1) {
@@ -163,7 +163,7 @@ public class LiveChatHandler extends SimpleChannelInboundHandler<TextWebSocketFr
                 sendMsgVo.setCmd("out");
                 sendMsgVo.setMsg("用户离开");
                 sendMsgVo.setData(JSONObject.toJSONString(close));
-                sendMsgVo.setNickName(fsUser.getNickname());
+                sendMsgVo.setNickName(fsUser.getNickName());
                 sendMsgVo.setAvatar(fsUser.getAvatar());
                 broadcastMessage(liveId, JSONObject.toJSONString(R.ok().put("data", sendMsgVo)));
             } else {

fs-live-app/src/main/java/com/fs/live/websocket/service/WebSocketServer.java

@@ -203,7 +203,7 @@ public class WebSocketServer {
                 sendMsgVo.setCmd("entry");
                 sendMsgVo.setMsg("用户进入");
                 sendMsgVo.setData(JSONObject.toJSONString(liveWatchUserVO));
-                sendMsgVo.setNickName(fsUser.getNickname());
+                sendMsgVo.setNickName(fsUser.getNickName());
                 sendMsgVo.setAvatar(fsUser.getAvatar());
                 // 广播连接消息
                 broadcastWebMessage(liveId, JSONObject.toJSONString(R.ok().put("data", sendMsgVo)));
@@ -361,7 +361,7 @@ public class WebSocketServer {
                 sendMsgVo.setCmd("out");
                 sendMsgVo.setMsg("用户离开");
                 sendMsgVo.setData(JSONObject.toJSONString(liveWatchUserVO));
-                sendMsgVo.setNickName(fsUser.getNickname());
+                sendMsgVo.setNickName(fsUser.getNickName());
                 sendMsgVo.setAvatar(fsUser.getAvatar());
                 broadcastWebMessage(liveId, JSONObject.toJSONString(R.ok().put("data", sendMsgVo)));
             }

fs-service/src/main/java/com/fs/hisStore/domain/FsUserScrm.java

@@ -41,10 +41,7 @@ public class FsUserScrm extends BaseEntity
     @Excel(name = "会员头像",sort = 2)
     private String avatar;
 
-    /** 用户昵称 */
-    @TableField(exist = false)
-    @Excel(name = "会员昵称", sort = 1)
-    private String nickname;
+
     private String nickName;
 
     /** 用户备注 */
@@ -196,26 +193,6 @@ public class FsUserScrm extends BaseEntity
         this.appId = appId;
     }
 
-    public void setNickName(String nickname)
-    {
-        if(StringUtils.isNotEmpty(nickname)){
-            this.nickName= EmojiParser.parseToHtmlDecimal(nickname);
-        }
-        else{
-            this.nickName= nickname;
-        }
-        this.nickname = this.nickName;
-    }
-
-    public String getNickName()
-    {
-        if(StringUtils.isNotEmpty(nickName)){
-            return EmojiParser.parseToUnicode(nickName);
-        }
-        else{
-            return nickName;
-        }
-    }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
@@ -802,14 +779,6 @@ public class FsUserScrm extends BaseEntity
     }
 
 
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
     public Integer getLevel() {
         return level;
     }
@@ -853,4 +822,33 @@ public class FsUserScrm extends BaseEntity
     public void setHistoryApp(String historyApp) {
         this.historyApp = historyApp;
     }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCompanyUserNickName() {
+        return companyUserNickName;
+    }
+
+    public void setCompanyUserNickName(String companyUserNickName) {
+        this.companyUserNickName = companyUserNickName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreAfterSalesScrmServiceImpl.java

@@ -416,7 +416,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         storeAfterSalesStatus.setChangeMessage(AfterSalesStatusEnum.STATUS_0.getDesc());
         storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
         FsUserScrm user=userService.selectFsUserById(userId);
-        storeAfterSalesStatus.setOperator(user.getNickname());
+        storeAfterSalesStatus.setOperator(user.getNickName());
         afterSalesStatusService.insertFsStoreAfterSalesStatus(storeAfterSalesStatus);
 
 //        //更新OMS
@@ -507,7 +507,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         storeAfterSalesStatus.setChangeMessage(AfterSalesStatusEnum.STATUS_5.getDesc());
         storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
         FsUserScrm user=userService.selectFsUserById(userId);
-        storeAfterSalesStatus.setOperator(user.getNickname());
+        storeAfterSalesStatus.setOperator(user.getNickName());
         afterSalesStatusService.insertFsStoreAfterSalesStatus(storeAfterSalesStatus);
         if (storeAfterSales.getOrderStatus().equals(OrderInfoEnum.STATUS_1.getValue()) ) {
             if(StringUtils.isNotEmpty(order.getExtendOrderId())){
@@ -581,7 +581,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         storeAfterSalesStatus.setChangeMessage(AfterSalesStatusEnum.STATUS_2.getDesc());
         storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
         FsUserScrm user=userService.selectFsUserById(param.getUserId());
-        storeAfterSalesStatus.setOperator(user.getNickname());
+        storeAfterSalesStatus.setOperator(user.getNickName());
         afterSalesStatusService.insertFsStoreAfterSalesStatus(storeAfterSalesStatus);
         fsStoreAfterSalesMapper.updateFsStoreAfterSales(storeAfterSales);
         return R.ok();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -4579,7 +4579,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 //创建
                 user=new FsUserScrm();
                 user.setUsername("");
-                user.setNickname("微信用户");
+                user.setNickName("微信用户");
                 user.setStatus(1);
                 user.setMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());
@@ -4718,7 +4718,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 //创建
                 user=new FsUserScrm();
                 user.setUsername("");
-                user.setNickname("微信用户");
+                user.setNickName("微信用户");
                 user.setStatus(1);
                 user.setMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserScrmServiceImpl.java

@@ -200,7 +200,7 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
     @Override
     public int updateFsUser(FsUserScrm fsUser)
     {
-        String nickname = fsUser.getNickname();
+        String nickname = fsUser.getNickName();
         if (StringUtils.isNotBlank(nickname)){
             if (nickname.length()>100){
                 return 0;

fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -557,7 +557,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
             storeAfterSalesStatus.setChangeMessage(AfterSalesStatusEnum.STATUS_0.getDesc());
             storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
             FsUserScrm user=userService.selectFsUserById(Long.valueOf(userId));
-            storeAfterSalesStatus.setOperator(user.getNickname());
+            storeAfterSalesStatus.setOperator(user.getNickName());
             liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(storeAfterSalesStatus);
 
 //        //更新OMS
@@ -835,7 +835,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
         logs.setChangeTime(new DateTime());
         logs.setChangeType(2);
         FsUserScrm user = userService.selectFsUserByUserId(storeAfterSales.getUserId());
-        logs.setOperator(user.getNickname());
+        logs.setOperator(user.getNickName());
         logs.setStoreAfterSalesId(storeAfterSales.getId());
         logs.setChangeMessage(OrderInfoEnum.STATUS_2.getDesc());
         liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(logs);
@@ -951,7 +951,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
 //        logs.setChangeTime(new DateTime());
 //        logs.setChangeType(0);
 //        FsUser user = userService.selectFsUserByUserId(Long.valueOf(order.getUserId()));
-//        logs.setOperator(user.getNickname());
+//        logs.setOperator(user.getNickName());
 //        logs.setStoreAfterSalesId(storeAfterSales.getId());
 //        logs.setChangeMessage(LiveAfterSalesStatusEnum.STATUS_0.getDesc());
 //        liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(logs);
@@ -1019,7 +1019,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
         logs.setChangeTime(new DateTime());
         logs.setChangeType(5);
         FsUserScrm user = userService.selectFsUserByUserId(Long.valueOf(order.getUserId()));
-        logs.setOperator(user.getNickname());
+        logs.setOperator(user.getNickName());
         logs.setStoreAfterSalesId(storeAfterSales.getId());
         logs.setChangeMessage(OrderInfoEnum.REFUND_STATUS_1.getDesc());
         liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(logs);

fs-service/src/main/java/com/fs/live/service/impl/LiveWatchUserServiceImpl.java

@@ -351,7 +351,7 @@ public class LiveWatchUserServiceImpl implements ILiveWatchUserService {
         }
 
         liveWatchUser.setAvatar(fsUser.getAvatar());
-        liveWatchUser.setNickName(fsUser.getNickname());
+        liveWatchUser.setNickName(fsUser.getNickName());
         String hashKey = String.format(LiveKeysConstant.LIVE_WATCH_USERS, liveId);
         redisCache.hashPut(hashKey, String.valueOf(userId), JSON.toJSONString(liveWatchUser));
         return liveWatchUser;
@@ -397,7 +397,7 @@ public class LiveWatchUserServiceImpl implements ILiveWatchUserService {
         }
 
         liveWatchUser.setAvatar(fsUserVO.getAvatar());
-        liveWatchUser.setNickName(fsUserVO.getNickname());
+        liveWatchUser.setNickName(fsUserVO.getNickName());
         String hashKey = String.format(LiveKeysConstant.LIVE_WATCH_USERS, liveId);
         redisCache.hashPut(hashKey, String.valueOf(userId), JSON.toJSONString(liveWatchUser));
         return liveWatchUser;

fs-user-app/src/main/java/com/fs/app/controller/live/LiveOrderController.java

@@ -668,7 +668,7 @@ public class LiveOrderController extends AppBaseController
                 //创建
                 user=new FsUserScrm();
                 user.setUsername("");
-                user.setNickname("微信用户");
+                user.setNickName("微信用户");
                 user.setStatus(1);
                 user.setMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());
@@ -796,7 +796,7 @@ public class LiveOrderController extends AppBaseController
                 //创建
                 user=new FsUserScrm();
                 user.setUsername("");
-                user.setNickname("微信用户");
+                user.setNickName("微信用户");
                 user.setStatus(1);
                 user.setMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());

fs-user-app/src/main/java/com/fs/app/controller/store/AppLoginScrmController.java

@@ -64,7 +64,7 @@ public class AppLoginScrmController extends AppBaseController {
             return R.ok("注册成功");
         } else{
             user.setPhone(param.getPhone());
-            user.setNickname("app用户"+param.getPhone().substring(param.getPhone().length()-4));
+            user.setNickName("app用户"+param.getPhone().substring(param.getPhone().length()-4));
             user.setStatus(1);
             user.setPassword(Md5Utils.hash(param.getPassword()));
             user.setCreateTime(new Date());
@@ -140,7 +140,7 @@ public class AppLoginScrmController extends AppBaseController {
             Map<String, Object> map = new HashMap<>();
             if (user == null) {
                 user = new FsUserScrm();
-                user.setNickname(nickname);
+                user.setNickName(nickname);
                 user.setAvatar(avatar);
                 if (sex!=0){
                     user.setSex(sex);
@@ -253,7 +253,7 @@ public class AppLoginScrmController extends AppBaseController {
 
     private FsUserScrm createNewUser(FsUserLoginParam param) {
         FsUserScrm newUser = new FsUserScrm();
-        newUser.setNickname("匿名用户**");
+        newUser.setNickName("匿名用户**");
         if (StringUtils.isNotEmpty(param.getOpenId())) {
             newUser.setMaOpenId(param.getOpenId());
         } else if (StringUtils.isNotEmpty(param.getPhone())) {

fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -213,7 +213,7 @@ public class UserScrmController extends AppBaseController {
                 ImgUtil.pressText(//
                         newFile,
                         outputFile,
-                        user.getNickname()+"邀您加入",
+                        user.getNickName()+"邀您加入",
                         Color.BLACK,
                         f, //字体
                         -60, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
@@ -609,7 +609,7 @@ public class UserScrmController extends AppBaseController {
         FsUserScrm user=new FsUserScrm();
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
-        user.setNickname(StringUtils.isNotBlank(param.getNickname())?param.getNickName():param.getNickname());
+        user.setNickName(StringUtils.isNotBlank(param.getNickname())?param.getNickName():param.getNickname());
         if(userService.updateFsUser(user)>0){
             return R.ok("修改成功");
         }

fs-user-app/src/main/java/com/fs/app/controller/store/WxMpScrmController.java

@@ -115,14 +115,14 @@ public class WxMpScrmController {
           userMap.setUserId(user.getUserId());
           userMap.setMpOpenId(wxMpUser.getOpenid());
           userMap.setUpdateTime(new DateTime());
-          userMap.setNickname(wxMpUser.getNickname());
+          userMap.setNickName(wxMpUser.getNickname());
           userService.updateFsUser(userMap);
         }
         else{
           //写入
           user=new FsUserScrm();
   //        user.setPhone(code);
-          user.setNickname(wxMpUser.getNickname());
+          user.setNickName(wxMpUser.getNickname());
           user.setAvatar(wxMpUser.getHeadImgUrl());
           user.setStatus(1);
           user.setMpOpenId(wxMpUser.getOpenid());

fs-user-app/src/main/java/com/fs/app/controller/store/WxUserScrmController.java

@@ -203,7 +203,7 @@ public class WxUserScrmController extends AppBaseController {
         user.setUserCode(OrderUtils.genUserCode());
         user.setPhone(phoneNoInfo.getPhoneNumber());
         user.setUsername(phoneNoInfo.getPhoneNumber());
-        user.setNickname("微信用户");
+        user.setNickName("微信用户");
         user.setStatus(1);
         user.setMaOpenId(session.getOpenid());
         user.setLastIp(ip);
@@ -254,7 +254,7 @@ public class WxUserScrmController extends AppBaseController {
             // 解密用户信息
             WxMaUserInfo userInfo = wxService.getUserService().getUserInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
             FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
-            user.setNickname(userInfo.getNickName());
+            user.setNickName(userInfo.getNickName());
             user.setAvatar(userInfo.getAvatarUrl());
             user.setIsWeixinAuth(1);
             userService.updateFsUser(user);
@@ -435,7 +435,6 @@ public class WxUserScrmController extends AppBaseController {
                     user.setUsername("");
                     user.setPhone(phoneNoInfo.getPhoneNumber());
 //                    user.setPhone("");
-                    user.setNickname("微信用户");
                     user.setNickName("微信用户");
                     user.setStatus(1);
                     user.setMaOpenId(session.getOpenid());
@@ -497,7 +496,7 @@ public class WxUserScrmController extends AppBaseController {
                 else{
                     user=new FsUserScrm();
                     user.setUsername("");
-                    user.setNickname(wxMpUser.getNickname());
+                    user.setNickName(wxMpUser.getNickname());
                     user.setStatus(1);
                     user.setMpOpenId(wxMpUser.getOpenid());
                     user.setLastIp(ip);

fs-user-app/src/main/java/com/fs/framework/aspectj/UserOperationLogAspect.java

@@ -154,9 +154,6 @@ public class UserOperationLogAspect {
     private StringBuilder getDetail(UserOperationLog annotation, FsUserOperationEnum opType, FsUser fsUser,Object[] args) {
         StringBuilder details = new StringBuilder();
         String nickName = fsUser.getNickName();
-        if (StringUtils.isBlank(nickName)){
-            nickName = fsUser.getNickname();
-        }
         if (annotation.detail() == null || annotation.detail().isEmpty()) {
             switch (opType.getValue()) {
                 case 1: // 小程序登录
@@ -244,9 +241,6 @@ public class UserOperationLogAspect {
                 operationLog.setParam(JSON.toJSONString(vo));
                 StringBuilder details = new StringBuilder();
                 String nickName = fsUser.getNickName();
-                if (StringUtils.isBlank(nickName)){
-                    nickName = fsUser.getNickname();
-                }
                 details.append(nickName)
                         .append("在")
                         .append(DateUtils.getTime())