Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2332

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

@@ -9,6 +9,8 @@ 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;
 
+import java.util.Date;
+
 /**
  * 
 * @ClassName: GroupChatPlanApiService
@@ -74,4 +76,6 @@ public interface GroupChatPlanApiService {
      * @return
      */
     public ServiceResponse<Integer> getTotalCount(String enterpriseId,String clerkId,String storeId);
+
+    void staffSendResult(String wxEnterpriseId, String staffId, Long planId, String failRemark, Date sendTime);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanOwnerLogMapper.java

@@ -67,4 +67,6 @@ public interface GroupChatPlanOwnerLogMapper {
     List<GroupChatPlanOwnerLogDTO> listForCancelSend() ;
 
     void updateMsgid(@Param("planId")Long id , @Param("msgid")String msgid) ;
+
+    void staffSendResult(@Param("staffId")String staffId, @Param("planId")Long planId, @Param("sendTime")Date sendTime, @Param("failRemark")String failRemark);
 }
\ No newline at end of file

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

@@ -7,6 +7,8 @@ import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
 
+import java.util.Date;
+
 public interface GroupChatPlanService {
 
     public void save(GroupChatPlanDTO dto);
@@ -32,4 +34,6 @@ public interface GroupChatPlanService {
     void groupChatMsgidTimer(String params);
 
     void cancelSendTimer(String params);
+
+    void staffSendResult(String wxEnterpriseId, String staffId, Long planId, String failRemark, Date sendTime);
 }
\ No newline at end of file

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

@@ -657,6 +657,11 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         return retPage;
     }
 
+    @Override
+    public void staffSendResult(String wxEnterpriseId, String staffId, Long planId, String failRemark, Date sendTime) {
+        this.groupChatPlanOwnerLogMapper.staffSendResult(staffId,planId,sendTime,failRemark) ;
+    }
+
     public void addOrDelTimer(Long planId, Date sendTime, int status) {
         logger.info("添加1/删除0定时,{},{}", status, planId);
         QuartzTaskDTO quartzTask = new QuartzTaskDTO();

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

@@ -23,6 +23,8 @@ import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
 import com.gic.haoban.manage.service.service.chat.GroupChatPlanOwnerLogService;
 import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
 
+import java.util.Date;
+
 @Service("groupChatPlanApiService")
 public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
 
@@ -168,4 +170,8 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         return ServiceResponse.success(page);
     }
 
+    @Override
+    public void staffSendResult(String wxEnterpriseId, String staffId, Long planId, String failRemark, Date sendTime) {
+        this.groupChatPlanService.staffSendResult(wxEnterpriseId,staffId,planId,failRemark,sendTime);
+    }
 }

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

@@ -107,6 +107,9 @@
 	<update id="giveUp" parameterType="java.lang.Long">
 		update tab_haoban_group_chat_plan_owner_log set send_status = 3 where owner_log_id = #{id}
 	</update>
+	<update id="staffSendResult">
+		update tab_haoban_group_chat_plan_owner_log set send_status = 2 , send_time = #{sendTime} where plan_id = #{planId} and staff_id = #{staffId}
+	</update>
 
 	<!-- ============ 查询=============-->
   <select id="selectById" parameterType="long" resultMap="result-map-tabHaobanGroupChatPlanOwnerLog">

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

@@ -93,6 +93,20 @@ public class GroupChatPlanController {
         return RestResponse.successResult(page.getResult());
     }
 
+
+    /**
+     * 成员发送结果
+     * @return
+     */
+    @RequestMapping("staff-send-result")
+    public RestResponse<Void> staffSendResult(String wxEnterpriseId  , String staffId , Long  planId , Date sendTime ,String failRemark) {
+        GroupChatSearchQDTO qdto = new GroupChatSearchQDTO() ;
+        qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setStaffId(staffId);
+        this.groupChatPlanApiService.staffSendResult(wxEnterpriseId  , staffId ,  planId , failRemark , sendTime) ;
+        return RestResponse.successResult();
+    }
+
     @RequestMapping("owner-list")
     public RestResponse<Object> ownerList(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
         if (null == qdto.getPlanId()) {

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -14,7 +14,7 @@
     <dubbo:protocol name="dubbo" port="30010"/>
 
     <dubbo:reference interface="com.gic.haoban.manage.api.service.OpenStaffApiService" id="openStaffApiService" />
-
+    <dubbo:reference interface="com.gic.haoban.manage.api.service.chat.GroupChatApiService" id="groupChatApiService" />
     <dubbo:reference interface="com.gic.enterprise.api.service.CustomPageNewService" id="customPageNewService" />
     <dubbo:reference interface="com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService" id="groupChatPlanApiService" />
     <dubbo:reference interface="com.gic.member.api.service.GradeService" id="gradeService" />