新增活码

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatHmService.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.chat;
 
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatHmBO;
@@ -17,7 +18,7 @@ public interface GroupChatHmService {
     * @return
     * @throws
      */
-    public String saveHm(GroupChatHmDTO dto);
+    public ServiceResponse<GroupChatHmDTO> saveHm(GroupChatHmDTO dto);
 
     GroupChatHmBO getById(Long hmId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java

@@ -250,7 +250,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     }
 
     @Override
-    public String saveHm(GroupChatHmDTO dto) {
+    public ServiceResponse<GroupChatHmDTO> saveHm(GroupChatHmDTO dto) {
         return this.saveHm(dto, 1);
     }
 
@@ -264,14 +264,14 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     * @return
     * @throws
      */
-    private String saveHm(GroupChatHmDTO dto, int autoDel) {
+    private ServiceResponse<GroupChatHmDTO> saveHm(GroupChatHmDTO dto, int autoDel) {
         String wxEnterpriseId = dto.getWxEnterpriseId();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId,
                 SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting) {
             logger.info("没有配置代开应用");
-            return "没有配置代开应用";
+            return ServiceResponse.failure("9999","没有配置代开应用");
         }
         boolean updateFlag = false;
         Long hmid = dto.getChatHmId();
@@ -304,7 +304,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             ServiceResponse<Void> updateResp = this.qywxChatApiService.updateJoinWay(qwDTO.getDkCorpid(),
                     secretSetting.getSecretVal(), joinDTO);
             if (!updateResp.isSuccess()) {
-                return updateResp.getMessage();
+                return ServiceResponse.failure("9999",updateResp.getMessage());
             }
             this.groupChatHmMapper.updateById(hm);
             List<TabGroupChatHmRelation> oldList = this.groupChatHmRelationMapper.listByChatHmId(hmid);
@@ -341,14 +341,14 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
                     secretSetting.getSecretVal(), joinDTO);
             logger.info("addResp={}", JSON.toJSONString(addResp));
             if (!addResp.isSuccess()) {
-                return addResp.getMessage();
+                return ServiceResponse.failure("9999",addResp.getMessage());
             }
             String configId = addResp.getResult();
             ServiceResponse<AddJoinWayDTO> getResp = this.qywxChatApiService.getJoinWay(qwDTO.getDkCorpid(),
                     secretSetting.getSecretVal(), configId);
             logger.info("getResp={}", JSON.toJSONString(getResp));
             if (!getResp.isSuccess()) {
-                return getResp.getMessage();
+                return ServiceResponse.failure("9999",getResp.getMessage());
             }
             String qrCode = getResp.getResult().getQr_code();
             hm.setWxConfigId(configId);
@@ -363,7 +363,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             }
             this.groupChatHmRelationMapper.insertBatch(relationList);
         }
-        return null;
+        return ServiceResponse.success(dto);
     }
 
     private void saveChatFullNotice(String wxEnterpriseId, Long groupChatId) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatHmApiServiceImpl.java

@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +34,9 @@ import com.gic.haoban.manage.service.service.hm.HmLinkChatService;
  */
 @Service("groupChatHmApiService")
 public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
-    
+
     private static final Logger logger = LogManager.getLogger(GroupChatHmApiService.class);
-    
+
     @Autowired
     private GroupChatHmService groupChatHmService;
     @Autowired
@@ -46,7 +45,7 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
     @Override
     public ServiceResponse<Page<GroupChatHmDTO>> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
         Page<GroupChatHmBO> page = this.groupChatHmService.listPage(qdto, basePageInfo);
-        logger.info("PAGE={}",JSON.toJSONString(page));
+        logger.info("PAGE={}", JSON.toJSONString(page));
         if (CollectionUtils.isEmpty(page.getResult())) {
             return ServiceResponse.success(new Page<GroupChatHmDTO>());
         }
@@ -63,11 +62,7 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
 
     @Override
     public ServiceResponse<GroupChatHmDTO> save(GroupChatHmDTO dto) {
-        String result = this.groupChatHmService.saveHm(dto);
-        if (StringUtils.isNotBlank(result)) {
-            return ServiceResponse.failure("9999", result);
-        }
-        return ServiceResponse.success(dto);
+        return this.groupChatHmService.saveHm(dto);
     }
 
     @Override