处理制单提交的手机号逻辑

fs-company/src/main/java/com/fs/company/controller/qw/FsCompanyCustomerController.java

@@ -98,8 +98,6 @@ public class FsCompanyCustomerController extends BaseController {
 
     private static final String DEFAULT_APP_ID = "wx50bcb040b4963a7e";
 
-    private static final String QRC_RED_PACKAGE_CONFIG_KEY = "qrcRedPackage.config";
-
     /**
      * 查询客户列表
      */
@@ -281,7 +279,7 @@ public class FsCompanyCustomerController extends BaseController {
 //            fsCompanyCustomer.setNoEncryptPhone(fsCompanyCustomer.getPhone());
 //            fsCompanyCustomer.setPhone(maskPhoneMiddleFive(fsCompanyCustomer.getPhone()));
 //        }
-        fsCompanyCustomer.setPhone(maskPhoneMiddleFive(fsCompanyCustomer.getPhone()));
+        fsCompanyCustomer.setPhone(maskPhoneFirstSeven(fsCompanyCustomer.getPhone()));
         return AjaxResult.success(fsCompanyCustomer);
     }
 

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1660,8 +1660,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if (param.getPhone() == null) {
                 return R.error("手机号码不能为空");
             }
-            String cleanPhone = param.getPhone().replaceAll("[^0-9]", "");
-
             FsCompanyCustomer fsCompanyCustomer = fsCompanyCustomerMapper.selectFsCompanyCustomerById(param.getCompanyCustomerId());
             if (fsCompanyCustomer == null) {
                 return R.error("客户信息为空，制单失败");
@@ -1669,6 +1667,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if (fsCompanyCustomer.getPrescribeId() == null) {
                 return R.error("处方信息为空，制单失败");
             }
+            //如果手机号包含"*"符号就需要使用客户信息表的手机号
+            if (param.getPhone().contains("*")) {
+                param.setPhone(fsCompanyCustomer.getPhone());
+            }
+            String cleanPhone = param.getPhone().replaceAll("[^0-9]", "");
             prescribeId = fsCompanyCustomer.getPrescribeId();
             FsPrescribeDataScrm prescribeDataScrm = prescribeDataScrmService.selectFsPrescribeDataScrmByPrescribeId(prescribeId);
             if (prescribeDataScrm == null){