x

src/main/java/com/egolm/shop/controller/UserController.java

@@ -203,7 +203,7 @@ public class UserController {
 		XException.assertNotBlank(openId, "OpenID不能为空");
 		mobile = StringUtil.isBlank(mobile) ? "" : mobile;
 		name = StringUtil.isBlank(name) ? "" : name;
-		Map<String, Object> map = userService.loginByOpenId(orgNo, openId, mobile, name);
+		Map<String, Object> map = userService.loginByOpenId(orgNo, openId, mobile, unionId, name);
 		Rjx rjx = Rjx.jsonOk();
 		rjx.putAll(map);
 		return rjx.toJson();

src/main/java/com/egolm/shop/service/UserService.java

@@ -49,7 +49,7 @@ public interface UserService {
 
 	public List<Map<String, Object>> queryBankList(String sCustNO);
 
-	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String name);
+	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String unionId, String name);
 	
 	public void updateB2BUnionID(String UserNO, String UnionID);
 

src/main/java/com/egolm/shop/service/impl/UserServiceImpl.java

@@ -810,10 +810,10 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String name) {
+	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String unionId, String name) {
 		mobile = StringUtil.isBlank(mobile) ? null : mobile;
-		String sql = "exec up_B2BUserRegisterLogin ?, ?, ?, ?";
-		ResultMutil result = jdbcTemplate.executeMutil(sql, orgNo, openId, mobile, name);
+		String sql = "exec up_B2BUserRegisterLogin ?, ?, ?, ?, ?";
+		ResultMutil result = jdbcTemplate.executeMutil(sql, orgNo, openId, mobile, unionId, name);
 		List<List<Map<String, Object>>> datas = result.getDatas();
 		List<Map<String, Object>> uList = datas.get(0);
 		Map<String, Object> uMap = uList.get(0);