|
|
|
@@ -83,7 +83,7 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空"); |
|
|
|
} |
|
|
|
if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber或userPhone为空"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空"); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(userPhone)){ |
|
|
|
if(!userPhone.matches("^1[0-9]{10}$")){ |
|
|
|
@@ -145,7 +145,7 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
userId = Long.parseLong(userNumber); |
|
|
|
} catch (NumberFormatException e) {} |
|
|
|
wxBusinessCircleOrder.setCUserId(userId); |
|
|
|
// wxBusinessCircleOrder.setCUserPhone(userPhone); |
|
|
|
wxBusinessCircleOrder.setCUserPhone(userPhone); |
|
|
|
wxBusinessCircleOrder.setAppid("来自第三方数据"); |
|
|
|
wxBusinessCircleOrder.setOpenid("来自第三方数据"); |
|
|
|
wxBusinessCircleOrder.setTimeEnd(timeEndDate); |
|
|
|
@@ -172,6 +172,7 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
userId = Long.parseLong(userNumber); |
|
|
|
} catch (NumberFormatException e) {} |
|
|
|
aliBusinessCircleOrder.setCUserId(userId); |
|
|
|
aliBusinessCircleOrder.setCUserPhone(userPhone); |
|
|
|
|
|
|
|
aliBusinessCircleOrder.setMallStoreId(shopNumber); |
|
|
|
|
|
|
|
@@ -346,8 +347,8 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
if(StringUtils.isBlank(shopNumber)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空"); |
|
|
|
} |
|
|
|
if(StringUtils.isBlank(userNumber)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空"); |
|
|
|
if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空"); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(userPhone)){ |
|
|
|
if(!userPhone.matches("^1[0-9]{10}$")){ |
|
|
|
@@ -478,8 +479,8 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
if(StringUtils.isBlank(transactionId)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); |
|
|
|
} |
|
|
|
if(StringUtils.isBlank(userNumber)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空"); |
|
|
|
if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空"); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(userPhone)){ |
|
|
|
if(!userPhone.matches("^1[0-9]{10}$")){ |
|
|
|
|