iaw

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/IssueOrderinfoModel.java

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

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/OrderAppPageReqDTO.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.iaw.dto.issue.order;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -22,4 +23,7 @@ public class OrderAppPageReqDTO extends AbstractStaffBizRequestDTO {
     @NotNull
     @ApiModelProperty(value = "tab页下标 0-全部、1-申办中、2-待发货、3-待激活、4-已完成")
     private Integer tabIndex;
+
+    @ApiModelProperty(value = "订单阶段，申办中的阶段")
+    private IssueOrderStep orderStep;
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/OrderDetailResDto.java

@@ -2,6 +2,7 @@ package cn.com.taiji.iaw.dto.issue.order;
 
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,8 +12,9 @@ import lombok.Data;
  * @Filename：orderDetailResDto
  * @description:
  */
+@ApiModel("订单详情返回参数")
 @Data
-public class OrderDetailResDto extends IssueOrderinfo {
+public class OrderDetailResDto extends IssueOrderinfoModel {
 
     @ApiModelProperty(value = "是否可以评价")
     private Boolean canEvaluate;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/IssueOrderManageImpl.java

@@ -111,6 +111,7 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
         request.setStaffOpenId(staff.getOpenId());
         request.setAgentId(staff.getAgencyId());
+        request.setIssueOrderStep(reqDto.getOrderStep());
         return issueOrderinfoRepo.page(request);
     }
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/repo/jpa/request/issue/IssueOrderaPageRequest.java

@@ -30,6 +30,8 @@ public class IssueOrderaPageRequest extends JpaPageableDataRequest<IssueOrderinf
 
     private String agentId;//员工所属渠道
 
+    private IssueOrderStep issueOrderStep;//订单阶段
+
 
 
     public IssueOrderaPageRequest() {
@@ -39,7 +41,9 @@ public class IssueOrderaPageRequest extends JpaPageableDataRequest<IssueOrderinf
     @Override
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from "+IssueOrderinfo.class.getName()+" where 1=1 ");
-        if (tabIndex.equals(1)) {
+        if (issueOrderStep != null){
+            hql.append(" AND orderStep = :orderStep", issueOrderStep);
+        }else if (tabIndex.equals(1)) {
             // 申办中
             List<IssueOrderStep> step =
                     Arrays.asList(IssueOrderStep.ORDER_INIT, IssueOrderStep.CUSTOMER_UPLOAD,