Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !3073

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanMapper.java

@@ -23,6 +23,8 @@ public interface QwMomentPlanMapper {
 
     TabQwMomentPlan getById(@Param("planId") Long planId) ;
 
+    TabQwMomentPlan getByIdNoStatus(@Param("planId") Long planId) ;
+
     void updateClerkNum(@Param("planId")Long planId, @Param("totalNum")int totalNum , @Param("taskClerkNum")int taskClerkNum , @Param("doneNum")int doneNum);
 
     List<TabQwMomentPlan> list(QwMomentPlanQDTO qdto);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/QwMomentPlanService.java

@@ -18,6 +18,7 @@ public interface QwMomentPlanService {
 
     ServiceResponse<Void> stop(Long planId) ;
 
+    void cancelQw(Long planId) ;
     ServiceResponse<QwMomentPlanDTO> detail(Long planId) ;
 
     ServiceResponse<Page<QwMomentPlanDTO>> planList(QwMomentPlanQDTO qdto) ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -255,17 +255,39 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         this.qwMomentPlanMapper.stop(planId);
         // 删除定时
         this.addOrDelTimer(planId, new Date(), 0);
-        if(plan.getExecType()==0 && StringUtils.isNotBlank(plan.getMomentId())) {
-            String wxEnterpriseId = plan.getWxEnterpriseId() ;
-            WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
-            logger.info("取消发送={},{}",planId,plan.getMomentId());
-            this.qywxExternalUserService.cancelMomentTask(qwDTO.getThirdCorpid(),
-                    qwDTO.getSelf3thSecret(), plan.getMomentId() ,qwDTO.isSelf(),qwDTO.getUrlHost()) ;
+        if(plan.getExecType()==0) {
+            if(StringUtils.isNotBlank(plan.getMomentId())){
+                String wxEnterpriseId = plan.getWxEnterpriseId();
+                WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+                logger.info("取消发送={},{}", planId, plan.getMomentId());
+                this.qywxExternalUserService.cancelMomentTask(qwDTO.getThirdCorpid(),
+                        qwDTO.getSelf3thSecret(), plan.getMomentId(), qwDTO.isSelf(), qwDTO.getUrlHost());
+            }else {
+                CommonMQDTO mq = new CommonMQDTO() ;
+                mq.setType(12) ;
+                Map<String,String> map = new HashMap<>() ;
+                map.put("planId",planId+"") ;
+                mq.setParams(map);
+                this.haobanCommonMQApiService.putCommonDelayMessage(mq, 60*5);
+            }
         }
         return ServiceResponse.success();
     }
 
     @Override
+    public void cancelQw(Long planId) {
+        TabQwMomentPlan plan = this.qwMomentPlanMapper.getByIdNoStatus(planId) ;
+        if(null == plan) {
+            return ;
+        }
+        String wxEnterpriseId = plan.getWxEnterpriseId();
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        logger.info("取消发送={},{}", planId, plan.getMomentId());
+        this.qywxExternalUserService.cancelMomentTask(qwDTO.getThirdCorpid(),
+                qwDTO.getSelf3thSecret(), plan.getMomentId(), qwDTO.isSelf(), qwDTO.getUrlHost());
+    }
+
+    @Override
     public ServiceResponse<QwMomentPlanDTO> detail(Long planId) {
         TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId);
         if(null == plan) {

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

@@ -187,6 +187,10 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             String staffId11 = map.get("staffId") ;
             this.groupChatService.initStaffGroupChat(staffId11);
             break;
+        case 12 :
+            Long momentPlanId12 = Long.valueOf(map.get("planId")) ;
+            this.qwMomentPlanService.cancelQw(momentPlanId12);
+            break;
         default:
             break;
         }

haoban-manage3-service/src/main/resources/mapper/moment/qwMomentPlanMapper.xml

@@ -182,6 +182,10 @@
         select <include refid="Base_Column_List" /> from tab_haoban_qw_moment_plan where plan_id =#{planId} and delete_flag = 0
     </select>
 
+    <select id="getByIdNoStatus" resultMap="result-map-tabHaobanQwMomentPlan">
+        select <include refid="Base_Column_List" /> from tab_haoban_qw_moment_plan where plan_id =#{planId}
+    </select>
+
     <select id="planListWxa" resultType="com.gic.haoban.manage.api.dto.moment.QwMomentPlanWxaDTO"
             parameterType="com.gic.haoban.manage.api.qdto.moment.PlanListWxaQDTO">
         select a.plan_id planId ,

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

@@ -25,6 +25,7 @@ import com.gic.haoban.manage.web.vo.moment.PlanListVO;
 import com.gic.haoban.manage.web.vo.moment.TaskDetailVO;
 import com.gic.haoban.manage.web.vo.moment.TaskMaterialVO;
 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;
@@ -97,6 +98,9 @@ public class QwMomentController {
     @RequestMapping("task-list")
     public RestResponse<Page<PlanClerkListVO>> taskList(@RequestBody PlanClerkListQO qo) {
         logger.info("活动下任务列表={}", JSONObject.toJSONString(qo));
+        if(StringUtils.isEmpty(qo.getClerkId())) {
+            return RestResponse.failure("9999","导购参数为空") ;
+        }
         TaskListWxaQDTO qdto = EntityUtil.changeEntityByJSON(TaskListWxaQDTO.class,qo) ;
         ClerkDTO clerk  = this.clerkService.getclerkById(qo.getClerkId()) ;
         if(0 != clerk.getClerkType()) {