增加从erp删除用户的接口

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10635 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/controller/UserController.java

@@ -0,0 +1,36 @@
+package com.uas.platform.b2b.erp.controller;
+
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+/**
+ * Created by wangmh on 2017/8/9.
+ */
+@Controller("erp.UserController")
+@RequestMapping("erp/account/user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    @RequestMapping(value = "/{uu}", method = RequestMethod.DELETE)
+    public ResponseEntity<String> removeUser(@PathVariable("uu") Long uu)throws UnsupportedEncodingException {
+        if (uu == null) {
+            return new ResponseEntity<String>(HttpStatus.NOT_MODIFIED);
+        }
+        userService.removeUser(uu);
+        logger.log("用户信息", "删除用户，UU：" + uu);
+        return new ResponseEntity<String>(HttpStatus.OK);
+    }
+}

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -357,12 +357,12 @@ public class UserServiceImpl implements UserService {
 				user.setEnable((short) Status.DISABLED.value());
 			userDao.save(user);
 			if (user.getEnterprises().size() == 0) {
-				try {
-					userDao.delete(user);
-					AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
-				} catch (Exception e) {
-					// 尝试删除，存在关联的单据则不删
-				}
+				userDao.delete(user);
+			}
+			try {
+				AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
+			} catch (Exception e) {
+				// 尝试删除，存在关联的单据则不删
 			}
 		} else {
 			throw new IllegalArgumentException();