Skip to content

yangxiujun / paidan_demo

Go to a project
Commit ceb3feed by 刘鑫
Options

CI: 所有调用BEAN 接口定义

1 parent e83b6224
Inline Side-by-side
Showing with 394 additions and 4 deletions
project-order/src/main/java/com/dituhui/pea/order/feign/IBeanRemoteService.java
...@@ -87,6 +87,27 @@ public interface IBeanRemoteService { ...@@ -87,6 +87,27 @@ public interface IBeanRemoteService {
BeanR<BranchDetail> branchDetail(@RequestHeader(name = "accessToken") String accessToken, @RequestParam("bsTagId") String bsTagId); BeanR<BranchDetail> branchDetail(@RequestHeader(name = "accessToken") String accessToken, @RequestParam("bsTagId") String bsTagId);
/**
* 查询网点/车队列表
*
* @param accessToken ACCESS_TOKEN
* @param type 类型 1：网点 2：车队 必传字段
* @return 网点或者车队列表
*/
@GetMapping("/api/openapi/department/queryServiceOrgList")
BeanR<List<ServiceOrg>> serviceOrgList(@RequestHeader(name = "accessToken") String accessToken, @RequestParam("type") String type);
/**
* 查询网点/车队详情
*
* @param accessToken ACCESS_TOKEN
* @param serviceOrgId 列表接口获取的serviceOrgId
* @return 查询网点/车队详情
*/
@GetMapping("/api/openapi/department/getServiceOrgDetail")
BeanR<?> serviceOrgDetail(@RequestHeader(name = "accessToken") String accessToken, @RequestParam("serviceOrgId") String serviceOrgId);
/* ***********************************工单相关************************************** */ /* ***********************************工单相关************************************** */
/** /**
...@@ -111,5 +132,15 @@ public interface IBeanRemoteService { ...@@ -111,5 +132,15 @@ public interface IBeanRemoteService {
BeanR<?> orderTaskCancel(@RequestHeader(name = "accessToken") String accessToken, @RequestBody OrderCancel orderCancel); BeanR<?> orderTaskCancel(@RequestHeader(name = "accessToken") String accessToken, @RequestBody OrderCancel orderCancel);
/**
* 服务工单派单结果更新
*
* @param accessToken ACCESS_TOKEN
* @param allotResultParam 派单结果更新参数
* @return 是否回写成功
* @apiNote 服务工单排单结果更新，PEA需要把派工的结果：负责人和计划时间，回写回来
*/
@PostMapping("/api/openapi/task/updateAllotResult")
BeanR<?> allotResultUpdate(@RequestHeader(name = "accessToken") String accessToken, @RequestBody AllotResultParam allotResultParam);
} }
project-order/src/main/java/com/dituhui/pea/order/feign/bean/AllotResultParam.java 0 → 100644
package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
@Setter
@Getter
public class AllotResultParam {
/**
* RIS 服务工单唯一的识别编号，创建时生成
*/
private String risId;
/**
* 负责人工号
*/
private String executorWorkNo;
/**
* 协作人工号
*/
private String assistantWorkNo;
/**
* 更新负责人时填写
*/
private String reason;
/**
* 预约开始时间
*/
private long appointmentStartTime;
/**
* 预约结束时间
*/
private long appointmentEndTime;
}
project-order/src/main/java/com/dituhui/pea/order/feign/bean/BelongRB.java 0 → 100644
package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
/**
* 归属字段
*/
@Setter
@Getter
public class BelongRB {
/**
* 账号中心部门id
*/
private String bsDeptId;
/**
* 部门名称
*/
private String name;
}
project-order/src/main/java/com/dituhui/pea/order/feign/bean/BelongRB1.java 0 → 100644
package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
/**
* 归属字段
*/
@Setter
@Getter
public class BelongRB1 {
/**
* 账号中心部门id
*/
private String deptId;
/**
* 部门名称
*/
private String name;
}
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Executor.java 0 → 100644
package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
/**
* 负责人信息
*/
@Setter
@Getter
public class Executor {
/**
* 账号中心的userId
*/
private String userId;
/**
* hrId
*/
private String hrId;
/**
* 用户名
*/
private String username;
}
project-order/src/main/java/com/dituhui/pea/order/feign/bean/OrderCancel.java
package com.dituhui.pea.order.feign.bean; package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
/**
* 工单取消参数
*/
@Setter
@Getter
public class OrderCancel { public class OrderCancel {
/**
* RIS
*/
private String risId; private String risId;
/**
* 取消原因
*/
private String cancellationReason; private String cancellationReason;
/**
* 取消备注
*/
private String cancelNote; private String cancelNote;
private long cancelStartTime; /**
* 取消发起时间
*/
private Long cancelStartTime;
/**
* 取消发起人 (工号)
*/
private String cancelInitiator; private String cancelInitiator;
/**
* 取消拍照
*/
private Photo cancelPhotograph; private Photo cancelPhotograph;
} }
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Photo.java
package com.dituhui.pea.order.feign.bean; package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
/**
* 照片
*/
@Setter
@Getter
public class Photo { public class Photo {
/**
* 文件名
*/
private String filename; private String filename;
/**
* 文件路径
*/
private String url; private String url;
} }
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Rescheduled.java
...@@ -6,13 +6,44 @@ import java.util.List; ...@@ -6,13 +6,44 @@ import java.util.List;
* *
*/ */
public class Rescheduled { public class Rescheduled {
/**
* 服务工单唯一的识别编号，创建时生成
*/
private String risId; private String risId;
private long rescheduledDate; /**
* 新的预约上门的时间
*/
private Long rescheduledDate;
/**
* 改约原因
*/
private String reasonForRescheduling; private String reasonForRescheduling;
/**
* 改约备注
*/
private String remarksForRescheduling; private String remarksForRescheduling;
private boolean reassignment; /**
private boolean requireApprove; * 是否改派
*/
private Boolean reassignment;
/**
* 需要审批
*/
private Boolean requireApprove;
/**
* 改约发起人
*/
private String initiatorOfRescheduling; private String initiatorOfRescheduling;
/**
* 改约照片
*/
private List<Photo> rescheduledPhotos; private List<Photo> rescheduledPhotos;
/**
* 审批人工号
*/
private String approver;
} }
project-order/src/main/java/com/dituhui/pea/order/feign/bean/ServiceOrg.java 0 → 100644
package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
/**
* 网点、分站列表
*/
@Setter
@Getter
public class ServiceOrg {
/**
* 车队/网点id
*/
private String serviceOrgId;
/**
* 车队/网点名称
*/
private String name;
/**
* 状态;1正常、0注销
*/
private int status;
/**
* 服务商类型
*/
private List<String> type;
/**
* 所属大区
*/
private BelongRB belongRegion;
/**
* 所属分部
*/
private BelongRB belongBranch;
}
project-order/src/main/java/com/dituhui/pea/order/feign/bean/ServiceOrgDetail.java 0 → 100644
package com.dituhui.pea.order.feign.bean;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
/**
* 网点车队详情
*/
@Setter
@Getter
public class ServiceOrgDetail {
/**
* 车队/网点id
*/
private String serviceOrgId;
/**
* 车队网点名称
*/
private String name;
/**
* 网点信息员
*/
private String contactor;
/**
* 网点联系方式
*/
private String contactPhone;
/**
* 状态;1正常、0注销
*/
private Integer status;
/**
* 网点类型
*/
private List<String> type;
/**
* 结算系数
*/
private Double billFactor;
/**
* 开票类型（增票/普票）
*/
private String billingType;
/**
* 电子发票接收电话
*/
private String billingPhone;
/**
* 经营地址
*/
private Address businessAddress;
/**
* 收货地址
*/
private List<Address> deliveryAddress;
/**
* 营业执照地址
*/
private Address businessLicenseAddress;
/**
* 银行账号
*/
private String depositAccount;
/**
* 邮箱
*/
private String email;
/**
* 网点负责人
*/
private List<Executor> executorList;
/**
* 网点星级（一星/二星/三星）
*/
private String star;
/**
* 网点等级（A/B/C/D)
*/
private String level;
/**
* 网点性质(独家/非独家)
*/
private String nature;
/**
* 是否有博西门头
*/
private Boolean hasBshDoorHeader;
/**
* 是否有大修车间
*/
private Boolean hasOverhaulWorkshop;
/**
* 是否有专职信息员
*/
private Boolean hasProfessionalInformationOfficer;
/**
* Pay ID账号
*/
private String payId;
/**
* 配件折扣
*/
private Double sparepartDiscount;
/**
* 邮编
*/
private String postcode;
/**
* 网点主管
*/
private Executor supervisor;
/**
* 税务登记电话
*/
private String taxRegistrationPhone;
/**
* 运输车辆数量
*/
private Integer transportVehicleNum;
/**
* 所属大区
*/
private BelongRB1 belongRegion;
/**
* 所属分部
*/
private BelongRB1 belongBranch;
/**
* 服务范围
*/
private List<Address> serviceRange;
/**
* 成本中心
*/
private String costCenter;
/**
* 开户名称
*/
private String depositName;
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!