Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -96,6 +96,9 @@ public class MemberService {
 	@Value("${adapay.callback}")
 	private String ADAPAY_CALLBACK_URL;
 
+	@Value("${weixin.login.appid}")
+	private String APP_ID;
+
 	/**
 	 * 校验短信验证码
 	 * @param dto
@@ -203,8 +206,10 @@ public class MemberService {
 		} catch (Exception e) {
 			log.error("getOpenIdByCode发生异常", e);
 		}
+		// 根据appid查询merchantId
+		String merchantId = pileMerchantInfoService.getMerchantIdByAppId(APP_ID);
 		// 查询手机号码是否注册过
-		return memberRegisterAndLogin(mobileNumber, null, openId);
+		return memberRegisterAndLogin(mobileNumber, merchantId, openId);
 	}
 
 	/**