Merge branch 'feature-daiban-12-14' into 'developer'

Feature daiban 12 14

See merge request !150

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/dto/PendingTaskDetailDTO.java

@@ -24,6 +24,12 @@ public class PendingTaskDetailDTO implements Serializable {
     private String relationId;
 
     /**
+     * 业务字段
+     */
+    private String businessId;
+
+
+    /**
      * 0-不良评价回访 1-ecm话务任务 ,3群发任务  4活动
      */
     private Integer taskType;
@@ -42,6 +48,10 @@ public class PendingTaskDetailDTO implements Serializable {
      * 逾期时间
      */
     private Date overdueTime;
+    /**
+     * 失效时间
+     */
+    private Date invalidTime;
 
     /**
      * 门店id
@@ -77,6 +87,22 @@ public class PendingTaskDetailDTO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
+    public Date getInvalidTime() {
+        return invalidTime;
+    }
+
+    public void setInvalidTime(Date invalidTime) {
+        this.invalidTime = invalidTime;
+    }
+
+    public String getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(String businessId) {
+        this.businessId = businessId;
+    }
+
     public String getExtendContent() {
         return extendContent;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PendingStatusFlagEnum.java

@@ -5,8 +5,9 @@ package com.gic.haoban.manage.api.enums;
  */
 public enum PendingStatusFlagEnum {
     NORMAL(1, "正常"),
-    OVERDUE(2, "逾期"),
-    INVALID(3, "逾期失效");
+    PRE_OVERDUE(2, "逾期"),
+    OVERDUE(3, "逾期"),
+    PRE_INVALID(4, "即将失效");
     private int type;
     private String name;
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

 package com.gic.haoban.manage.service.service.notify.out;
 
+import cn.hutool.core.date.DateUtil;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
@@ -64,7 +65,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
      * @param list
      */
     private void buildPending(List<PendingTaskDetailDTO> list) {
-
+        Date currentDate = new Date();
         String pattern = ".*([0-9]{6}).*";
         list.forEach(dto -> {
             String title = dto.getTitle();
@@ -73,7 +74,17 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
                 return;
             }
             dto.setDescription(taskTypeEnum.getDescription().replace("{}", title));
-            dto.setStatusFlag(dto.getOverdueFlag() == 1 ? PendingStatusFlagEnum.OVERDUE.getType() : PendingStatusFlagEnum.NORMAL.getType());
+
+            long betweenOverdueDay = dto.getOverdueTime() != null ? DateUtil.betweenDay(currentDate, dto.getOverdueTime(), true) : -1;
+
+            long betweenInvalidDay = dto.getInvalidTime() != null ? DateUtil.betweenDay(currentDate, dto.getInvalidTime(), true) : -1;
+            if (betweenInvalidDay == 1 || betweenInvalidDay == 0) {
+                dto.setStatusFlag(PendingStatusFlagEnum.PRE_INVALID.getType());
+            } else if (betweenOverdueDay == 0 || betweenOverdueDay == 1) {
+                dto.setStatusFlag(dto.getOverdueFlag() == 1 ? PendingStatusFlagEnum.OVERDUE.getType() : PendingStatusFlagEnum.PRE_INVALID.getType());
+            } else {
+                dto.setStatusFlag(PendingStatusFlagEnum.NORMAL.getType());
+            }
             dto.setTitle(taskTypeEnum.getName());
 
             if (dto.getTaskType() == PendingTaskTypeEnum.PERFORMANCE.getType()) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java

@@ -167,7 +167,6 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
     private String dealMerge(ExternalUserDTO externalUserDTO, TabHaobanPreDealLog dataPre) {
         String wxEnterpriseId = dataPre.getWxEnterpriseId();
         String wxUserId = dataPre.getpDataId();
-        String taskId = dataPre.getTaskId();
 
         if (externalUserDTO.getFriendType() == 2) {
             return "不是微信好友，是企业微信好友:" + externalUserDTO.getFriendType();

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

@@ -17,12 +17,14 @@ import org.apache.commons.lang3.time.DateUtils;
 public class test {
 
     public static void main(String[] args) {
-        String content = "测试模板#{test}";
-        String test = "1test";
-        String replace = content.replaceAll("\\#\\{" + test + "\\}", "1111");
-        System.out.println(replace);
+        Date date = new Date();
+        Date tomrrow = DateUtils.addDays(date, 1);
+        Date yestory = DateUtils.addDays(date, -1);
+        long l = DateUtil.betweenDay(tomrrow, date, true);
 
+        long l2 = DateUtil.betweenDay(date, tomrrow, true);
 
+        System.out.println(l + "=" + l2);
 //        String key = "3.2.1";
 //        String[] split = key.split(".");
 //

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

@@ -10,6 +10,7 @@ import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -1257,4 +1258,18 @@ public class ClerkController extends WebBaseController {
 
         return resultResponse(HaoBanErrCode.ERR_1, clerkList.size());
     }
+
+    /**
+     * 根据员工id获取openId
+     *
+     * @return {@link RestResponse }
+     * @author mozhu
+     * @date 2021-12-29 10:42:24
+     */
+    @RequestMapping("getOpenIdByStaffId")
+    public RestResponse<String> getOpenIdByStaffId() {
+        String staffId = this.getLoginUser().getStaffId();
+        String openId = "";
+        return RestResponse.successResult(openId);
+    }
 }

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

 package com.gic.haoban.manage.web.controller;
 
 import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
-import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
-import com.gic.haoban.common.utils.AuthRequestUtil;
+import com.gic.haoban.common.utils.AuthRequestWellDoneUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.WellDoneLoginDTO;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import org.apache.commons.collections.CollectionUtils;
 
@@ -49,8 +49,8 @@ public class WebBaseController {
      *
      * @return
      */
-    protected UserRightDetailDTO getLoginUser() {
-        return (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
+    protected WellDoneLoginDTO getLoginUser() {
+        return (WellDoneLoginDTO) AuthRequestWellDoneUtil.getLoginUser();
     }
 
     public boolean haveRight(List<DisplayRelationShortInfoDTO> list){
@@ -71,9 +71,6 @@ public class WebBaseController {
         		clerkList.add(showDto.getClerkId());
         	}
         }
-        if(CollectionUtils.isEmpty(groupList) && CollectionUtils.isEmpty(storeList) && CollectionUtils.isEmpty(clerkList)){
-        	return false;
-        }
-        return true;
+        return !CollectionUtils.isEmpty(groupList) || !CollectionUtils.isEmpty(storeList) || !CollectionUtils.isEmpty(clerkList);
     }
 }