managew 订单详情

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderinfoExt.java

@@ -113,7 +113,7 @@ public class IssueOrderinfoExt extends AbstractStringPropertyUUIDEntity {
 //	@Column(name = "AUDIT_OP_ID")
 //	private String auditOpId;// 人工审核操作人
 	@Column(name = "AGREE_TIME")
-	private LocalDateTime agreeTime;//签约时间
+	private LocalDateTime agreeTime;//签约协议时间
 	@Column(name = "CONSIGNEE")
 	private String consignee;//收货人——第一次发货记录
 	@Column(name = "CONSIGNEE_TEL")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/issueOrder/OrderDetailResDTO.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+
+import java.time.LocalDateTime;
 import java.util.List;
 
 @ApiModel(description = "订单详情响应")
@@ -49,7 +51,8 @@ public class OrderDetailResDTO {
     private SignInfoModel signInfo;
     @ApiModelProperty(value = "激活信息")
     private ActiveInfoModel activeInfo;
-
+    @ApiModelProperty(value = "协议签署时间")
+    private LocalDateTime agreeTime;//签约协议时间
     @ApiModelProperty(value = "协议列表")
     private List<IssueAgreementAddress> agreementsList;
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManageImpl.java

@@ -154,6 +154,8 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         //车辆信息
         CarInfoModel carInfoModel = setCarInfoModel(issueOrderinfo, orderinfoExt);
         resDTO.setCarInfo(carInfoModel);
+        //协议签署时间
+        resDTO.setAgreeTime(orderinfoExt.getAgreeTime());
         //协议列表
         List<IssueAgreementAddress> agreementsList = setAgreementsList(orderinfoExt);
         resDTO.setAgreementsList(agreementsList);
@@ -176,7 +178,10 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
     private @NotNull OrderInfoModel setOrderModel(IssueOrderinfo issueOrderinfo) {
         OrderInfoModel infoModel = copyProperties(issueOrderinfo, new OrderInfoModel());
         Staff staff = staffRepo.findByOpenId(issueOrderinfo.getStaffOpenId());
-        if (staff != null) infoModel.setStaffName(staff.getStaffName());
+        if (staff != null) {
+            infoModel.setStaffName(staff.getStaffName());
+            infoModel.setStaffId(staff.getStaffId());
+        }
         QtkServiceHall serviceHallId = qtkServicehallRepo.findByServiceHallId(issueOrderinfo.getChannelId());
         infoModel.setChannelName(serviceHallId.getName());
         QtkAgency agency = qtkAgencyRepo.findByAgencyId(issueOrderinfo.getAgencyId());

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/issueOrder/OrderInfoModel.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @Author：ChenChao
  * @Date：2025/6/7 16:01
@@ -18,16 +20,18 @@ import lombok.Data;
 @Data
 public class OrderInfoModel {
     //=========================发行订单数据=========================
+    @ApiModelProperty("创建时间")
+    private LocalDateTime insertTime;
     @ApiModelProperty("订单编号")
     private String orderNo;
     @ApiModelProperty("车牌号")
     private String vehiclePlate;
     @ApiModelProperty("车牌颜色")
     private Integer vehiclePlateColor;
-    @ApiModelProperty("卡号")
-    private String cardId;
-    @ApiModelProperty("OBU")
-    private String obuId;
+//    @ApiModelProperty("卡号")
+//    private String cardId;
+//    @ApiModelProperty("OBU")
+//    private String obuId;
     @ApiModelProperty("用户类型")
     private UserType userType;
     @ApiModelProperty("订单来源")
@@ -40,10 +44,14 @@ public class OrderInfoModel {
     private IssueOrderStep orderStep;
     //=========================发行订单数据=========================
 
+    @ApiModelProperty("渠道订单号")
+    private String qdOrderNo;
     @ApiModelProperty("办理渠道渠道名称")
     private String agencyName;
     @ApiModelProperty("办理网点名称")
     private String channelName;
+    @ApiModelProperty("员工编号")
+    private String staffId;
     @ApiModelProperty("员工名称")
     private String staffName;