server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -16,8 +16,6 @@ */ @Service public interface ZbomZhongTaiService { ZTUserGetTokenResponse getUserToken(ZTUserGetTokenRequest param); ZTBaseResponse userUpdateInfo(ZTUserInfoUpdateRequest param); boolean userLogout(ZTBaseRequst param); server/service/src/main/java/com/doumee/biz/zbom/model/IamCategoryModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -10,82 +11,102 @@ @ApiModel("志邦IAM组织更新推送Scode参数") public class IamCategoryModel { @JsonProperty("relevanceCode") @JSONField(name="relevanceCode") @SerializedName("relevanceCode") @ApiModelProperty(value = "一体商码(s码)") private String relevanceCode; @JsonProperty("customerNumber") @JSONField(name="customerNumber") @ApiModelProperty(value = "加盟商编码") @SerializedName("customerNumber") private String customerNumber; @JsonProperty("accountSiteId") @JSONField(name="accountSiteId") @ApiModelProperty(value = "品牌id") @SerializedName("accountSiteId") private String accountSiteId; @JsonProperty("siteCode") @JSONField(name="siteCode") @ApiModelProperty(value = "客户类型") @SerializedName("siteCode") private String siteCode; @JsonProperty("cityAddress") @JSONField(name="cityAddress") @ApiModelProperty(value = "营销城市") @SerializedName("cityAddress") private String cityAddress; @JsonProperty("unitCode") @JSONField(name="unitCode") @ApiModelProperty(value = "品牌Code") @SerializedName("unitCode") private String unitCode; @JsonProperty("territoryId") @JSONField(name="territoryId") @ApiModelProperty(value = "营销区域id·") @SerializedName("territoryId") private String territoryId; @JsonProperty("segment1") @JSONField(name="segment1") @ApiModelProperty(value = "营销区域-中心编码") @SerializedName("segment1") private String segment1; @JsonProperty("segment2") @JSONField(name="segment2") @ApiModelProperty(value = "营销区域-省区编码") @SerializedName("segment2") private String segment2; @JsonProperty("segment3") @JSONField(name="segment3") @ApiModelProperty(value = "营销区域-片区编码") @SerializedName("segment3") private String segment3; @JsonProperty("meaning1") @JSONField(name="meaning1") @ApiModelProperty(value = "营销区域-中心") @SerializedName("meaning1") private String meaning1; @JsonProperty("meaning2") @JSONField(name="meaning2") @ApiModelProperty(value = "营销区域-省区") @SerializedName("meaning2") private String meaning2; @JsonProperty("meaning3") @JSONField(name="meaning3") @ApiModelProperty(value = "销区域-片区") @SerializedName("meaning3") private String meaning3; @JsonProperty("shipToPerson") @JSONField(name="shipToPerson") @ApiModelProperty(value = "收货人") @SerializedName("shipToPerson") private String shipToPerson; @JsonProperty("shipToAddress") @JSONField(name="shipToAddress") @ApiModelProperty(value = "收货地址") @SerializedName("shipToAddress") private String shipToAddress; @JsonProperty("shipToPhone") @JSONField(name="shipToPhone") @ApiModelProperty(value = "收货人号码") @SerializedName("shipToPhone") private String shipToPhone; @JsonProperty("operationStatus") @JSONField(name="operationStatus") @ApiModelProperty(value = "品牌状态:NORMAL 正常,NO-ORDER 中止下单,NO-SHIPMENT 中止发货,TERMINATED 终止") @SerializedName("operationStatus") private String operationStatus; @JsonProperty("oldAccountNumber") @JSONField(name="oldAccountNumber") @ApiModelProperty(value = "对应加盟商") @SerializedName("oldAccountNumber") private String oldAccountNumber; @JsonProperty("relation") @JSONField(name="relation") @ApiModelProperty(value = "一体商操作:1 新增、2 合并、3 变更、4 优化") @SerializedName("relation") private String relation; @JsonProperty("solutionId") @JSONField(name="solutionId") @ApiModelProperty(value = "solutionId") @SerializedName("solutionId") private String solutionId; server/service/src/main/java/com/doumee/biz/zbom/model/IamFcodeModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -10,86 +11,107 @@ @ApiModel("志邦IAM组织更新推送Scode参数") public class IamFcodeModel { @JsonProperty("relevanceCode") @JSONField(name="relevanceCode") @SerializedName("relevanceCode") @ApiModelProperty(value = "一体商码(s码)") private String relevanceCode; @JsonProperty("custAccountId") @JSONField(name="custAccountId") @SerializedName("custAccountId") @ApiModelProperty(value = "加盟商id") private String custAccountId; @JsonProperty("customerNumber") @JSONField(name="customerNumber") @ApiModelProperty(value = "加盟商编码") @SerializedName("customerNumber") private String customerNumber; @JsonProperty("customerName") @JSONField(name="customerName") @ApiModelProperty(value = "加盟商名称") @SerializedName("customerName") private String customerName; @JsonProperty("customerShortName") @JSONField(name="customerShortName") @ApiModelProperty(value = "加盟商简称") @SerializedName("customerShortName") private String customerShortName; @JsonProperty("registrationAddress") @JSONField(name="registrationAddress") @ApiModelProperty(value = "注册地址") @SerializedName("registrationAddress") private String registrationAddress; @JsonProperty("country") @JSONField(name="country") @ApiModelProperty(value = "国家") @SerializedName("country") private String country; @JsonProperty("provinceNum") @JSONField(name="provinceNum") @ApiModelProperty(value = "省区编码·") @SerializedName("provinceNum") private String provinceNum; @JSONField(name="provinceName") @JsonProperty("provinceName") @ApiModelProperty(value = "省区名称") @SerializedName("provinceName") private String provinceName; @JSONField(name="cityNum") @JsonProperty("cityNum") @ApiModelProperty(value = "市编码") @SerializedName("cityNum") private String cityNum; @JsonProperty("cityName") @JSONField(name="cityName") @ApiModelProperty(value = "市名称") @SerializedName("cityName") private String cityName; @JsonProperty("countyNum") @JSONField(name="countyNum") @ApiModelProperty(value = "区县编码") @SerializedName("countyNum") private String countyNum; @JsonProperty("countyName") @JSONField(name="countyName") @ApiModelProperty(value = "区县名称") @SerializedName("countyName") private String countyName; @JsonProperty("town") @JSONField(name="town") @ApiModelProperty(value = "乡镇") @SerializedName("town") private String town; @JsonProperty("status") @JSONField(name="status") @ApiModelProperty(value = "状态 中台发布的状态,对下游系统无意义,下游系统可不接") @SerializedName("status") private String status; @JsonProperty("contactPhone") @JSONField(name="contactPhone") @ApiModelProperty(value = "法人手机号码") @SerializedName("contactPhone") private String contactPhone; @JsonProperty("legalPerson") @JSONField(name="legalPerson") @ApiModelProperty(value = "法人") @SerializedName("legalPerson") private String legalPerson; @JsonProperty("legalIdentification") @JSONField(name="legalIdentification") @ApiModelProperty(value = "法人身份证号码") @SerializedName("legalIdentification") private String legalIdentification; @JsonProperty("accountOwner") @JSONField(name="accountOwner") @ApiModelProperty(value = "实控人") @SerializedName("accountOwner") private String accountOwner; @JsonProperty("accountIdentification") @JSONField(name="accountIdentification") @ApiModelProperty(value = "实控人身份证") @SerializedName("accountIdentification") private String accountIdentification; @JsonProperty("taxRegistrationNum") @JSONField(name="taxRegistrationNum") @ApiModelProperty(value = "纳税登记证号码") @SerializedName("taxRegistrationNum") private String taxRegistrationNum; server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateShopModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -12,95 +13,118 @@ @Data @ApiModel("志邦IAM组织更新推送参数") public class IamUpateShopModel implements Serializable { @JSONField(name="idt_org__id") @JsonProperty("idt_org__id") @SerializedName("idt_org__id") @ApiModelProperty(value = "部门ID") private String idtOrgId; @JSONField(name="idt_org__old_id") @JsonProperty("idt_org__old_id") @SerializedName("idt_org__old_id") @ApiModelProperty(value = "U客组织ID,存放U客老的组织id,如果是IAM新增的组织,该字段值为空。") private String idtOrgOldId; @JSONField(name="idt_org__name") @JsonProperty("idt_org__name") @ApiModelProperty(value = "部门名称") @SerializedName("idt_org__name") private String idtOrgName; @JSONField(name="idt_org__parent_id") @JsonProperty("idt_org__parent_id") @ApiModelProperty(value = "上级组织ID") @SerializedName("idt_org__parent_id") private String idtOrgParentId; @JSONField(name="idt_org__remark") @JsonProperty("idt_org__remark") @ApiModelProperty(value = "备注") @SerializedName("idt_org__remark") private String idtOrgRemark; @JsonProperty("idt_org__status") @JSONField(name="idt_org__status") @ApiModelProperty(value = "状态 0停用,1正常,-1删除") @SerializedName("idt_org__status") private String idtOrgStatus; @JsonProperty("idt_org__order_num") @JSONField(name="idt_org__order_num") @ApiModelProperty(value = "显示排序") @SerializedName("idt_org__order_num") private String idtOrgOrderNum; @JSONField(name="idt_org__org_code") @JsonProperty("idt_org__org_code") @ApiModelProperty(value = "组织编码·") @SerializedName("idt_org__org_code") private String idtOrgCode; @JSONField(name="idt_org__sup_org_code") @JsonProperty("idt_org__sup_org_code") @ApiModelProperty(value = "上级组织编码") @SerializedName("idt_org__sup_org_code") private String idtOrgSupOrgCode; @JsonProperty("idt_org__source_code") @JSONField(name="idt_org__source_code") @ApiModelProperty(value = "存放S,F,店面实体编码等") @SerializedName("idt_org__source_code") private String idtOrgSourceCode; @JSONField(name="idt_org__first_level_type") @JsonProperty("idt_org__first_level_type") @ApiModelProperty(value = "【一级组织类型】(1:HR、2:加盟商、3:虚拟组织)") @SerializedName("idt_org__first_level_type") private Integer idtOrgFirstLevelType; @JsonProperty("idt_org__second_level_type") @JSONField(name="idt_org__second_level_type") @ApiModelProperty(value = "二级组织类型】(1:S(加) , 2:F(加) ,3:店面(加),4:部门(HR/加),5:虚拟店面(加/虚) ") @SerializedName("idt_org__second_level_type") private Integer idtOrgSecondLevelType; @JsonProperty("idt_org__org_attribute") @JSONField(name="idt_org__org_attribute") @ApiModelProperty(value = "【部门属性】(1:实体店面、2:虚拟店面、3:电商部、4:渠道部、5:财务部)") @SerializedName("idt_org__org_attribute") private Integer idtOrgAttribute; @JsonProperty("idt_org__work_weixin_id") @JSONField(name="idt_org__work_weixin_id") @ApiModelProperty(value = "企业微信组织ID") @SerializedName("idt_org__work_weixin_id") private String idtOrgWorkWeixinId; @JsonProperty("idt_org__dingding_department_id") @JSONField(name="idt_org__dingding_department_id") @ApiModelProperty(value = "钉钉部门ID") @SerializedName("idt_org__dingding_department_id") private String idtOrgDingdingDepartId; @JSONField(name="idt_org__create_time") @JsonProperty("idt_org__create_time") @ApiModelProperty(value = "创建时间") @SerializedName("idt_org__create_time") private String idtOrgCreateTime; @JsonProperty("idt_org__creator") @JSONField(name="idt_org__creator") @ApiModelProperty(value = "创建人") @SerializedName("idt_org__creator") private String idtOrgCreator; @JSONField(name="idt_org__updater") @JsonProperty("idt_org__updater") @ApiModelProperty(value = "修改人") @SerializedName("idt_org__updater") private String idtOrgUpdater; @JSONField(name="idt_org__update_time") @JsonProperty("idt_org__update_time") @ApiModelProperty(value = "修改时间") @SerializedName("idt_org__update_time") private String idtOrgUpdateTime; @JSONField(name="scode") @JsonProperty("scode") @ApiModelProperty(value = "S码信息 当idt_org__second_level_type 为S时,scode有值,否则是null") @SerializedName("scode") private IamScodeModel scode; @JSONField(name="fcode") @JsonProperty("fcode") @ApiModelProperty(value = "F码信息 当idt_org__second_level_type 为F时,fcode有值,否则是null") @SerializedName("fcode") private IamFcodeModel fcode; @JSONField(name="shop") @JsonProperty("shop") @ApiModelProperty(value = "店面信息 当idt_org__second_level_type 为店面时,code有值,否则是null") @SerializedName("shop") private IamShopModel shop; @JsonProperty("category") @JSONField(name="category") @ApiModelProperty(value = "品类信息 当idt_org__second_level_type 为F时,ccategory有值,否则是[]") @SerializedName("category") private List<IamCategoryModel> category; server/service/src/main/java/com/doumee/biz/zbom/model/IamUpateUserModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -17,102 +18,127 @@ * 存在,则需要再根据推送的登录账号(app_account__account_no)去数据库查询登录账号,如果查询的结果是 1条数据并且 id 跟当前推送用户 id 相同,则更新当前数据,否则提示“该用户系统已经存在,更新失败”; * 不存在,也需要比对登录账号(app_account__account_no)是否跟其它账号的登录账号相同,如果相同,提示“该用户系统已经存在,新增失败”:如果不存在,则新增数据。 */ @JSONField(name="idt_user__id") @JsonProperty("idt_user__id") @SerializedName("idt_user__id") @ApiModelProperty(value = "IAM用户主键") private String idtUserId; @JsonProperty("idt_user__old_id") @JSONField(name="idt_user__old_id") @SerializedName("idt_user__old_id") @ApiModelProperty(value = "用户老的主键id,存放U客老用户id,如果是IAM新增的用户,该字段值为空,下游系统如果使用U客的用户id作为业务处理逻辑的依据,需要同步该字段") private String idtUserOldId; @JSONField(name="app_account__app_id") @JsonProperty("app_account__app_id") @ApiModelProperty(value = "应用id,下游系统可不关心") @SerializedName("app_account__app_id") private String appAccountAppId; @JSONField(name="idt_org__parent_id") @JsonProperty("idt_org__parent_id") @ApiModelProperty(value = "上级组织ID") @SerializedName("idt_org__parent_id") private String idtOrgParentId; @JSONField(name="app_account__account_no") @JsonProperty("app_account__account_no") @ApiModelProperty(value = "用户账号,详看特别说明") @SerializedName("app_account__account_no") private String appAccountNo; @JSONField(name="app_account__account_pwd") @JsonProperty("app_account__account_pwd") @ApiModelProperty(value = "密码") @SerializedName("app_account__account_pwd") private String appAccountPwd; @JSONField(name="idt_user__user_name") @JsonProperty("idt_user__user_name") @ApiModelProperty(value = "姓名") @SerializedName("idt_user__user_name") private String idtUserName; @JSONField(name="idt_user__gender") @JsonProperty("idt_user__gender") @ApiModelProperty(value = "性别 0男 1女·") @SerializedName("idt_user__gender") private String idtUserGender; @JSONField(name="idt_user__email") @JsonProperty("idt_user__email") @ApiModelProperty(value = "企业邮箱") @SerializedName("idt_user__email") private String idtUserEmail; @JsonProperty("idt_user__mobile") @JSONField(name="idt_user__mobile") @ApiModelProperty(value = "手机号码,详看特别说明") @SerializedName("idt_user__mobile") private String idtUserMobile; @JSONField(name="idt_user__uc_job_id") @JsonProperty("idt_user__uc_job_id") @ApiModelProperty(value = "U客岗位id") @SerializedName("idt_user__uc_job_id") private String idtUserUcJobId; @JSONField(name="idt_org__second_level_type") @JsonProperty("idt_org__second_level_type") @ApiModelProperty(value = "二级组织类型】(1:S(加) , 2:F(加) ,3:店面(加),4:部门(HR/加),5:虚拟店面(加/虚) ") @SerializedName("idt_org__second_level_type") private String idtOrgSecondLevelType; @JSONField(name="app_account__status") @JsonProperty("app_account__status") @ApiModelProperty(value = "账户状态 0停用,1启用") @SerializedName("app_account__status") private String appAccountStatus; @JSONField(name="app_account__creator") @JsonProperty("app_account__creator") @ApiModelProperty(value = "创建者") @SerializedName("app_account__creator") private String appAccountCreator; @JSONField(name="app_account__create_time") @JsonProperty("app_account__create_time") @ApiModelProperty(value = "创建时间") @SerializedName("app_account__create_time") private String appAccountCreateTime; @JSONField(name="app_account__updater") @JsonProperty("app_account__updater") @ApiModelProperty(value = "更新者") @SerializedName("app_account__updater") private String appAccountUpdater; @JSONField(name="app_account__update_time") @JsonProperty("app_account__update_time") @ApiModelProperty(value = "更新时间") @SerializedName("app_account__update_time") private String appAccountUpdateTime; @JSONField(name="idt_user__work_no") @JsonProperty("idt_user__work_no") @ApiModelProperty(value = "工号,详看特别说明") @SerializedName("idt_user__work_no") private String idtUserWorkNo; @JSONField(name="idt_user__ding_id") @JsonProperty("idt_user__ding_id") @ApiModelProperty(value = "钉钉用户ID") @SerializedName("idt_user__ding_id") private String idtUserDingdingId; @JSONField(name="userTypes") @JsonProperty("userTypes") @ApiModelProperty(value = "用户类型,产品支持一人多个用户类型") @SerializedName("userTypes") private List<IamUserTypeModel> userTypes; @JSONField(name="idt_org__updater") @JsonProperty("idt_org__updater") @ApiModelProperty(value = "用户类型,产品支持一人多个用户类型") @SerializedName("idt_org__updater") private String idtOrgUpdater; @JSONField(name="work_weixin_id") @JsonProperty("work_weixin_id") @ApiModelProperty(value = "企业微信用户openId") @SerializedName("work_weixin_id") private String workWeixinId; @JSONField(name="roles") @JsonProperty("roles") @ApiModelProperty(value = "账号包含的角色信息,支持多个") @SerializedName("roles") private List<IamUserRoleModel> roles; @JSONField(name="orgs") @JsonProperty("orgs") @ApiModelProperty(value = "组织信息 下游系统可不关心,通过jobs属性可以取到组织信息") @SerializedName("orgs") private List<IamUserOrgModel> orgs; @JSONField(name="jobs") @JsonProperty("jobs") @ApiModelProperty(value = "多组织岗位信息") @SerializedName("jobs") server/service/src/main/java/com/doumee/biz/zbom/model/IamUserJobModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -11,14 +12,17 @@ @Data @ApiModel("志邦IAM人员账号岗位参数") public class IamUserJobModel implements Serializable { @JSONField(name="idt_user_job_link__org_id") @JsonProperty("idt_user_job_link__org_id") @SerializedName("idt_user_job_link__org_id") @ApiModelProperty(value = "组织id") private String orgId; @JSONField(name="idt_org__first_level_type") @JsonProperty("idt_org__first_level_type") @SerializedName("idt_org__first_level_type") @ApiModelProperty(value = "【一级组织类型】(1:HR、2:加盟商、3:虚拟组织)") private String firstLevelType; @JSONField(name="idt_user_job_link__job_id") @JsonProperty("idt_user_job_link__job_id") @SerializedName("idt_user_job_link__job_id") @ApiModelProperty(value = "岗位Id") server/service/src/main/java/com/doumee/biz/zbom/model/IamUserOrgModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -12,31 +13,38 @@ @ApiModel("志邦IAM人员账号所属组织参数") public class IamUserOrgModel implements Serializable { @JsonProperty("idt_org__id") @JSONField(name="idt_org__id") @SerializedName("idt_org__id") @ApiModelProperty(value = "组织id") private String orgId; @JSONField(name="idt_org__first_level_type") @JsonProperty("idt_org__first_level_type") @SerializedName("idt_org__first_level_type") @ApiModelProperty(value = "【一级组织类型】(1:HR、2:加盟商、3:虚拟组织)") private String firstLevelType; @JSONField(name="idt_org__second_level_type") @JsonProperty("idt_org__second_level_type") @SerializedName("idt_org__second_level_type") @ApiModelProperty(value = "【二级组织类型】") private String secondLevelType; @JsonProperty(" idt_org__old_id") @SerializedName(" idt_org__old_id") @JSONField(name="idt_org__old_id") @JsonProperty("idt_org__old_id") @SerializedName("idt_org__old_id") @ApiModelProperty(value = "老Id") private String orgOldId; @JsonProperty(" idt_org__name") @SerializedName(" idt_org__name") @JsonProperty("idt_org__name") @JSONField(name="idt_org__name") @SerializedName("idt_org__name") @ApiModelProperty(value = "组织名称") private String orgName; @JSONField(name="idt_org__org_code") @JsonProperty("idt_org__org_code") @SerializedName("idt_org__org_code") @ApiModelProperty(value = "组织编码") private String orgCode; @JsonProperty(" idt_org__parent_id") @SerializedName(" idt_org__parent_id") @JsonProperty("idt_org__parent_id") @JSONField(name="idt_org__parent_id") @SerializedName("idt_org__parent_id") @ApiModelProperty(value = "上级id") private String orgParentId; } server/service/src/main/java/com/doumee/biz/zbom/model/IamUserTypeModel.java
@@ -1,5 +1,6 @@ package com.doumee.biz.zbom.model; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; @@ -12,6 +13,7 @@ @Data @ApiModel("志邦IAM人员账号类型参数") public class IamUserTypeModel implements Serializable { @JSONField(name="idt_user_type__code") @JsonProperty("idt_user_type__code") @SerializedName("idt_user_type__code") @ApiModelProperty(value = "用户标记(用户类型,区分HR内部员工和加盟商员工,10001加盟商,10002HR内部员工")