代采订单ERP对接方法更新

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

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -44,6 +44,7 @@ import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.temporary.model.MasterInfo;
 import com.uas.platform.b2b.temporary.model.UasNodes;
 import com.uas.platform.b2b.temporary.model.UasProcess;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -650,19 +651,20 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/approve/{uu}", method = RequestMethod.GET)
 	public ModelMap getApprove(@PathVariable("uu") Long uu, String code) throws Exception {
-		List<String> websites = masterService.findWebsiteByUU(uu);
+		List<MasterInfo> masterInfos = masterService.findWebsiteAndUserByUU(uu);
 		ModelMap map = new ModelMap();
-		if (CollectionUtils.isEmpty(websites)) {
+		if (CollectionUtils.isEmpty(masterInfos)) {
 			throw new NotFoundException("网址");
 		} else {
 			// 绑定供应商uu号、个人信息，生成token
 			AccessToken token = accessTokenService.createNew(uu);
-			String website = websites.get(0);
-			StringBuffer redirectUrl = new StringBuffer(website);
-			if (!website.endsWith("/"))
+			MasterInfo master = masterInfos.get(0);
+			StringBuffer redirectUrl = new StringBuffer(master.getWebsite());
+			if (!master.getWebsite().endsWith("/"))
 				redirectUrl.append("/");
 			redirectUrl.append("opensys/getCurrentJnodes.action?caller=Sale&condition=sa_code='").append(code)
-					.append("'&client_type=b2b&access_token=").append(token.getId());
+					.append("'&client_type=b2b&access_token=").append(token.getId()).append("&master=")
+					.append(master.getDb_user());
 			ResponseWrap res = com.uas.sso.common.util.HttpUtil.doGet(redirectUrl.toString());
 			if (!res.isSuccess())
 				map.put("error", "暂未获取到相关数据");
@@ -685,7 +687,6 @@ public class DeputyOrderController {
 			} else {
 				map.put("error", "暂未获取到相关数据");
 			}
-
 		}
 		return map;
 	}

src/main/java/com/uas/platform/b2b/manage/service/MasterService.java

@@ -2,6 +2,8 @@ package com.uas.platform.b2b.manage.service;
 
 import java.util.List;
 
+import com.uas.platform.b2b.temporary.model.MasterInfo;
+
 public interface MasterService {
 
 	/**
@@ -12,4 +14,6 @@ public interface MasterService {
 	 */
 	List<String> findWebsiteByUU(long uu);
 
+	List<MasterInfo> findWebsiteAndUserByUU(long uu);
+
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/MasterServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.data.support.SpObserver;
 import com.uas.platform.b2b.manage.service.MasterService;
+import com.uas.platform.b2b.temporary.model.MasterInfo;
 
 @Service("manage.MasterServiceImpl")
 public class MasterServiceImpl implements MasterService {
@@ -31,4 +32,17 @@ public class MasterServiceImpl implements MasterService {
 		}
 	}
 
+	@Override
+	public List<MasterInfo> findWebsiteAndUserByUU(long uu) {
+		String currDs = SpObserver.getSp();
+		try {
+			SpObserver.putSp(manageDataSource);
+			String sql = "select db_user,website from masters where (platform = 'SAAS' or (platform = 'ERP' and install_type = 'uas1.0')) and website is not null and uu= "
+					+ uu;
+			return commonDao.query(sql, MasterInfo.class);
+		} finally {
+			SpObserver.putSp(currDs);
+		}
+	}
+
 }

src/main/java/com/uas/platform/b2b/temporary/model/MasterInfo.java

@@ -0,0 +1,24 @@
+package com.uas.platform.b2b.temporary.model;
+
+public class MasterInfo {
+
+	private String db_user;
+	private String website;
+
+	public String getDb_user() {
+		return db_user;
+	}
+
+	public void setDb_user(String db_user) {
+		this.db_user = db_user;
+	}
+
+	public String getWebsite() {
+		return website;
+	}
+
+	public void setWebsite(String website) {
+		this.website = website;
+	}
+
+}