Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PendingTaskTypeEnum.java

@@ -8,8 +8,9 @@ public enum PendingTaskTypeEnum {
     NORMAL(-1, "全部", "全部"),
     PERFORMANCE(0, "月指标", "请完善{}月份指标"),
     TEL_TASK(1, "话务任务", "您收到了新的话务任务【{}】，赶紧去执行吧~"),
-    GROUP_TASK(3, "群发任务", "您收到了新的企微群发任务【{}】，赶紧到企业微信-消息-群发助手中执行吧~"),
+    GROUP_TASK(3, "客户群发", "您收到了新的企微群发任务【{}】，赶紧到企业微信-消息-群发助手中执行吧~"),
     ACTIVITY(4, "活动", "您报名的{}活动已经开始啦，快去转发赚佣金吧~"),
+    GROUP_CHAT(5, "社群群发", "您收到了新的企微群发任务【{}】，赶紧到企业微信-消息-群发助手中执行吧~"),
     ;
     private int type;
     private String name;

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

@@ -41,6 +41,11 @@ public interface GroupChatPlanApiService {
     public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo);
     
+    
+    public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPageForWxa(Long planId, GroupChatPlanSearchQDTO qdto,
+            BasePageInfo basePageInfo);
+
+
     public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo);
 

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

@@ -87,4 +87,10 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         return ServiceResponse.success();
     }
     
+    @Override
+    public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPageForWxa(Long planId,
+            GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        return null;
+    }
+
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -13,11 +13,13 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.api.base.commons.BasePageInfo;
@@ -176,7 +178,13 @@ public class GroupChatHmController {
     }
 
     @RequestMapping("download")
-    public RestResponse<Object> download(ChatHmSearchQDTO qdto) {
+    public RestResponse<Object> download(ChatHmSearchQDTO qdto, @RequestParam(defaultValue = "0") int allFlag) {
+        if (allFlag == 0 && CollectionUtils.isEmpty(qdto.getChatHmIdList())) {
+            return RestResponse.failure("1", "请选择要下载的群活码");
+        }
+        if (allFlag == 1) {
+            qdto.setChatHmIdList(null);
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String qrCodeName = "群活码";
         final String fileName = qrCodeName + "_" + sdf.format(new Date()) + ".zip";