Browse Source

账户中心common jar更新

zhaohongpeng 8 years ago
parent
commit
735f124a88

+ 3 - 0
src/main/java/com/uas/platform/b2c/common/account/v2/service/UserService.java

@@ -19,4 +19,7 @@ public interface UserService {
      * @param uu
      */
     void bindOrUnbind(Long uu, Long enuu, Integer type);
+
+
+
 }

+ 3 - 0
src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -135,4 +135,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             }
         }
     }
+
+
+
 }

+ 10 - 7
src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -9,17 +9,13 @@ import com.uas.platform.b2c.common.account.v2.service.UserService;
 import com.uas.platform.b2c.core.constant.IntegerConstant;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.Status;
 import com.uas.sso.entity.UserView;
-import netscape.security.UserTarget;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.expression.spel.ast.NullLiteral;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.List;
 
 
 @Service("v2.UserService")
@@ -67,7 +63,7 @@ public class UserServiceImpl implements UserService {
         if (userUU != null) {
             u.setUserUU(userUU);
         }
-        String name = user.getName();
+        String name = user.getVipName();
         if (!StringUtils.isEmpty(name)) {
             u.setUserName(name);
         }
@@ -102,7 +98,11 @@ public class UserServiceImpl implements UserService {
         }
         Short lock = user.getLock();
         if (lock != null) {
-            u.setEnable(lock);
+            if (lock == 1) {
+                u.setEnable((short) 0);
+            } else {
+                u.setEnable((short) 1);
+            }
         } else {
             u.setEnable((short)1);
         }
@@ -117,6 +117,9 @@ public class UserServiceImpl implements UserService {
 
 
 
+
+
+
     /*@Override
     public void delete(Long uu, Long enuu) {
         com.uas.platform.b2c.common.account.model.User user = userDao.findOne(uu);