Merge remote-tracking branch 'origin/master'

src/main/java/com/pipihelper/project/feishu/controller/FeiShuEventController.java

@@ -27,7 +27,6 @@ import com.pipihelper.project.feishu.service.PainService;
 import com.pipihelper.project.feishu.service.massage.MassageMsgCardSerivce;
 import com.pipihelper.project.feishu.service.massage.MassageMsgCardSerivce;
 import com.pipihelper.project.feishu.service.massage.MassageService;
 import com.pipihelper.project.feishu.service.massage.MassageService;
 import com.pipihelper.project.feishu.utils.FeiShuEventDataDecrypter;
 import com.pipihelper.project.feishu.utils.FeiShuEventDataDecrypter;
-import com.pipihelper.project.utils.CacheUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -194,17 +193,17 @@ public class FeiShuEventController {
         Integer givUpPainId = Integer.parseInt(feiShuMsgCardEventDTO.getAction().getValue().getKey().split("\\.")[3]);
         Integer givUpPainId = Integer.parseInt(feiShuMsgCardEventDTO.getAction().getValue().getKey().split("\\.")[3]);
         String robOpenId = feiShuMsgCardEventDTO.getOpen_id();
         String robOpenId = feiShuMsgCardEventDTO.getOpen_id();
         Employee robEmployee = employeeService.findByOpenId(robOpenId);
         Employee robEmployee = employeeService.findByOpenId(robOpenId);
+        Pain oldPain = painService.findByOpenId(oldOpenId);
 
 
         //oldOpenId 放弃人的openId, robOpenId 抢到人 openId
         //oldOpenId 放弃人的openId, robOpenId 抢到人 openId
         int update = painService.updateByOpenId(robOpenId, robEmployee.getName(), oldOpenId);
         int update = painService.updateByOpenId(robOpenId, robEmployee.getName(), oldOpenId);
         if (update >= 1) {
         if (update >= 1) {
             massageService.robSingle(robOpenId, robEmployee.getDepartmentId(), givUpPainId);
             massageService.robSingle(robOpenId, robEmployee.getDepartmentId(), givUpPainId);
         }
         }
-
         Pain pain = painService.findById(givUpPainId);
         Pain pain = painService.findById(givUpPainId);
 
 
         String fileName1 = String.format("/templates/massage-msg-card-rob-end.json");
         String fileName1 = String.format("/templates/massage-msg-card-rob-end.json");
-        return getInteractiveCardStr(fileName1, "已经被" + pain.getName() + "抢啦,啦啦~");
+        return getInteractiveCardStr(fileName1, "【" + oldPain.getName() + "】放弃的资格" + "已经被【" + pain.getName() + "】抢啦,啦啦~");
     }
     }
 
 
 
 
@@ -407,7 +406,7 @@ public class FeiShuEventController {
         feiShuMsgDTO.setMsgType("text");
         feiShuMsgDTO.setMsgType("text");
         feiShuMsgDTO.setContent(content.toString());
         feiShuMsgDTO.setContent(content.toString());
         if (receiveId.equals("-1")) {
         if (receiveId.equals("-1")) {
-            receiveId= feiShuApiService.queryChatId();
+            receiveId = feiShuApiService.queryChatId();
         }
         }
         feiShuMsgDTO.setReceiveId(receiveId);
         feiShuMsgDTO.setReceiveId(receiveId);
         log.info("已机器人身份发送消息：{}", feiShuMsgDTO.toString());
         log.info("已机器人身份发送消息：{}", feiShuMsgDTO.toString());