|
|
|
@@ -114,28 +114,11 @@ public class AsyncTask { |
|
|
|
if (value == null) { |
|
|
|
value = ""; |
|
|
|
} |
|
|
|
//管理员手机号校验手机号格式 |
|
|
|
if ("管理员手机号".equals(name)) { |
|
|
|
String _v = (String)value; |
|
|
|
if (StringUtils.isNotBlank(_v) && (!isMobile(_v))) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"管理员手机号必须是移动号码"); |
|
|
|
} |
|
|
|
} |
|
|
|
return super.importHandler(obj, name, value); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
private static boolean isMobile(String str) { |
|
|
|
Pattern p = null; |
|
|
|
Matcher m = null; |
|
|
|
boolean b = false; |
|
|
|
p = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); // 验证手机号 |
|
|
|
m = p.matcher(str); |
|
|
|
b = m.matches(); |
|
|
|
return b; |
|
|
|
} |
|
|
|
|
|
|
|
private class CardPriceExcelHandler extends ExcelDataHandlerDefaultImpl<WxCardPriceTemplate> { |
|
|
|
@Override |
|
|
|
public Object importHandler(WxCardPriceTemplate obj, String name, Object value) { |
|
|
|
@@ -506,6 +489,17 @@ public class AsyncTask { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static boolean isMobile(String str) { |
|
|
|
Pattern p = null; |
|
|
|
Matcher m = null; |
|
|
|
boolean b = false; |
|
|
|
p = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); // 验证手机号 |
|
|
|
m = p.matcher(str); |
|
|
|
b = m.matches(); |
|
|
|
return b; |
|
|
|
} |
|
|
|
|
|
|
|
public void importMerchantInit(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// 需要验证 |
|
|
|
String[] needFields = new String[]{"门店名称", "门店ID", "城市", "详细地址"}; |
|
|
|
@@ -535,6 +529,11 @@ public class AsyncTask { |
|
|
|
for (int i = 0 ; i < successList.size(); i ++) { |
|
|
|
try { |
|
|
|
MerchantPoiTNew poiBase = successList.get(i); |
|
|
|
//管理员手机号校验手机号格式 |
|
|
|
if (StringUtils.isNotBlank(poiBase.getPhone()) && (!isMobile(poiBase.getPhone()))) { |
|
|
|
poiBase.setInitMerchantRemark("初始化商户失败,管理员手机号错误,必须是移动号码"); |
|
|
|
continue; |
|
|
|
} |
|
|
|
WxMerchant createM = createMerchantMap.get(poiBase.getPoiId()); |
|
|
|
boolean create = true; |
|
|
|
if (null != createM ) { |
|
|
|
|