Merge branch 'refs/heads/master' into cc_20250529_franchise_fee

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

@@ -19,4 +19,13 @@ public class ImportOaOldShopDataErrorDTO {
     @ExcelProperty(value = "错误原因", order = 2)
     @ColumnWidth(40)
     private String errorReason;
+
+    public ImportOaOldShopDataErrorDTO() {
+
+    }
+
+    public ImportOaOldShopDataErrorDTO(String shopCode, String errorReason) {
+        this.shopCode = shopCode;
+        this.errorReason = errorReason;
+    }
 }

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

@@ -72,4 +72,19 @@ public class EnterpriseUserDO implements Serializable {
      * 第三方OA系统唯一标识
      */
     private String thirdOaUniqueFlag;
+
+    /**
+     * 部门全路径
+     */
+    private String departments;
+
+    private String roles;
+
+    private String language;
+
+    private Boolean active;
+
+    private String position;
+
+    private Integer userType;
 }

coolstore-partner-model/src/main/java/com/cool/store/userholder/CurrentUser.java

@@ -0,0 +1,157 @@
+package com.cool.store.userholder;
+
+import com.cool.store.entity.SysRoleDO;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/5/29 16:34
+ * @Version 1.0
+ */
+@Data
+public class CurrentUser {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    private String userId;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 电话号码
+     */
+    private String mobile;
+
+    /**
+     * 账号
+     * 当type为以下值的时候
+     * 0.account
+     * 1.account
+     * 2.userId
+     * 3.userId
+     * 4.account
+     */
+    private String account;
+
+    /**
+     * 用户名
+     */
+    private String name;
+
+    /**
+     * 电子邮箱
+     */
+    private String email;
+
+    private String typeStr;
+
+    /**
+     * 培训机构id
+     */
+    private Long supplierId;
+
+    private String enterpriseId;
+
+    private String enterpriseName;
+
+    private String logoName;
+
+    private String enterpriseLogo;
+
+    private String dingCorpId;
+    /**
+     * 企业类型(1:普通用户 2:付费用户  3:试用用户 4:共创用户)
+     */
+    private Integer isVip;
+
+    /**
+     * 开通时间
+     */
+    private Date openTime;
+
+    /**
+     * app类型('micro_app','e_app')
+     */
+    private String appType;
+
+    /**
+     * 需要配置的类型
+     */
+    private List<String> configTypes;
+
+    private String accessToken;
+
+    /**
+     * 职位信息
+     */
+    private String position;
+
+    /**
+     * 成员所属部门id列表
+     */
+    private String departmentIds;
+
+    /**
+     * 是否持久化
+     */
+    private Boolean persistent = false;
+
+    /**
+     * 员工工号
+     */
+    private String jobnumber;
+
+    private Boolean active;
+    /**
+     * 员工角色
+     */
+    private String roles;
+
+    private String unionid;
+
+    /**
+     * 用户语言环境
+     * 用户语言环境:en_us/英语_美国,zh_cn/中文_简体,zh_hk/中文_繁体_HK
+     */
+    private String language;
+
+    private String dbName;
+
+    /**
+     * 钉钉管理员和数智门店无关
+     */
+    private Boolean isAdmin;
+
+    private String agentId;
+
+    private String groupCorpId;
+
+    /**
+     * 角色权限
+     */
+    private String roleAuth;
+
+    private String mainCorpId;
+
+    /**
+     * 用户最高优先级角色
+     */
+    private SysRoleDO sysRoleDO;
+
+    /**
+     * 授权类型
+     */
+    private Integer licenseType;
+
+    private Integer userType;
+
+}

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

@@ -53,4 +53,7 @@ public class PreparationCommonPendingVO {
     private Integer signType;
     @ApiModelProperty("业务备注")
     private String businessRemark;
+
+    @ApiModelProperty("签约人2姓名")
+    private String partnershipSignatorySecond;
 }