Merge branch 'master' into dev/feat/partner1.5.2_20231121

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

@@ -0,0 +1,21 @@
+package com.cool.store.dto.partner;
+
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author hxd
+ */
+@Data
+@Accessors(chain = true)
+public class MobileCheckDTO {
+
+    private String partnerId;
+    private String mobile;
+    private Integer lineStatus;
+    private String investmentManager;
+
+    private String investmentManagerMobile;
+
+}

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

@@ -0,0 +1,137 @@
+package com.cool.store.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.cool.store.enums.TrajectoryTypeEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * hy_partner_ec_track_log
+ * @author 
+ */
+@Data
+@Accessors(chain = true)
+public class HyPartnerEcTrackLogDO implements Serializable {
+    private Long id;
+
+    /**
+     * 跟进ID
+     */
+    private String trajectoryId;
+
+    /**
+     * 操作人id
+     */
+    private String userId;
+
+    /**
+     * 操作人姓名
+     */
+    private String userName;
+
+    /**
+     * 客户id
+     */
+    private String crmId;
+
+    private String partnerId;
+
+
+    /**
+     * 客户手机号
+     */
+    private String mobile;
+
+    /**
+     * 接收人id
+     */
+    private String receiveUserIds;
+
+    /**
+     * 接收人姓名
+     */
+    private String receiveUser;
+
+    /**
+     * 跟进类型
+     */
+    private Integer trajectoryType;
+
+    /**
+     * 跟进类型名称
+     */
+    private String trajectoryTypeContent;
+
+    /**
+     * 轨迹内容
+     */
+    private String content;
+
+
+
+    /**
+     * 轨迹内容(拼接)
+     */
+    private String detailContent;
+
+
+    /**
+     * 操作时间
+     */
+    @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8")
+    private Date operateTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 获取拼接好的内容
+     * @param ecLogVo
+     * @return
+     */
+    public static String getDetailContentJoint(HyPartnerEcTrackLogDO ecLogVo){
+        if (StringUtils.isNotEmpty(ecLogVo.getContent())) {
+            String str = ecLogVo.getContent();
+            if (str.contains("[mobile]")||str.contains("[/mobile]")) {
+                str = str.replaceAll("\\[mobile]", "").replaceAll("\\[/mobile]", "");
+            }
+            return str;
+        }
+        StringBuilder detailContent = new StringBuilder();
+        Integer trajectoryType = ecLogVo.getTrajectoryType();
+        if (trajectoryType.equals(TrajectoryTypeEnum.TRANSFER_CUSTOMER.getValue())) {
+            detailContent.append(TrajectoryTypeEnum.TRANSFER_CUSTOMER.getJointText()).append(ecLogVo.getReceiveUser());
+        }
+        if (trajectoryType.equals(TrajectoryTypeEnum.ALLOCATION_CUSTOMER.getValue())) {
+            detailContent.append(TrajectoryTypeEnum.ALLOCATION_CUSTOMER.getJointText()).append(ecLogVo.getReceiveUser());
+        }
+        if (trajectoryType.equals(TrajectoryTypeEnum.GET_CUSTOMER.getValue())) {
+            detailContent.append(ecLogVo.getUserName()).append(TrajectoryTypeEnum.GET_CUSTOMER.getJointText());
+        }
+        if (StringUtils.isEmpty(detailContent)) {
+            detailContent.append(TrajectoryTypeEnum.getShowText(trajectoryType));
+        }
+        return detailContent.toString();
+    }
+
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -80,4 +80,7 @@ public class HyPartnerUserInfoDO implements Serializable {
     @ApiModelProperty("ec意向区域")
     private String ecWantShopArea;
 
+    @ApiModelProperty("ec创建时间")
+    private Date crmCreateTime;
+
 }

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

@@ -2,6 +2,8 @@ package com.cool.store.request;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author hxd
  * @since 2023/2/28
@@ -25,5 +27,12 @@ public class CustomerInfoRequest  {
     private String followUserName;
 
 
+    private String labelIds;
+
     private String ecWantShopArea;
+
+
+    private String crmCreateTime;
+
+    private Date updateTime;
 }