朋友圈

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

@@ -20,7 +20,7 @@ public interface QwMomentPlanAttendService {
      * @param enterpriseId
      * @param planId
      */
-    void saveClerk(String enterpriseId, Long planId , List<String> clerkIdList) ;
+    void saveClerk(String wxEnterpriseId , String enterpriseId, Long planId , List<String> clerkIdList) ;
 
     ServiceResponse<TaskDetailDTO> taskDetail(Long planId, String execClerkId);
 

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

@@ -76,7 +76,7 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
     }
 
     @Override
-    public void saveClerk(String enterpriseId, Long planId , List<String> clerkIdList) {
+    public void saveClerk(String wxEnterpriseId , String enterpriseId, Long planId , List<String> clerkIdList) {
         List<String> existClerkIdList = this.qwMomentPlanAttendMapper.listExistClerkIds(planId,clerkIdList) ;
         if(CollectionUtils.isNotEmpty(existClerkIdList)) {
             clerkIdList = clerkIdList.stream().filter(o->!existClerkIdList.contains(o)).collect(Collectors.toList());
@@ -92,11 +92,14 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
                 TabQwMomentPlanAttend attend = new TabQwMomentPlanAttend() ;
                 attend.setAttendId(UniqueIdUtils.uniqueLong());
                 attend.setPlanId(planId);
+                attend.setWxEnterpriseId(wxEnterpriseId);
                 attend.setEnterpriseId(enterpriseId);
                 attend.setClerkId(clerkId);
                 attend.setClerkCode(clerkDTO.getClerkCode());
                 attend.setClerkName(clerkDTO.getClerkName());
                 attend.setStoreId(clerkDTO.getStoreId());
+                attend.setTaskStatus(1);
+                attend.setStatusFlag(0);
                 list.add(attend) ;
             }
         }

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

@@ -121,6 +121,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
     public ServiceResponse<QwMomentPlanDTO> save(QwMomentPlanDTO dto) {
         logger.info("保存朋友圈活动={}", JSONObject.toJSONString(dto));
         String enterpriseId = dto.getEnterpriseId() ;
+        String wxEnterpriseId = dto.getWxEnterpriseId() ;
         Long planId = dto.getPlanId() ;
         boolean publishNow = dto.getPublishType()==1 ;
         TabQwMomentPlan plan = EntityUtil.changeEntity(TabQwMomentPlan.class,dto) ;
@@ -154,13 +155,13 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         // 参与导购
         if(dto.getPlanClerkType()==1) {
             if (createFlag) {
-                this.qwMomentPlanAttendService.saveClerk(enterpriseId, planId,dto.getSelectClerkIdList());
+                this.qwMomentPlanAttendService.saveClerk(wxEnterpriseId,enterpriseId, planId,dto.getSelectClerkIdList());
             } else {
                 List<String> oldList = this.qwMomentPlanAttendMapper.listClerk(planId).stream().map(o -> o.getClerkId()).collect(Collectors.toList());
                 List<String> newList = dto.getSelectClerkIdList();
                 List<String> addList = newList.stream().filter(o -> !oldList.contains(o)).distinct().collect(Collectors.toList());
                 List<String> delList = oldList.stream().filter(o -> !newList.contains(o)).distinct().collect(Collectors.toList());
-                this.qwMomentPlanAttendService.saveClerk(enterpriseId, planId , addList);
+                this.qwMomentPlanAttendService.saveClerk(wxEnterpriseId,enterpriseId, planId , addList);
                 if (CollectionUtils.isNotEmpty(delList)) {
                     this.qwMomentPlanAttendMapper.delClerks(planId, delList);
                 }
@@ -176,7 +177,8 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
                 try {
                     // initTaskClerk
                     logger.info("立即开始执行");
-                    clientInstance.sendMessage("qwMomentInitClerkMQ", jsonObject.toJSONString(),10);
+                    this.initTaskClerk(jsonObject.toJSONString());
+                   // clientInstance.sendMessage("qwMomentInitClerkMQ", jsonObject.toJSONString(),10);
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -187,7 +189,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
 
     private void sendTaskToClerk(String enterpriseId,String clerkId ,  Long planId) {
         logger.info("发送任务通知,clerkId={}",clerkId);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         int messageType =  NoticeMessageTypeEnum.hbapp_canvas_friend_circle_task.getType();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("planId",planId) ;
@@ -277,7 +279,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         logger.info("管理员列表={}",userIdList);
         clerkIdList.stream().filter(o->!userIdList.contains(o)).collect(Collectors.toList()) ;
         logger.info("导购数量={}",clerkIdList.size());
-        this.qwMomentPlanAttendService.saveClerk(plan.getEnterpriseId(),planId, clerkIdList);
+        this.qwMomentPlanAttendService.saveClerk(plan.getWxEnterpriseId(),plan.getEnterpriseId(),planId, clerkIdList);
         this.qwMomentPlanMapper.updateClerkNum(planId,clerkIdList.size(),-1,-1);
     }
 

haoban-manage3-service/src/test/java/MomentTest.java

@@ -38,7 +38,7 @@ public class MomentTest {
             dto.setCreatorId("fefd1c81641711e69d0818c58a146fd2");
             dto.setCreatorName("达摩管理");
             dto.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
-            dto.setExecType(0);
+            dto.setExecType(1);
             dto.setExpireDays(10);
             dto.setPlanClerkType(1);
             // ,"b2ef17cce11f476b996d0b27ebadf7fb"

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/moment/PlanClerkListQO.java

@@ -35,6 +35,19 @@ public class PlanClerkListQO extends BasePageInfo {
      */
     private String sortType ;
 
+    /**
+     * 0待下发 1已下发 2下发失败
+     */
+    private String statusFlag ;
+
+    public String getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(String statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
     public Long getPlanId() {
         return planId;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/moment/QwMomentPlanAttendVO.java

@@ -50,6 +50,19 @@ public class QwMomentPlanAttendVO implements Serializable{
 	 */
 	private String storeCode ;
 
+	/**
+	 * 下发失败原因
+	 */
+	private String reason ;
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
 	public String getStaffId() {
 		return staffId;
 	}