组织排队开关，新增用户司机同步yms，oms预约单修改

2026-05-21 15:15:49 +08:00
parent a29ac3050e
commit 4f03f56126
26 changed files with 465 additions and 7 deletions
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017",  configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,  configuration = FeignAutoConfiguration.class)
 public interface OmsServiceFeign {


@@ -0,0 +1,63 @@
+package com.mhd.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * YMS登录用户信息
+ * @author AI
+ * @date 2026/05/13
+ */
+@Data
+public class YmsLoginUser {
+
+    //登录人id
+    private Long id;
+    //登录人账号
+    private String username;
+    //登录人名字
+    private String nickName;
+    //登录人密码
+    private String password;
+    //当前登录部门code
+    private String orgCode;
+    //头像
+    private String avatar;
+    //性别（0男 1女 2未知）
+    private String sex;
+    //电子邮件
+    private String email;
+    //电话
+    private String phonenumber;
+    //状态(0正常 1停用）
+    private String status;
+    //删除标志（0代表存在 2代表删除）
+    private String delFlag;
+    //最后登录IP
+    private String loginIp;
+    //最后登录时间
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loginDate;
+    //创建时间
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    //数字物流用户ID
+    private Long szwlUserId;
+    //一级组织表ID
+    private Long topOrganizationId;
+    //组织表ID
+    private Long organizationId;
+    //角色code集合
+    private String roleCodes;
+    //角色名称集合
+    private String roleNames;
+    //推广码
+    private String promoCode;
+    //账号类型 1.普通账号，2.组织账号，3.一级账号，4.平台员工，5.企业员工，6.合作商
+    private Integer userAccountType;
+}
@@ -11,6 +11,7 @@ import com.mhd.system.api.domain.MallOAuthToken;
 import com.mhd.system.api.domain.mall.BaseUser;
 import com.mhd.system.api.domain.SysUser;
 import com.mhd.system.api.domain.WlhyLoginUser;
+import com.mhd.system.api.domain.YmsLoginUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

@@ -87,6 +88,11 @@ public class LoginUser implements Serializable
     */
    private WlhyLoginUser wlhyLoginUser;

+    /**
+     * YMS用户信息
+     */
+    private YmsLoginUser ymsLoginUser;
+
    /**
     * websocket地址
     */