fixed 会员检索完善

fuint-application/src/main/java/com/fuint/common/service/MemberService.java

@@ -184,6 +184,15 @@ public interface MemberService extends IService<MtUser> {
      * */
     List<GroupMemberDto> searchMembers(Integer merchantId, String keyword, String groupIds, Integer page, Integer pageSize);
 
+    /**
+     * 查找会员列表
+     *
+     * @param merchantId
+     * @param keyword
+     * @return
+     * */
+    List<MtUser> searchMembers(Integer merchantId, String keyword);
+
     /**
      * 设定安全的密码
      *

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -907,6 +907,18 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         return dataList;
     }
 
+    /**
+     * 查找会员列表
+     *
+     * @param merchantId
+     * @param keyword
+     * @return
+     * */
+    @Override
+    public List<MtUser> searchMembers(Integer merchantId, String keyword) {
+       return mtUserMapper.searchMembers(merchantId, keyword);
+    }
+
     /**
      * 设定安全的密码
      *

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCashierController.java

@@ -295,13 +295,20 @@ public class BackendCashierController extends BaseController {
             return getFailureResult(201);
         }
 
-        MtUser userInfo;
+        MtUser userInfo = null;
+        // 优先通过手机号、会员号、用户名查询，查不到再进行模糊匹配查找
         if (PhoneFormatCheckUtils.isChinaPhoneLegal(keyword)) {
             userInfo = memberService.queryMemberByMobile(accountInfo.getMerchantId(), keyword);
         } else {
-            userInfo = memberService.queryMemberByName(accountInfo.getMerchantId(), keyword);
+            userInfo = memberService.queryMemberByUserNo(accountInfo.getMerchantId(), keyword);
             if (userInfo == null) {
-                userInfo = memberService.queryMemberByUserNo(accountInfo.getMerchantId(), keyword);
+                userInfo = memberService.queryMemberByName(accountInfo.getMerchantId(), keyword);
+            }
+        }
+        if (userInfo == null) {
+            List<MtUser> userList = memberService.searchMembers(accountInfo.getMerchantId(), keyword);
+            if (userList != null && userList.size() > 0) {
+                userInfo = userList.get(0);
             }
         }
 

fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserMapper.java

@@ -43,4 +43,6 @@ public interface MtUserMapper extends BaseMapper<MtUser> {
 
     List<Integer> getUserIdList(@Param("merchantId") Integer merchantId, @Param("storeId") Integer storeId);
 
+    List<MtUser> searchMembers(@Param("merchantId") Integer merchantId, @Param("keyword") String keyword);
+
 }

fuint-repository/src/main/resources/mapper/MtUserMapper.xml

@@ -102,4 +102,12 @@
         limit 50000;
     </select>
 
+    <select id="searchMembers" resultType="com.fuint.repository.model.MtUser">
+        select * from mt_user t where (t.MOBILE like concat('%',#{keyword},'%') or t.NAME like concat('%',#{keyword},'%')) and t.STATUS = 'A'
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
+        limit 10
+    </select>
+
 </mapper>