Merge branch 'feature/xgh/2406企微托管' into 'developer'

Feature/xgh/2406企微托管

See merge request !1885

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/OpenStaffApiService.java

@@ -30,6 +30,8 @@ public interface OpenStaffApiService {
 
     public ServiceResponse<OpenStaffDTO> getByStaffId(String staffId) ;
 
+    public ServiceResponse<OpenStaffDTO> getByUUID(String uuid) ;
+
     public ServiceResponse<OpenStaffDTO> getByQwUserId(Long qwUserId) ;
 
 

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/QywxCallbackController.java

@@ -87,6 +87,12 @@ public class QywxCallbackController extends WebBaseController {
 
     private void chat(String uuid, JSONObject json) {
         int msgtype = json.getIntValue("msgtype") ;
+        // 群发任务
+        if(msgtype==573) {
+            json.put("uuid",uuid);
+            this.openQwApiService.saveNotice(json.toJSONString());
+            return ;
+        }
         List<String> msgList = Arrays.asList("0","2","101") ;
         if(!msgList.contains(msgtype+"")) {
             logger.info("不处理的消息");

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

@@ -248,6 +248,16 @@ public class OpenStaffApiServiceImpl implements OpenStaffApiService {
     }
 
     @Override
+    public ServiceResponse<OpenStaffDTO> getByUUID(String uuid) {
+        TabOpenStaff tab = this.openStaffMapper.getByUUID(uuid) ;
+        if(null == tab) {
+            return ServiceResponse.failure("9999","不存在")  ;
+        }
+        OpenStaffDTO dto = EntityUtil.changeEntityByJSON(OpenStaffDTO.class,tab) ;
+        return ServiceResponse.success(dto);
+    }
+
+    @Override
     public List<StaffClerkRelationDTO> listOpenStaffByClerk(String wxEnterpriseId, String enterpriseId, List<String> clerkIdList) {
         return this.openStaffMapper.listOpenStaffByClerk(wxEnterpriseId,enterpriseId,clerkIdList);
     }