导出移动订单清单3.0

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -80,6 +80,9 @@ public class DankuanController {
     @Autowired
     private IntelligenceSendOrder intelligenceSendOrder;
 
+    @Autowired
+    private RegularMapper regularMapper;
+
     /**
      * 查询单宽办理接口
      *
@@ -129,6 +132,7 @@ public class DankuanController {
         String imgUrl = request.getParameter("imgUrl");
         String sell = request.getParameter("sell");
         String campus = request.getParameter("campus");
+        String regularId = request.getParameter("productIntroductionPic2");
 
 
         if (sell != null && StringUtils.isNumeric(sell)) {
@@ -136,12 +140,16 @@ public class DankuanController {
         } else {
             sell = "";
         }
+
+
         if (StringUtils.isNotBlank(orderCustomerAccount)) {
+            if (StringUtils.isNotBlank(regularId)){
+                Wrapper<Regular> wrapper = new EntityWrapper<>();
+                Regular regular = regularMapper.selectById(regularId);
                 String orderCustomerAccounts = orderCustomerAccount.split("@")[0];
-            if (!orderPhone.equals(orderCustomerAccounts)) {
-                Pattern iphoneVerification = Pattern.compile("^[1][3|4|5|6|7|8|9][0-9]{9}$");
+                Pattern iphoneVerification = Pattern.compile(regular.getRegular().replace("/",""));
                 if (!iphoneVerification.matcher(orderCustomerAccounts).matches()) {
-                    return ResponseData.error("多媒体账号请填写为手机号");
+                    return ResponseData.error(regular.getTips());
                 }
             }
         } else {

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -75,6 +75,9 @@ public class RongHeController {
     @Resource
     private RedisLockUtil redisLockUtil;
 
+    @Autowired
+    private RegularMapper regularMapper;
+
     /**
      * 跟据合伙人id查找融合套餐信息
      *
@@ -165,6 +168,7 @@ public class RongHeController {
         String setMealIndex = request.getParameter("setMealIndex");
         String sell = request.getParameter("sell");
         String campus = request.getParameter("campus");
+        String regularId = request.getParameter("productIntroductionPic2");
 
         if(sell != null && StringUtils.isNumeric(sell)){
 
@@ -173,11 +177,13 @@ public class RongHeController {
         }
 
         if (StringUtils.isNotBlank(orderCustomerAccount)) {
+            if (StringUtils.isNotBlank(regularId)){
+                Wrapper<Regular> wrapper = new EntityWrapper<>();
+                Regular regular = regularMapper.selectById(regularId);
                 String orderCustomerAccounts = orderCustomerAccount.split("@")[0];
-            if (!orderPhone.equals(orderCustomerAccounts)) {
-                Pattern iphoneVerification = Pattern.compile("^[1][3|4|5|6|7|8|9][0-9]{9}$");
+                Pattern iphoneVerification = Pattern.compile(regular.getRegular().replace("/",""));
                 if (!iphoneVerification.matcher(orderCustomerAccounts).matches()) {
-                    return ResponseData.error("多媒体账号请填写为手机号");
+                    return ResponseData.error("账号格式错误");
                 }
             }
         } else {