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

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

@@ -240,6 +240,8 @@ public class BrandController {
 		@ApiImplicitParam(paramType = "query", name = "shopNo", dataType = "String", required = true, value = "店用编号", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "custNo", dataType = "String", required = true, value = "用户编号", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "brandId", dataType = "String", required = true, value = "品牌ID", defaultValue = ""),
+		@ApiImplicitParam(paramType = "query", name = "email", dataType = "String", required = false, value = "email", defaultValue = ""),
+		@ApiImplicitParam(paramType = "query", name = "contact", dataType = "String", required = false, value = "contact", defaultValue = ""),
  	})
 	@RequestMapping(value = "/saveAuthorizationIP",method=RequestMethod.POST)
 	public String authorizationIP(HttpServletRequest request) {
@@ -248,6 +250,8 @@ public class BrandController {
 		String shopNo = request.getParameter("shopNo");
 		String custNo = request.getParameter("custNo");
 		String brandId = request.getParameter("brandId");
+		String email = request.getParameter("email");
+		String contact = request.getParameter("contact");
 		if(!StringUtil.isNotEmpty(orgNO,ipId,shopNo,custNo,brandId)) {
 			return Rjx.json().setCode(-1).setMessage(I18NUtils.getMessage(orgNO,ipId,brandId,shopNo,custNo, "Msg_Parameter_empty")).toJson();
 		}
@@ -257,7 +261,8 @@ public class BrandController {
 		params.put("shopNo", shopNo);
 		params.put("custNo", custNo);
 		params.put("brandId", brandId);
-		
+		params.put("email", email);
+		params.put("contact", contact);
 		return  brandService.saveAuthorizationIP(params); 
 	}
 	

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

@@ -178,7 +178,8 @@ public class BrandServiceImpl implements BrandService {
 		String custNo = params.get("custNo")+"";
 		String shopNo = params.get("shopNo")+"";
 		String brandId = params.get("brandId")+"";
-		
+		String contact = params.get("contact")+"";
+		String email = params.get("email")+"";
 		TCustomer  customer = userService.getCustomer(custNo, shopNo);
 	    if(customer != null) {
 	    	List<TShop>  shops= customer.gettShops();
@@ -191,6 +192,8 @@ public class BrandServiceImpl implements BrandService {
 	    	TIPBrandAuthorize  auth = new TIPBrandAuthorize();
 			auth.setsIPID(ipId);
 			auth.setsOrgNO(orgNO);
+			auth.setsEmail(email);
+			auth.setsContact(contact);
 			auth.setsBrandID(brandId);
 			auth.setsCompanyName(shop.getsShopName());
 			auth.setsAddress(shop.getsProvince()+""+shop.getsCity()+""+shop.getsDistrict()+""+shop.getsAddress());