朋友圈

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

@@ -123,7 +123,10 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
 
     @Override
     public void updateStatusFlag(TabQwMomentPlan plan) {
-        List<QwMomentPlanAttendDTO> allList = this.qwMomentPlanAttendMapper.listClerk(plan.getPlanId(),null) ;
+        List<QwMomentPlanAttendDTO> allList = this.qwMomentPlanAttendMapper.listClerk(plan.getPlanId(),0) ;
+        if(CollectionUtils.isEmpty(allList)) {
+            return;
+        }
         int totalSize = allList.size() ;
         List<String> clerkIdList = allList.stream().map(o->o.getClerkId()).collect(Collectors.toList());
         List<StaffClerkRelationDTO> list = this.staffClerkRelationApiService.listByClerkIdsWxEnterpriseId(clerkIdList,plan.getWxEnterpriseId()) ;

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

@@ -137,7 +137,6 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
             plan.setPublishTime(now);
         }
         boolean createFlag = false ;
-        boolean publishFlag = false ;
         plan.setBeginDate(plan.getPublishTime());
         Date endTime = DateUtil.getEndTimeOfDay(DateUtil.addDay(plan.getBeginDate(), plan.getExpireDays()));
         plan.setEndDate(endTime);
@@ -151,10 +150,6 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
             this.qwMomentPlanMapper.insert(plan);
         }else {
             TabQwMomentPlan oldPlan = this.qwMomentPlanMapper.getById(planId) ;
-            // 更新为立即发布
-            if(oldPlan.getPublishType()==2 && publishNow) {
-                publishFlag = true ;
-            }
             this.qwMomentPlanMapper.update(plan);
         }
         // 参与导购
@@ -168,7 +163,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
                     return bo ;
                 }).collect(Collectors.toList()) ;
                 int statusFlag = 0 ;
-                if(publishFlag) {
+                if(publishNow) {
                     statusFlag = 1  ;
                 }
                 this.qwMomentPlanAttendService.saveClerk(wxEnterpriseId,enterpriseId, planId, clerkStaffList , statusFlag);
@@ -194,16 +189,14 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
             this.addOrDelTimer(planId, plan.getPublishTime(), 1);
         }else {
             this.addOrDelTimer(planId, new Date(), 0);
-            if(createFlag || publishFlag) {
-               JSONObject jsonObject = new JSONObject() ;
-                jsonObject.put("planId",planId) ;
-                try {
-                    // initTaskClerk
-                    logger.info("立即开始执行");
-                    mqClient.sendMessage("qwMomentInitClerkMQ", jsonObject.toJSONString(),10);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+            JSONObject jsonObject = new JSONObject() ;
+            jsonObject.put("planId",planId) ;
+            try {
+                // initTaskClerk
+                logger.info("立即开始执行={}",planId);
+                mqClient.sendMessage("qwMomentInitClerkMQ", jsonObject.toJSONString(),10);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
         }
         return ServiceResponse.success(dto);