账户中心企业服务接口修改

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -47,7 +47,8 @@ public class EnterpriseController {
 	 */
 	@RequestMapping(value = "/{enuu}/info", method = RequestMethod.GET)
 	public Enterprise getEnterpriseInfo(@PathVariable Long enuu){
-		return enterpriseService.getEnterpriseInfo(enuu);
+		Enterprise enterpriseInfo = enterpriseService.getEnterpriseInfo(enuu);
+		return enterpriseInfo;
 	}
 
 	/**
@@ -244,11 +245,11 @@ public class EnterpriseController {
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		try {
 			User user = userService.findUserByUserTel(phone);
-			applyUserSpacePage = AccountUtils.findApplyInfo(user.getUserUU(),1,1024*1024*1024);
+			applyUserSpacePage = AccountUtils.findApplyInfo(user.getUserUU(),1,10);
 			if (!CollectionUtils.isEmpty(applyUserSpacePage.getContent())) {
 				List<ApplyUserSpaceView> applyUserSpaceList = applyUserSpacePage.getContent();
 				for (ApplyUserSpaceView applyUserSpace : applyUserSpaceList) {
-					List<Enterprise> e = enterpriseService.findByEnBussinessCode(applyUserSpace.getUserSpaceView().getBusinessCode());
+					List<Enterprise> e = enterpriseService.findByEnBussinessCode(applyUserSpace.getUserspace().getBusinessCode());
 					User admin = null;
 					if (!CollectionUtils.isEmpty(e) && e.get(0).getEnAdminuu() != null) {
 						admin = userService.findUserByUserUU(e.get(0).getEnAdminuu());
@@ -269,8 +270,12 @@ public class EnterpriseController {
 			public int compare(Object o1, Object o2) {
 				Map<String,Object> s1 = (Map<String,Object>) o1;
 				Map<String,Object> s2 = (Map<String,Object>)o2;
-				Long timeA = Long.parseLong(s1.get("date").toString());
-				Long timeB = Long.parseLong(s2.get("date").toString());
+				/*Long timeA = s1.get("date").toString());*/
+				Date dateA = (Date)s1.get("date");
+				Long timeA = dateA.getTime();
+				Date dateB = (Date)s2.get("date");
+				Long timeB = dateB.getTime();
+				/*Long timeB = Long.parseLong(s2.get("date").toString());*/
 				return timeA.compareTo(timeB);
 			}
 		});

src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java

@@ -69,4 +69,6 @@ public interface EnterpriseService {
 	 * @return 企业
 	 */
 	Enterprise openVendor(Long enUU , boolean isRead , boolean isOpen);
+
+
 }

src/main/java/com/uas/platform/b2c/common/account/v2/controller/UserController.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2c.common.account.v2.controller;
-import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
-import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +7,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.SessionAttributes;
 
 @Controller("v2.UserController")
 @RequestMapping(value = "api/public/user")

src/main/resources/dev/account.properties

@@ -2,6 +2,7 @@
 account.us.save.url=http://192.168.253.12:32323/api/userspace
 account.user.save.url=http://192.168.253.12:32323/api/user
 account.user.getPartners.url=http://192.168.253.12:32323/api/partners
+### ÍôÃ÷»ª±¾µØ:
 ### sso config
 sso.app=mall
 # token secretkey

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -19,6 +19,7 @@ define(['app/app', 'calendar'], function(app) {
                 }
                 //urlPrex = 'http://192.168.253.118:3001';
                 var url = urlPrex + '/sso/login/change/userspace?spaceUU='+$scope.userInfo.enterprise.uu;
+                var newTab=window.open('about:blank');
                 $.ajax({
                     url:url,
                     dataType:'jsonp',
@@ -29,7 +30,8 @@ define(['app/app', 'calendar'], function(app) {
                     jsonpCallback:"successCallback",
                     success:function(data){
                         console.log(data);
-                        window.open(urlPrex + '/cloudcenter/enterprise');
+                       // window.open(urlPrex + '/cloudcenter/enterprise');
+                        newTab.location.href = urlPrex + '/cloudcenter/enterprise';
                     },
                     error:function(data) {
                         console.log(data);