feat：需求调整-创建订单-会员信息查询条件调整

fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -84,8 +84,8 @@ public class FsUserController extends BaseController
         List<FsUser> list=fsUserService.selectFsUserList(fsUser);
         if(list.isEmpty()){
             //如果是加密的电话，需要加密后查询
-            if(StringUtils.isFullNumber(fsUser.getKeywords()) && fsUser.getKeywords().length() == 11){
-                fsUser.setKeywords(encryptPhone(fsUser.getKeywords()));
+            if(StringUtils.isFullNumber(fsUser.getPhone()) && fsUser.getPhone().length() == 11){
+                fsUser.setPhone(encryptPhone(fsUser.getPhone()));
             }
             list = fsUserService.selectFsUserList(fsUser);
         }

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -232,11 +232,11 @@ public class FsUser extends BaseEntity
     @TableField(exist = false)
     private String nicknameExact;
 
-    /**
-     * 搜索关键词-电话号码/会员id/会员昵称
-     * **/
-    @TableField(exist = false)
-    private String keywords;
+//    /**
+//     * 搜索关键词-电话号码/会员id/会员昵称
+//     * **/
+//    @TableField(exist = false)
+//    private String keywords;
 
     public String getNickname() {
         return nickname;

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -92,12 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registerCode != null   and registerCode != '' ">and register_code = #{registerCode}</if>
             <if test="source != null  and source != '' ">and source = #{source}</if>
             <if test="isShow != null  ">and is_show = #{isShow}</if>
-            <if test="keywords != null  and keywords != ''">
-                AND (fs_user.nick_name LIKE concat( #{keywords},'%')
-                or  fs_user.phone = #{keywords}
-                or fs_user.user_id = #{keywords}
-                )
-            </if>
             <!--<if test="qwRepeat != null  ">and qw_repeat = #{qwRepeat}</if>
             <if test="userRepeat != null  ">and user_repeat = #{userRepeat}</if>-->
 <!--            <if test="payOrder != null  ">and pay_order = #{payOrder}</if>-->