feat: 用户余额

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/PaymentController.java

@@ -54,7 +54,7 @@ public class PaymentController 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/StoreOrderScrmController.java

@@ -1001,7 +1001,7 @@ public class StoreOrderScrmController extends AppBaseController {
                 //创建
                 user=new FsUserScrm();
                 user.setUsername("");
-                user.setNickname("微信用户");
+                user.setNickName("微信用户");
                 user.setStatus(1);
                 user.setMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());
@@ -1119,7 +1119,7 @@ public class StoreOrderScrmController 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/WxMpScrmController.java

@@ -111,14 +111,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

@@ -197,7 +197,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);
@@ -243,7 +243,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);
@@ -389,7 +389,7 @@ public class WxUserScrmController extends AppBaseController {
                     user.setUsername("");
                     user.setPhone(phoneNoInfo.getPhoneNumber());
 //                    user.setPhone("");
-                    user.setNickname("微信用户");
+                    user.setNickName("微信用户");
                     user.setNickName("微信用户");
                     user.setStatus(1);
                     user.setMaOpenId(session.getOpenid());
@@ -450,7 +450,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);