managew 订单证件类型转换

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

@@ -33,6 +33,7 @@ import cn.com.taiji.managew.dto.issueOrder.OrderDetailReqDTO;
 import cn.com.taiji.managew.dto.issueOrder.OrderExaminePageReqDTO;
 import cn.com.taiji.managew.dto.issueOrder.OrderExamineReqDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
+import cn.com.taiji.managew.model.issueOrder.OrderPageModel;
 import cn.com.taiji.managew.repo.jpa.request.IssueOrderExaminePageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -71,7 +72,21 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
         IssueOrderExaminePageRequest request = copyProperties(reqDto, new IssueOrderExaminePageRequest());
         request.setIdentityType(staff.getIdentityType());
         request.setAgencyId(staff.getAgencyId());
-        return issueOrderinfoRepo.page(request);
+        return issueOrderinfoRepo.page(request).convertResult(this::cover);
+    }
+
+    private OrderPageModel cover(IssueOrderinfo o) {
+        OrderPageModel model = copyProperties(o, new OrderPageModel());
+        if (o.getCustomerIdType() != null) {
+            model.setCustomerIdType(o.getCustomerIdType().getCode());
+        }
+        if (o.getOwnerIdType() != null) {
+            model.setOwnerIdType(o.getOwnerIdType().getCode());
+        }
+        if (o.getAgentIdType() != null) {
+            model.setAgentIdType(o.getAgentIdType().getCode());
+        }
+        return model;
     }
 
     @Override

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

@@ -30,6 +30,7 @@ import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.configuration.CompatibilityVerifierAutoConfiguration;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -83,7 +84,21 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
         request.setIdentityType(staff.getIdentityType());
         request.setAgencyId(staff.getAgencyId());
-        return issueOrderinfoRepo.page(request);
+        return issueOrderinfoRepo.page(request).convertResult(this::cover);
+    }
+
+    private OrderPageModel cover(IssueOrderinfo o) {
+        OrderPageModel model = copyProperties(o, new OrderPageModel());
+        if (o.getCustomerIdType() != null) {
+            model.setCustomerIdType(o.getCustomerIdType().getCode());
+        }
+        if (o.getOwnerIdType() != null) {
+            model.setOwnerIdType(o.getOwnerIdType().getCode());
+        }
+        if (o.getAgentIdType() != null) {
+            model.setAgentIdType(o.getAgentIdType().getCode());
+        }
+        return model;
     }
 
     @Override

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

@@ -0,0 +1,94 @@
+package cn.com.taiji.managew.model.issueOrder;
+
+import cn.com.taiji.core.entity.dict.basic.*;
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStatus;
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
+import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/6 10:59
+ * @Filename：OrderPageModel
+ * @description: 订单分页响应模型,目的转证件类型
+ */
+@Data
+public class OrderPageModel {
+
+    private String orderNo;//订单编号
+    private SourceType orderSource;//订单来源
+    private String channelId;//网点编号
+    private String agencyId;//发行渠道
+    private String accountId;//扣款渠道
+    private IssueOrderStep orderStep;//订单阶段
+    private ShippingStatus shippingStatus;//货物状态
+    private IssueOrderStatus orderStatus;//订单状态
+    private UserType userType;//用户类型 个人用户、单位用户、其他
+    private Integer vanType;//客货类型 1-客车 2-货车 3-专项作业车
+    private String userId;//用户openid，无值填-1
+    private String staffOpenId;//业务员openid，无值填-1
+    private Boolean receiveStatus;//领取状态
+    private String receiver;//领取人
+    private LocalDateTime receiveTime;//领取时间
+    private String auditOpenId;//订单审核人
+    private LocalDateTime auditTime;//订单审核时间
+    private Integer artificialStatus;//是否被人工审核 1：人工 2：系统 0：未审核
+    private String productId;//产品编号
+    private String productName;//产品名称
+    private String productAgreeNo;//产品协议编号
+    private Integer productTypes;//产品类型 1：自营产品、0：非自营产品
+    private Integer promotionModes;//推广模式(1--线上, 2---线下,3：线上和线下)
+    private String equityId;//权益产品
+    private String equityName;//权益名称
+    private Long amount;//订单金额（创建订单时的产品金额）
+    private Boolean needPay;// 是否需要支付
+    private LocalDateTime agreementEnableTime;//签约启用时间
+    private String agreementId;//签约协议编号，暂时和车签约,字段值其实是微信openId或支付宝openId,渠道签约结果通知，不知传的啥玩意
+    private CardType cardType;//卡类型
+    private String cardId;//卡号
+    private CardStatus cardStatus;//etc卡状态
+    private LocalDateTime cardEnableTime;//卡启用时间
+    private LocalDateTime cardExpireTime;//卡到期时间
+    private String obuId;//签号
+    private ObuStatus obuStatus;//obu状态
+    private LocalDateTime obuEnableTime;//obu启用时间
+    private LocalDateTime obuExpireTime;//obu到期时间
+    private LocalDateTime activationTime;//订单激活时间
+    private LocalDateTime deliveryTime;//邮寄时间
+    private LocalDateTime payTime;//支付时间
+    private LocalDateTime cancelTime;//订单取消时间
+    private LocalDateTime receivingTime;//订单收货时间
+    private LocalDateTime returnGoodsTime;//退货时间
+    private String customerId;//用户唯一id
+    private int customerIdType;//用户证件类型
+    private String customerIdNum;//用户证件号
+    private String customerName;//用户名称
+    private Gender customerGender;
+    private String customerTel;//联系方式
+    private String customerIdVld;//身份证有效期
+    private int agentIdType;//经办人证件类型
+    private String agentIdNum;//经办人证件号
+    private String agentName;//经办人姓名
+    private String vehicleId;//车辆编号
+    private String vehiclePlate;//车牌号
+    private Integer vehiclePlateColor;//车牌颜色
+    private Integer vehicleClass;//车型，收费车型，对应vehicle.type
+    private String vehicleType;//车辆类型(驾驶证上的汉字)
+    private Integer vehicleAxleCount;//车轴数
+    private String ownerName;//车主名称
+    private String ownerIdNum;//车主证件号
+    private int ownerIdType;//车主证件类型
+    private Boolean couponStatus;//是否领取卡券
+    private Integer migrateData;//是否迁移数据0_否,1_是
+    private SecretKeyType deviceType;//设备类型
+    private LocalDateTime insertTime;
+    private LocalDateTime updateTime;
+    private String qdOrderNo;
+    private String protocol; // 是否同意协议：1：是
+    private String returnUrl;// 消息通知地址，渠道订单使用
+    private Integer platformSource;// 电商平台
+    private String wxOpenedId;//渠道支付成功后保存微信openid
+    private String h5ReturnQdUrl;//H5提交车辆信息后跳转地址
+    private String protocolUrl;//安心签文件地址
+}