Merge remote-tracking branch 'origin/feature-yc-201813' into feature-yc-201813

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

@@ -1,9 +1,6 @@
 package com.uas.platform.b2c.common.account.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.entity.UserView;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
@@ -24,6 +21,7 @@ import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserView;
 import com.uas.sso.util.AccountUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -66,6 +64,8 @@ public class SecurityController {
 	@Autowired
 	private EnterpriseService enterpriseService;
 
+	@Autowired
+	private com.uas.platform.b2c.common.account.v2.service.UserService userAccountService;
 
 
 	@Autowired
@@ -351,9 +351,10 @@ public class SecurityController {
 	 */
 	@RequestMapping(value = "/newLogin/other", produces = {"application/javascript"})
 	@ResponseBody
-	public String afterCrossLogin(HttpServletRequest request, HttpServletResponse response, UserAccount userAccount, Integer maxage) {
+	public String afterCrossLogin(HttpServletRequest request, HttpServletResponse response, UserAccount userAccount, Integer maxage) throws Exception {
 		if (userAccount != null && userAccount.getMobile() != null) {
 			SSOToken tk = new SSOToken();
+			// 设置cookie
 			tk.setUid(userAccount.getMobile());
 			tk.setTime(System.currentTimeMillis());
 			tk.setData(JSON.toJSONString(userAccount));
@@ -362,75 +363,56 @@ public class SecurityController {
 			}
 			SSOHelper.setSSOCookie(request, response, tk, true);
 			response.setHeader("P3P","CP='IDCDSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT'");
-
 			response.setHeader("P3P","CP=\"CURaADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSPCOR\"");
-			User user = getUserByToken(tk);
-			User currentUser = null;
+
+//			User user = getUserByToken(tk);
+			User mallUser = new User();
 			if (userAccount.getMobile() != null) {
 				// UID表示所有系统公认的唯一标识，这里统一使用手机号
-				currentUser = userService.findUserByUserTel(userAccount.getMobile());
+				mallUser = userService.findUserByUserTelNoException(userAccount.getMobile());
 			} else if (userAccount.getUserUU() != null) {
 				// dialectUID表示client系统自己的唯一标识，比如user_uu，手机号没设置的情况下使用
-				currentUser = userService.findUserByUserUU(userAccount.getUserUU());
+				mallUser = userService.findUserByUserUUNoException(userAccount.getUserUU());
 			} else {
 				logger.error(String.format("invalid user %s, please set uid or dialectUID", userAccount.getVipName()));
 			}
-			if (userAccount.getLastLoginTime() != null) {
-				currentUser.setLastLoginTime(userAccount.getLastLoginTime().getTime());
+
+			// 企业判断
+			Enterprise enterprise = new Enterprise();
+			if (userAccount.getSpaceUU() != null) {
+				enterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
+				// 判断商城是否存在当前企业，若存在则设置当前企业即可，若不存在则需新建一个企业后进行设置
+				if (enterprise == null) {
+					// 从账户中心获取当前企业信息尽心保存
+					UserSpaceView userSpaceView = AccountUtils.findBySpaceUU(userAccount.getSpaceUU());
+					if (userSpaceView != null) {
+						enterprise = enterpriseService.update(userSpaceView);
+					}
+				}
 			}
-			if (currentUser != null) {
-				userDao.save(currentUser);
+			// 没用用户
+			if (mallUser == null) {
+				UserView userView = AccountUtils.findByUserUU(userAccount.getUserUU());
+				mallUser = userAccountService.save(userView);
 			}
-			if (user != null) {
-				/*if (!user.getUserPwd().equals(FlexJsonUtils.fromJson(tk.getData(), com.uas.account.entity.User.class).getPassword())){
-					return "successCallback({success:'0'})";
-				}*/
-				user.setIp(AgentUtils.getIp(request));
-				request.getSession().setAttribute("user", user);
-                SystemSession.setUser(user);
-				log(request, user);
+			if (enterprise != null && !mallUser.getEnterprises().contains(enterprise)) {
+//				if (!mallUser.getUserUU().equals(enterprise.getEnAdminuu())) {
+					mallUser.getEnterprises().add(enterprise);
+//				}
 			}
-
-			return "successCallback({success:'1'})";
-		}
-		return "successCallback({success:'0'})";
-	}
-
-
-
-	/**
-	 * 其他地点登录后 同步登录状态
-	 * @param request
-	 * @param response
-	 */
-	@RequestMapping(value = "/login/other")
-	@ResponseBody
-	public String afterCrossOldLogin(HttpServletRequest request, HttpServletResponse response, UserView userView, Integer maxage) {
-		String callback =request.getParameter("jsoncallback");
-		response.setContentType("text/html;charset=UTF-8");
-		if (userView != null && userView.getUid() != null) {
-			SSOToken tk = new SSOToken();
-			tk.setUid(userView.getUid());
-			tk.setTime(System.currentTimeMillis());
-			tk.setData(JSON.toJSONString(userView));
-			if (null != maxage) {
-				request.setAttribute("sso_cookie_maxage", maxage);
+			// 最后一次登录时间
+			Date lastLoginTime = userAccount.getLastLoginTime();
+			if (lastLoginTime != null) {
+				mallUser.setLastLoginTime(userAccount.getLastLoginTime().getTime());
 			}
-			SSOHelper.setSSOCookie(request, response, tk, true);
-			response.setHeader("P3P","CP='IDCDSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT'");
-
-			response.setHeader("P3P","CP=\"CURaADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSPCOR\"");
-			User user = getOldUserByToken(tk);
-			if (user != null) {
-				if (!user.getUserPwd().equals(FlexJsonUtils.fromJson(tk.getData(), com.uas.account.entity.User.class).getPassword())){
-					return "successCallback({success:'0'})";
-				}
-				user.setIp(AgentUtils.getIp(request));
-				request.getSession().setAttribute("user", user);
-				SystemSession.setUser(user);
-				log(request, user);
+			mallUser = userDao.save(mallUser);
+			mallUser.setEnterprise(enterprise);
+			if (mallUser != null) {
+				mallUser.setIp(AgentUtils.getIp(request));
+				request.getSession().setAttribute("user", mallUser);
+                SystemSession.setUser(mallUser);
+				log(request, mallUser);
 			}
-
 			return "successCallback({success:'1'})";
 		}
 		return "successCallback({success:'0'})";
@@ -485,7 +467,6 @@ public class SecurityController {
 				logger.error(String.format("invalid user %s, please set uid or dialectUID", tokenUser.getVipName()));
 			}
 			if (authedUser != null && authedUser.getEnterprises() != null) {
-
 				// 企业资料在client系统自己的唯一标识，比如en_uu
 				if (tokenUser.getSpaceUU() != null) {
 					// 如果企业不存在则更新该企业
@@ -544,82 +525,79 @@ public class SecurityController {
 		return authedUser;
 	}
 
-
-
-
-	private User getOldUserByToken(SSOToken token) {
-		User authedUser = null;
-		if (token.getData() != null) {
-			com.uas.account.entity.User tokenUser = FlexJsonUtils.fromJson(token.getData(), com.uas.account.entity.User.class);
-			if (tokenUser.getUid() != null) {
-				// UID表示所有系统公认的唯一标识，这里统一使用手机号
-				authedUser = userService.findUserByUserTel(tokenUser.getUid());
-			} else if (tokenUser.getDialectUID() != null) {
-				// dialectUID表示client系统自己的唯一标识，比如user_uu，手机号没设置的情况下使用
-				authedUser = userService.findUserByUserUU(Long.parseLong(tokenUser.getDialectUID()));
-			} else {
-				logger.error(String.format("invalid user %s, please set uid or dialectUID", tokenUser.getName()));
-			}
-			if (authedUser != null && authedUser.getEnterprises() != null) {
-				// 企业资料在client系统自己的唯一标识，比如en_uu
-				if (tokenUser.getSpaceDialectUID() != null) {
-					// 如果企业不存在则更新该企业
-					for (Enterprise enterprise : authedUser.getEnterprises()) {
-						if (enterprise.getUu().equals(Long.parseLong(tokenUser.getSpaceDialectUID()))){
-							authedUser.setEnterprise(enterprise);
-						}
-					}
-					if (null == authedUser.getEnterprise()) {
-						Enterprise newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
-						if (null == newEnterprise) {
-							UserSpaceDetail userSpaceDetail = null;
-							try {
-								userSpaceDetail = com.uas.account.util.AccountUtils.findByBusinessCode(tokenUser.getSpaceUID());
-							} catch (Exception e) {
-								e.printStackTrace();
-							}
-							UserSpace userSpace = new UserSpace();
-							userSpace.setDialectUID(tokenUser.getSpaceDialectUID());
-							if (null != userSpaceDetail) {
-								enterpriseService.update(userSpace,userSpaceDetail);
-							}
-							newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
-							authedUser.setEnterprise(newEnterprise);
-						} else {
-							authedUser.getEnterprises().add(newEnterprise);
-							userDao.save(authedUser);
-							authedUser.setEnterprise(newEnterprise);
-						}
-					}
-				} else if (tokenUser.getSpaceUID() != null) {
-					for (Enterprise enterprise : authedUser.getEnterprises()) {
-						// 企业资料在所有系统公认的唯一标识，这里使用商业登记证号
-						if (tokenUser.getSpaceUID().equals(enterprise.getEnBussinessCode())) {
-							authedUser.setEnterprise(enterprise);
-							//保存登录时间
-							List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(authedUser.getUserUU(),enterprise.getUu());
-							UserLoginTime userLoginTime;
-							if (!CollectionUtils.isEmpty(userLoginTimeList)){
-								userLoginTime = userLoginTimeList.get(0);
-							}else {
-								userLoginTime = new UserLoginTime();
-								userLoginTime.setUserUU(authedUser.getUserUU());
-								userLoginTime.setEnUU(enterprise.getUu());
-							}
-							userLoginTime.setLoginTime(System.currentTimeMillis());
-							try {
-								userLoginTimeDao.save(userLoginTime);
-							}catch (Exception e){
-								e.printStackTrace();
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-		return authedUser;
-	}
+//	private User getOldUserByToken(SSOToken token) {
+//		User authedUser = null;
+//		if (token.getData() != null) {
+//			com.uas.account.entity.User tokenUser = FlexJsonUtils.fromJson(token.getData(), com.uas.account.entity.User.class);
+//			if (tokenUser.getUid() != null) {
+//				// UID表示所有系统公认的唯一标识，这里统一使用手机号
+//				authedUser = userService.findUserByUserTel(tokenUser.getUid());
+//			} else if (tokenUser.getDialectUID() != null) {
+//				// dialectUID表示client系统自己的唯一标识，比如user_uu，手机号没设置的情况下使用
+//				authedUser = userService.findUserByUserUU(Long.parseLong(tokenUser.getDialectUID()));
+//			} else {
+//				logger.error(String.format("invalid user %s, please set uid or dialectUID", tokenUser.getName()));
+//			}
+//			if (authedUser != null && authedUser.getEnterprises() != null) {
+//				// 企业资料在client系统自己的唯一标识，比如en_uu
+//				if (tokenUser.getSpaceDialectUID() != null) {
+//					// 如果企业不存在则更新该企业
+//					for (Enterprise enterprise : authedUser.getEnterprises()) {
+//						if (enterprise.getUu().equals(Long.parseLong(tokenUser.getSpaceDialectUID()))){
+//							authedUser.setEnterprise(enterprise);
+//						}
+//					}
+//					if (null == authedUser.getEnterprise()) {
+//						Enterprise newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
+//						if (null == newEnterprise) {
+//							UserSpaceDetail userSpaceDetail = null;
+//							try {
+//								userSpaceDetail = com.uas.account.util.AccountUtils.findByBusinessCode(tokenUser.getSpaceUID());
+//							} catch (Exception e) {
+//								e.printStackTrace();
+//							}
+//							UserSpace userSpace = new UserSpace();
+//							userSpace.setDialectUID(tokenUser.getSpaceDialectUID());
+//							if (null != userSpaceDetail) {
+//								enterpriseService.update(userSpace,userSpaceDetail);
+//							}
+//							newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
+//							authedUser.setEnterprise(newEnterprise);
+//						} else {
+//							authedUser.getEnterprises().add(newEnterprise);
+//							userDao.save(authedUser);
+//							authedUser.setEnterprise(newEnterprise);
+//						}
+//					}
+//				} else if (tokenUser.getSpaceUID() != null) {
+//					for (Enterprise enterprise : authedUser.getEnterprises()) {
+//						// 企业资料在所有系统公认的唯一标识，这里使用商业登记证号
+//						if (tokenUser.getSpaceUID().equals(enterprise.getEnBussinessCode())) {
+//							authedUser.setEnterprise(enterprise);
+//							//保存登录时间
+//							List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(authedUser.getUserUU(),enterprise.getUu());
+//							UserLoginTime userLoginTime;
+//							if (!CollectionUtils.isEmpty(userLoginTimeList)){
+//								userLoginTime = userLoginTimeList.get(0);
+//							}else {
+//								userLoginTime = new UserLoginTime();
+//								userLoginTime.setUserUU(authedUser.getUserUU());
+//								userLoginTime.setEnUU(enterprise.getUu());
+//							}
+//							userLoginTime.setLoginTime(System.currentTimeMillis());
+//							try {
+//								userLoginTimeDao.save(userLoginTime);
+//							}catch (Exception e){
+//								e.printStackTrace();
+//							}
+//							break;
+//						}
+//					}
+//				}
+//			}
+//		}
+//		return authedUser;
+//	}
 	/**
 	 * 记录登录日志
 	 * @param request

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -395,6 +395,9 @@ public class User implements Serializable {
 	@JsonIgnore
 	@JSONField(serialize = false)
 	public Set<Enterprise> getEnterprises() {
+		if (enterprises == null) {
+			enterprises = new HashSet<>();
+		}
 		return enterprises;
 	}
 

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

@@ -22,6 +22,14 @@ public interface UserService {
 	 */
 	User findUserByUserUU(Long userUU);
 
+	/**
+	 * 按uu取用户信息, 不抛出没有找到用户异常
+	 *
+	 * @param userUU
+	 * @return
+	 */
+	User findUserByUserUUNoException(Long userUU);
+
 	/**
 	 * 按uu取用户信息(不读取缓存)
 	 *
@@ -78,6 +86,15 @@ public interface UserService {
 	 */
 	User findUserByUserTel(String userTel);
 
+	/**
+	 * 按tel取用户信息, 不抛出没有找到用户异常
+	 *
+	 * @param userTel
+	 * @return
+	 */
+	User findUserByUserTelNoException(String userTel);
+
+
 	/**
 	 * 查找所有用户资料
 	 * 

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

@@ -125,6 +125,15 @@ public class UserServiceImpl implements UserService {
 		return users.get(0);
 	}
 
+	@Override
+	public User findUserByUserUUNoException(Long userUU) {
+		List<User> users = userDao.findUserByUserUU(userUU);
+		if (users.size() == 0) {
+			return null;
+		}
+		return users.get(0);
+	}
+
 	@Override
 	public User findUserPwdByUserUU(Long uu) {
 		List<User> users = userDao.findUserPwdByUserUU(uu);
@@ -148,6 +157,17 @@ public class UserServiceImpl implements UserService {
 			throw new UsernameNotFoundException("没有找到您的账号 " + tel);
 		return users.get(0);
 	}
+
+	@Override
+	public User findUserByUserTelNoException(String userTel) {
+		List<User> users = userDao.findUserByUserTel(userTel);
+		if (users.size() == 0) {
+			return null;
+		}
+		return users.get(0);
+	}
+
+
 	@Override
 	public boolean isTelUseable(String tel) {
 		return userDao.findUserByUserTel(tel).size() == 0;

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.common.account.v2.service;
 import com.uas.account.entity.UserSpace;
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2c.common.account.model.ChangeAdminDetail;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.sso.entity.UserSpaceView;
 
 public interface EnterpriseService {
@@ -12,7 +13,7 @@ public interface EnterpriseService {
      *
      * @param userSpaceView
      */
-    void update(UserSpaceView userSpaceView);
+    Enterprise update(UserSpaceView userSpaceView);
 
 
     /**

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

@@ -11,7 +11,7 @@ public interface UserService {
      *
      * @param user
      */
-    void save(UserView user);
+    User save(UserView user);
 
     /**
      * 删除用户

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -44,7 +44,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
     @Override
-    public void update(UserSpaceView userSpaceView) {
+    public Enterprise update(UserSpaceView userSpaceView) {
       /*  List<User> admins = userDao.findUserByUserUU(userSpaceView.getAdminUU());
         if (admins.size() != 1) {
             logger.log("更新企业信息出错，管理员有且仅有一个", "当前管理员数量:" + admins.size());
@@ -52,7 +52,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         }*/
         if (null == userSpaceView.getSpaceUU() && "".equals(userSpaceView.getSpaceUU())){
             logger.log("更新企业信息出错，uu为空", "值为null", null,0L);
-            return;
+            return null;
         }
         Enterprise enterprise;
         Enterprise oldenterprise;
@@ -65,10 +65,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             enterprise.setAccessSecret(userSpaceView.getAccessSecret());
         }
         enterprise.setEnAddress(userSpaceView.getRegAddress());
-        //enterprise.setEnArea(userSpaceView.get());
         enterprise.setEnCorporation(userSpaceView.getCorporation());
         enterprise.setEnBussinessCode(userSpaceView.getBusinessCode());
-       // enterprise.setEnFax(userSpaceView.);
         String enTel = enterprise.getEnTel();
         if (enTel == null) {
             enterprise.setEnTel(userSpaceView.getTelephone());
@@ -76,12 +74,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 enterprise.setEnTel(userSpaceView.getAdmin().getMobile());
             }
         }
-        //enterprise.setEnEmail(userSpaceView.get());
-        //enterprise.setEnIndustry(userSpaceView.());
         enterprise.setEnName(userSpaceView.getSpaceName());
         enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
         enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
-        //Long userUU = admins.get(0).getUserUU();
         if (userSpaceView.getAdminUU() != null) {
             enterprise.setEnAdminuu(userSpaceView.getAdminUU());
         }
@@ -110,6 +105,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         } else {
             logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getEnAdminuu(), 0L);
         }
+        return newEn;
     }
 
 

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -39,12 +39,12 @@ public class UserServiceImpl implements UserService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
     @Override
-    public void save(UserView user) {
+    public User save(UserView user) {
         User oldUser = userDao.findOne(user.getUserUU());
         if (null == oldUser) {
             oldUser = new User();
         }
-        oneSave(user, oldUser);
+        return oneSave(user, oldUser);
        /* com.uas.platform.b2c.common.account.model.User u = null;
         if (!StringUtils.isEmpty(user.getDialectUID())) {
             u = userDao.findOne(Long.parseLong(user.getDialectUID()));
@@ -65,7 +65,7 @@ public class UserServiceImpl implements UserService {
         oneSave(user,u);*/
     }
 
-    private void oneSave(UserView user, com.uas.platform.b2c.common.account.model.User u) {
+    private User oneSave(UserView user, com.uas.platform.b2c.common.account.model.User u) {
         Long userUU = user.getUserUU();
         if (userUU != null) {
             u.setUserUU(userUU);
@@ -111,7 +111,6 @@ public class UserServiceImpl implements UserService {
         Short emailValidCode = user.getEmailValidCode();
         if (emailValidCode != null) {
             u.setEmailValidCode((int) emailValidCode);
-
         }
         String idCard = user.getIdCard();
         if (!StringUtils.isEmpty(idCard)) {
@@ -134,12 +133,13 @@ public class UserServiceImpl implements UserService {
             u.setEnable((short) 1);
         }
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
-        userDao.save(u);
+        u = userDao.save(u);
         if (oldUsers.size() > 0) {
             logger.log("更新用户信息", user.getMobile());
         } else {
             logger.log("新增用户信息", user.getMobile());
         }
+        return u;
     }
 
 

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -59,7 +59,6 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	 */
 	@Override
 	public Page<VendorIntroduction> getVendorIntroduction(int page, int size, String keyword, String field) {
-		long start = System.currentTimeMillis();
 		String enterpriseCondition = " 1=1 ";
 		String productCondition = "";
 		// 拼接查询条件
@@ -99,7 +98,6 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		} else {
 			vendorIntroductions = getEnterpriseWithoutProductCondition(enUU, enterpriseCondition,  page, size);
 		}
-		System.out.println("查找完企业UU" + (System.currentTimeMillis() - start));
 		return new Page<VendorIntroduction>(page, size, vendorIntroductions, total);
 	}
 
@@ -170,7 +168,6 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		vendorIntroductionUusSql.append(",(select count(1) from ( select pr_enuu from v$product$private where ").append(productCondition)
 				.append(" and ifnull(pr_b2cenabled, 1) = 1 and pr_pbranden is not null and pr_pcmpcode is not null) p1 where pr_enuu = enUU) prodCounts");
 		vendorIntroductionUusSql.append(" from (").append(enterpriseSql).append(rownumSql);
-		System.out.println("ens:" + vendorIntroductionUusSql);
 		return commonDao.query(vendorIntroductionUusSql.toString(), VendorIntroduction.class);
 	}
 
@@ -217,7 +214,6 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 			enCountSql.append("right join ( select pr_enuu from v$product$private where ").append(productCondition).append(") p on pr_enuu = en_uu");
 		}
 		enCountSql.append(" group by en_uu )a");
-        System.out.println("en_count:" + enCountSql.toString());
 		return commonDao.queryForObject(enCountSql.toString(), Integer.class);
 	}
 

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -509,7 +509,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 of.agreed = 1;
               // $scope.seekPurchaseTableParams.reload();
             }).error(function (response) {
-              toaster.pop('error', response);
+              toaster.pop('error', response ? response.message : '该单据可能已被操作，请刷新后重试');
             });
           }
 
@@ -545,7 +545,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                       $scope.currentRefuseOffer.agreed = 0;
                       // $scope.seekPurchaseTableParams.reload();
                   }).error(function (response) {
-                      toaster.pop('error', response);
+                      toaster.pop('error', response ? response.message : '该单据可能已被操作，请刷新后重试');
                   });
               }
 

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

@@ -9,7 +9,6 @@ define(['app/app'], function (app) {
           $scope.seekPurchaseRate = {};
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
-            seekUrl = 'http://218.17.158.219:24000';
           $scope.initInquiryItem = function () {
             $scope.validSayPrice = {
               leadtime: false,
@@ -59,6 +58,7 @@ define(['app/app'], function (app) {
               // }
               param.enuu = $scope.userInfo.enterprise.uu;
               param.useruu = $scope.userInfo.userUU;
+              param.enableOffer = 1;
               var target = isSelf ? '/inquiry/sale/remind' : '/inquiry/sale/enremind';
               $http({
                 method: 'get',