Skip to content

G
gdtel-gztel-school-center
Commit 317fce09 by 伍思炜
Options

导出移动订单清单3.0

parent 668ceffa
Showing with 22 additions and 8 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -80,6 +80,9 @@ public class DankuanController { ...@@ -80,6 +80,9 @@ public class DankuanController {
@Autowired @Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrder intelligenceSendOrder;
@Autowired
private RegularMapper regularMapper;
/** /**
* 查询单宽办理接口 * 查询单宽办理接口
* *
...@@ -129,6 +132,7 @@ public class DankuanController { ...@@ -129,6 +132,7 @@ public class DankuanController {
String imgUrl = request.getParameter("imgUrl"); String imgUrl = request.getParameter("imgUrl");
String sell = request.getParameter("sell"); String sell = request.getParameter("sell");
String campus = request.getParameter("campus"); String campus = request.getParameter("campus");
String regularId = request.getParameter("productIntroductionPic2");
if (sell != null && StringUtils.isNumeric(sell)) { if (sell != null && StringUtils.isNumeric(sell)) {
...@@ -136,12 +140,16 @@ public class DankuanController { ...@@ -136,12 +140,16 @@ public class DankuanController {
} else { } else {
sell = ""; sell = "";
} }
if (StringUtils.isNotBlank(orderCustomerAccount)) { if (StringUtils.isNotBlank(orderCustomerAccount)) {
String orderCustomerAccounts = orderCustomerAccount.split("@")[0]; if (StringUtils.isNotBlank(regularId)){
if (!orderPhone.equals(orderCustomerAccounts)) { Wrapper<Regular> wrapper = new EntityWrapper<>();
Pattern iphoneVerification = Pattern.compile("^[1][3|4|5|6|7|8|9][0-9]{9}$"); Regular regular = regularMapper.selectById(regularId);
String orderCustomerAccounts = orderCustomerAccount.split("@")[0];
Pattern iphoneVerification = Pattern.compile(regular.getRegular().replace("/",""));
if (!iphoneVerification.matcher(orderCustomerAccounts).matches()) { if (!iphoneVerification.matcher(orderCustomerAccounts).matches()) {
return ResponseData.error("多媒体账号请填写为手机号"); return ResponseData.error(regular.getTips());
} }
} }
} else { } else {
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -75,6 +75,9 @@ public class RongHeController { ...@@ -75,6 +75,9 @@ public class RongHeController {
@Resource @Resource
private RedisLockUtil redisLockUtil; private RedisLockUtil redisLockUtil;
@Autowired
private RegularMapper regularMapper;
/** /**
* 跟据合伙人id查找融合套餐信息 * 跟据合伙人id查找融合套餐信息
* *
...@@ -165,6 +168,7 @@ public class RongHeController { ...@@ -165,6 +168,7 @@ public class RongHeController {
String setMealIndex = request.getParameter("setMealIndex"); String setMealIndex = request.getParameter("setMealIndex");
String sell = request.getParameter("sell"); String sell = request.getParameter("sell");
String campus = request.getParameter("campus"); String campus = request.getParameter("campus");
String regularId = request.getParameter("productIntroductionPic2");
if(sell != null && StringUtils.isNumeric(sell)){ if(sell != null && StringUtils.isNumeric(sell)){
...@@ -173,11 +177,13 @@ public class RongHeController { ...@@ -173,11 +177,13 @@ public class RongHeController {
} }
if (StringUtils.isNotBlank(orderCustomerAccount)) { if (StringUtils.isNotBlank(orderCustomerAccount)) {
String orderCustomerAccounts = orderCustomerAccount.split("@")[0]; if (StringUtils.isNotBlank(regularId)){
if (!orderPhone.equals(orderCustomerAccounts)) { Wrapper<Regular> wrapper = new EntityWrapper<>();
Pattern iphoneVerification = Pattern.compile("^[1][3|4|5|6|7|8|9][0-9]{9}$"); Regular regular = regularMapper.selectById(regularId);
String orderCustomerAccounts = orderCustomerAccount.split("@")[0];
Pattern iphoneVerification = Pattern.compile(regular.getRegular().replace("/",""));
if (!iphoneVerification.matcher(orderCustomerAccounts).matches()) { if (!iphoneVerification.matcher(orderCustomerAccounts).matches()) {
return ResponseData.error("多媒体账号请填写为手机号"); return ResponseData.error("账号格式错误");
} }
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment