好办小程序群发

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java

@@ -23,7 +23,16 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private Date endDate;
     private String clerkId ;
     private String storeId ;
+    private Long ownLogId ;
     
+    public Long getOwnLogId() {
+        return ownLogId;
+    }
+
+    public void setOwnLogId(Long ownLogId) {
+        this.ownLogId = ownLogId;
+    }
+
     public String getStoreId() {
         return storeId;
     }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml

@@ -79,6 +79,9 @@
 		  LEFT JOIN tab_haoban_group_chat_plan_owner_log b ON a.`own_log_id` = b.`owner_log_id` 
           LEFT JOIN tab_haoban_staff c      ON   a.`staff_id` = c.`staff_id` 
           LEFT JOIN tab_haoban_group_chat d ON   a.group_chat_id = d.group_chat_id
-  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}
+  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId} 
+  	  <if test="null != ownLogId">
+  	  	and a.own_log_id = #{ownLogId}
+  	  </if>
   </select>
 </mapper> 
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -10,6 +10,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
@@ -33,13 +34,12 @@ public class GroupChatPlanController {
     private GroupChatPlanApiService groupChatPlanApiService;
 
     @RequestMapping("total-list")
-    public RestResponse<Object> totalList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,
+    public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
             BasePageInfo basePageInfo) {
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
-        qdto.setPlanId(planId);
         ServiceResponse<Page<ChatOwnerTotalDTO>> page = this.groupChatPlanApiService.listOwnerLogPageForWxaTotal(qdto,
                 basePageInfo);
         return RestResponse.successResult(page.getResult());
@@ -58,20 +58,31 @@ public class GroupChatPlanController {
         return RestResponse.successResult(page.getResult());
     }
 
-    @RequestMapping("reflush-qw-msg")
-    public RestResponse<Object> reflush(String wxEnterpriseId, String enterpriseId, Long ownerLogId) {
-        this.groupChatPlanApiService.reflushSendInfo(ownerLogId);
+    @RequestMapping("reflush-send-msg")
+    public RestResponse<Object> reflush(String wxEnterpriseId, String enterpriseId, Long ownLogId) {
+        this.groupChatPlanApiService.reflushSendInfo(ownLogId);
         return RestResponse.successResult();
     }
+    
+    @RequestMapping("detail")
+    public RestResponse<Object> detail(Long planId) {
+        ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
+        if (!linkResp.isSuccess()) {
+            return RestResponse.failure("1", "计划不存在");
+        }
+        GroupChatPlanDTO hm = linkResp.getResult();
+        return RestResponse.successResult(hm);
+    }
 
     @RequestMapping("owner-do-list")
-    public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,
+    public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,Long ownLogId ,
             BasePageInfo basePageInfo) {
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
         qdto.setPlanId(planId);
+        qdto.setOwnLogId(ownLogId);
         ServiceResponse<Page<GroupChatPlanLogDTO>> page = this.groupChatPlanApiService.listLogPage(planId, qdto,
                 basePageInfo);
         return RestResponse.successResult(page.getResult());