Merge branch 'master' into dev/feat/partner1.4_20231009

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java

@@ -121,6 +121,7 @@ public class EnterpriseUserDTO implements Serializable {
             enterpriseUserDO.setJobnumber(user.getJobnumber());
             enterpriseUserDO.setUserStatus(UserStatusEnum.NORMAL.getCode());
             enterpriseUserDO.setIsLeader(Boolean.FALSE);
+            enterpriseUserDO.setLeaderDeptIds("[]");
             List<String> departmentLists = user.getDepartmentLists();
             List<String> regionPaths = new ArrayList<>();
             if(CollectionUtils.isNotEmpty(departmentLists)){
@@ -184,6 +185,7 @@ public class EnterpriseUserDTO implements Serializable {
         //创建的时候给个默认值
         if(FSEventTypeEnum.USER_CREATED.equals(eventType)){
             enterpriseUserDO.setIsLeader(Boolean.FALSE);
+            enterpriseUserDO.setLeaderDeptIds("[]");
         }
         Collection<String> deptIds = leaderDeptMap.get(user.getUserId());
         if(CollectionUtils.isNotEmpty(deptIds)){

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.util.Date;
 
@@ -16,6 +17,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class HyPartnerLabelDO {
     @ApiModelProperty("")
     private Long id;

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelGroupDO.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.util.Date;
 
@@ -16,6 +17,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class HyPartnerLabelGroupDO {
 
     @ApiModelProperty("id")

coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerLabelDO.java

@@ -0,0 +1,16 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class SyncEcCustomerLabelDO {
+
+
+    private String mobile;
+
+    private String userPortrait;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/CallRecordBackReq.java

@@ -14,4 +14,16 @@ public class CallRecordBackReq {
     @ApiModelProperty(value = "录音上传地址", required = true)
     private String recordUrl;
 
+    @ApiModelProperty(value = "呼叫状态: 1-呼叫接听, 2-呼叫未接听, 3-呼叫失败", required = true)
+    private Integer callStatus;
+
+    @ApiModelProperty(value = "呼叫失败的情况下必传，说明呼叫失败的原因")
+    private String failReason;
+
+    @ApiModelProperty(value = "呼叫接听情况下必传，通话开始时间，格式：yyyy-MM-dd HH:mm:ss")
+    private String callStartTime;
+
+    @ApiModelProperty(value = "呼叫接听情况下必传，通话结束时间，格式：yyyy-MM-dd HH:mm:ss")
+    private String callEndTime;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/request/GetTagRequest.java

@@ -0,0 +1,27 @@
+package com.cool.store.request;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author hxd
+ */
+@Data
+@Accessors(chain = true)
+public class GetTagRequest {
+    private Long groupId;
+    private String groupName;
+    private Integer sort;
+    private Integer type;
+    private List<GetTagItem> list;
+
+    @Data
+    @Accessors(chain = true)
+    public static  class  GetTagItem{
+        private Long classId;
+        private String className;
+        private int sort;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/BatchTransferVO.java

@@ -0,0 +1,18 @@
+package com.cool.store.vo;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/8/30 15:16
+ * @Version 1.0
+ */
+@Data
+public class BatchTransferVO {
+
+    private String partnerUserName;
+
+    private String partnerMobile;
+
+    private String errorMessage;
+}