From bf1315dd2050afba2d53d6acc2d45b17ea6f3be0 Mon Sep 17 00:00:00 2001
From: tonglin <97326827@qq.com>
Date: Tue, 10 Jan 2023 11:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/user/UserController.java       |  2 +-
 .../softbot/service/user/IUserService.java    |  2 +-
 .../service/user/impl/UserService.java        | 21 ++++++++++++++++---
 .../softbot/vo/GetInstallBotResponse.java     |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gitlink/softbot/controller/user/UserController.java b/src/main/java/com/gitlink/softbot/controller/user/UserController.java
index f3ed243..08910b0 100644
--- a/src/main/java/com/gitlink/softbot/controller/user/UserController.java
+++ b/src/main/java/com/gitlink/softbot/controller/user/UserController.java
@@ -186,7 +186,7 @@ public class UserController {
      * @return
      */
     @GetMapping("/getInstallBot")
-    public Result<?> getInstallBot(@RequestParam("user_id") Integer userId, @RequestParam("bot_id") Integer botId){
+    public Result<?> getInstallBot(@RequestParam("user_id") Integer userId, @RequestParam("bot_id") Integer botId) throws BotException{
         GetInstallBotRequest getInstallBotRequest = new GetInstallBotRequest(userId, botId);
         Result<?> result = new Result<>();
         GetInstallBotResponse getInstallBotResponse = userService.getInstallBot(getInstallBotRequest);
diff --git a/src/main/java/com/gitlink/softbot/service/user/IUserService.java b/src/main/java/com/gitlink/softbot/service/user/IUserService.java
index 759e7dc..9c91da8 100644
--- a/src/main/java/com/gitlink/softbot/service/user/IUserService.java
+++ b/src/main/java/com/gitlink/softbot/service/user/IUserService.java
@@ -30,7 +30,7 @@ public interface IUserService {
     //下架bot
     void downMarketBot(Integer botId) throws BotException;
     //查看所有安装的Bot
-     GetInstallBotResponse getInstallBot(GetInstallBotRequest getInstallBotRequest);
+     GetInstallBotResponse getInstallBot(GetInstallBotRequest getInstallBotRequest)throws BotException;
     //转让Bot
      void transferBot(TransferBotRequest transferBotRequest);
     //查看bot转让状态
diff --git a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
index 1d96715..e420fdd 100644
--- a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
+++ b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
@@ -633,11 +633,20 @@ public class UserService extends AbstractUserBot implements IUserService {
     }
 
     @Override
-    public GetInstallBotResponse getInstallBot(GetInstallBotRequest getInstallBotRequest) {
+    public GetInstallBotResponse getInstallBot(GetInstallBotRequest getInstallBotRequest) throws BotException{
        GetInstallBotResponse getInstallBotResponse = new GetInstallBotResponse();
         //1.到market_bot表中查看name
-        String marketName = marketBotMapper.selectOne(new QueryWrapper<MarketBot>()
-                .eq("bot_id",getInstallBotRequest.getBotId())).getMarketName();
+        MarketBot marketBot = marketBotMapper.selectOne(new QueryWrapper<MarketBot>()
+                .eq("bot_id",getInstallBotRequest.getBotId()));
+        String marketName = "";
+        String logo = "";
+        if (marketBot!=null){
+             marketName = marketBot.getMarketName();
+             logo = marketBot.getLogo();
+        }else {
+            throw new BotException("不存在该bot");
+        }
+        getInstallBotResponse.setLogo(logo);
         getInstallBotResponse.setMarketName(marketName);
         //2.到install_bot表中查看state
         List<InstallBot> installBots = installMapper.selectList(new QueryWrapper<InstallBot>()
@@ -650,6 +659,12 @@ public class UserService extends AbstractUserBot implements IUserService {
         installBots.forEach(installBot -> storeIdList.add(installBot.getStoreId()));
         getInstallBotResponse.setStoreIdList(storeIdList);
 
+        //获取注册者
+        RegisterBot registerBot = registerMapper.selectOne(Wrappers.<RegisterBot>lambdaQuery()
+                .eq(RegisterBot::getBotId,getInstallBotRequest.getBotId()));
+        if (registerBot!=null){
+            getInstallBotResponse.setRegisterId(registerBot.getDeveloperId());
+        }
         //获取所有权限
         List<BotLimitEvent> botLimitEvents = botLimitMapper.selectList(Wrappers.<BotLimitEvent>
                 lambdaQuery().eq(BotLimitEvent::getBotId,getInstallBotRequest.getBotId()));
diff --git a/src/main/java/com/gitlink/softbot/vo/GetInstallBotResponse.java b/src/main/java/com/gitlink/softbot/vo/GetInstallBotResponse.java
index 585be63..a25c270 100644
--- a/src/main/java/com/gitlink/softbot/vo/GetInstallBotResponse.java
+++ b/src/main/java/com/gitlink/softbot/vo/GetInstallBotResponse.java
@@ -22,6 +22,8 @@ public class GetInstallBotResponse implements Serializable {
     private Integer botId;
     private String marketName;
     private Integer state;
+    private String logo;
+    private Integer registerId;
     private LimitVO limitVO;
     private List<Integer> storeIdList;
     private List<Integer> allStoreIdList;