Merge branch 'master' of http://key@gitlab.egolm.com/key/shop.git

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

@@ -369,4 +369,21 @@ public class UserController {
 		return Rjx.jsonOk().toJson();
 	}
 	
+	
+	@ApiOperation("修改B2B用户UnionID")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType = "query", name = "UserNO", dataType = "String", required = true),
+		@ApiImplicitParam(paramType = "query", name = "UnionID", dataType = "String", required = true),
+		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
+	    @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),   
+		@ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""),
+		@ApiImplicitParam(paramType = "query", name = "timestamp", dataType = "String", required = true, value = "时间戳", defaultValue = "")
+	}) 
+	@RequestMapping(value = "/updateB2BUnionID",method=RequestMethod.GET)
+	public String updateB2BUnionID(String UserNO, String UnionID) {
+		userService.updateB2BUnionID(UserNO, UnionID);
+		return Rjx.jsonOk().toJson();
+	}
+	
+	
 }

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

@@ -51,4 +51,6 @@ public interface UserService {
 
 	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String name);
 	
+	public void updateB2BUnionID(String UserNO, String UnionID);
+
 }

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

@@ -847,4 +847,10 @@ public class UserServiceImpl implements UserService {
 		}
 		return new XException((String)errorMsg);
 	}
+	
+	
+	@Override
+	public void updateB2BUnionID(String UserNO, String UnionID) {
+		jdbcTemplate.update("update tB2BUser set  sUnionID = ? ,dLastUpdateTime = getdate()  where sUserNO = ?", UnionID, UserNO);
+	}
 }
\ No newline at end of file