Merge branch 'master' of http://git.zonelife.cn:3000/huangyang/national-motion-backend

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -917,8 +917,9 @@ public class OrderServiceImpl implements IOrderService {
         }
         appOrder.setPrice(totalPrice);
         appOrderMapper.insert(appOrder);
-        saveSignFlowRecord(appOrder);
-
+        if(appOrder.getType()== 5 && appOrder.getOrderOrFree()==0){
+            saveSignFlowRecord(appOrder);
+        }
         if (!insureOrderInfoList.isEmpty()) {
             //保存保险
             for (InsureOrderInfo insureOrderInfo : insureOrderInfoList) {

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/UserServiceImpl.java

@@ -178,7 +178,7 @@ public class UserServiceImpl implements IUserService {
         if (null != nickName && !nickName.isEmpty()) {
             sysUserMapper.update(null, Wrappers.<SysUser>lambdaUpdate()
                     .eq(SysUser::getId, user.getId())
-                    .set(SysUser::getRealname, nickName));
+                    .set(SysUser::getUsername, nickName));
         } else if (null != avatarUrl && !avatarUrl.isEmpty()) {
             sysUserMapper.update(null, Wrappers.<SysUser>lambdaUpdate()
                     .eq(SysUser::getId, user.getId())
@@ -193,7 +193,7 @@ public class UserServiceImpl implements IUserService {
         SysUser sysUser = sysUserMapper.selectById(user.getId());
         return new LoginUserVO()
                 .setId(sysUser.getId())
-                .setUserName(sysUser.getRealname())
+                .setUserName(sysUser.getUsername())
                 .setUserAvatar(sysUser.getAvatar())
                 .setToken(JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword()));
     }