Переглянути джерело

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

caoliqin 1 день тому
батько
коміт
1fb8f6975d

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

@@ -82,6 +82,13 @@ public class FsUserController extends BaseController
     {
         fsUser.setIsDel(0);
         List<FsUser> list=fsUserService.selectFsUserList(fsUser);
+        if(list.isEmpty()){
+            //如果是加密的电话,需要加密后查询
+            if(StringUtils.isFullNumber(fsUser.getKeywords()) && fsUser.getKeywords().length() == 11){
+                fsUser.setKeywords(encryptPhone(fsUser.getKeywords()));
+            }
+            list = fsUserService.selectFsUserList(fsUser);
+        }
         return R.ok().put("data", list);
     }
 

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

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

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

@@ -92,6 +92,12 @@ 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>-->