From 8747967f9ee9988a66f390fd4126da90bf70766d Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 21 Aug 2023 09:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3(=E6=9C=AA=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0);=E5=AE=A2=E6=88=B7=E6=B7=BB=E5=8A=A0=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/controller/WxSvcLoginApi.java    | 44 +++++++++++++++++++
 .../serve/modules/bms/entity/BmsSupplier.java | 11 +++--
 .../impl/HisUserSupplierServiceImpl.java      |  5 +++
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java b/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
index f3ce53f6..0f10c310 100644
--- a/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
+++ b/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
@@ -55,6 +55,50 @@ public class WxSvcLoginApi {
 
     private SysUserService sysUserService;
 
+
+    /**
+     * 小程序登陆(暂测试)
+     * @param wxLoginUser
+     * @param request
+     * @return
+     */
+    @SysLog(title = "小程序登录",biz = BizType.LOGIN,inter = InterType.API)
+    @PostMapping("/ma")
+    public R<?> loginMicroApp(@RequestBody @Valid WxLoginUser wxLoginUser, HttpServletRequest request){
+        Map<String,Object> objectMap = new HashMap<>();
+        WxUser wxUser = null;
+        try {
+            //TODO wxUser = wxUserService.login(wxLoginUser);
+        } catch (Exception e) {
+            log.warn(e.getMessage());
+        }
+        if(wxUser==null){
+            Assert.throwEx(HttpCode.WX_ERR);
+        }
+        String token = IdUtil.fastSimpleUUID();
+        LoginUser loginUser = new LoginUser(wxUser.getId(),wxUser.getEmpName(),"",
+                ServletUtils.getIp(request), LoginUserType.APP_USER,new ArrayList<>(),null,AuthContextUtils.getTenant());
+        objectMap.put("token",token);
+        //微信登录ID
+        String wxUserKey = StringUtils.format(RedisCacheKeys.WX_KEY_USER,token);
+        redisService.set(wxUserKey,wxUser.getId());
+        //后台管理员信息
+        Map<String,Object> tokenMap = new HashMap<>(10);
+        String client = "wx_app";
+        String redisKey = StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client,wxUser.getSysUserId());
+        String pctoken = JwtUtils.generateToken(wxUser.getSysUserId(),loginUser.getTypeFlag(),client);
+        redisService.set(redisKey,pctoken);
+        tokenMap.put("token", pctoken);
+        tokenMap.put("userId", wxUser.getSysUserId());
+        tokenMap.put("IP", loginUser.getLoginIp());
+        tokenMap.put("tenant", sysTenantMapper.selectById(loginUser.getTenant()));
+        tokenMap.put("loginType",client);
+        tokenMap.put("client",client);
+        //关联
+        objectMap.put("adminTokenInfo",tokenMap);
+        return R.ok(objectMap);
+    }
+
     /**
      * 公众号登录
      * @param wxLoginUser
diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
index 2c675fc8..8576c57a 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
@@ -279,7 +279,10 @@ public class BmsSupplier implements Serializable {
     @TableField(exist = false)
     private String isRegionNull;
 
-    /**--------------  ----------------- */
+    /** 关键字 */
+    private String keyword;
+
+    /*--------------  ----------------- */
     @TableField(exist = false)
     private String searchRegionFirstName;
 
@@ -292,7 +295,7 @@ public class BmsSupplier implements Serializable {
     @TableField(exist = false)
     private List<String> searchRegionSecond;
 
-    /**--------------  ----------------- */
+    /*--------------  ----------------- */
     @TableField(exist = false)
     private String searchRegion2FirstName;
 
@@ -310,11 +313,11 @@ public class BmsSupplier implements Serializable {
 
     @TableField(exist = false)
     private List<String> searchRegion2Third;
-    /**--------------  ----------------- */
+    /*--------------  ----------------- */
 
     @TableField(exist = false)
     private List<String> searchInIds;
-    /**--------------  ----------------- */
+    /*--------------  ----------------- */
 
     public List<String> listBizRegionIds(){
         List<String> list = new ArrayList<>();
diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
index 8dfb3454..8a5a6554 100644
--- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
@@ -11,6 +11,7 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
@@ -70,6 +71,10 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
         HisUserSupplier userSupplier = param.toHisUserSupplier(null,null);
         QueryWrapper<HisUserSupplier> lqw = new QueryWrapper<>(userSupplier);
         lqw.select("distinct his_user_supplier.supplier_id");
+        if(StringUtils.hasText(param.getKeyword())){
+            lqw.lambda().like(HisUserSupplier::getSupplierCode,param.getKeyword());
+            lqw.lambda().like(HisUserSupplier::getSupplierName,param.getKeyword());
+        }
         lqw.lambda().in(HisUserSupplier::getUserId,userIds)
                 .ne(HisUserSupplier::getSupplierId,0);
         if(usePage){