调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssReimburseOrder.java

@@ -54,6 +54,10 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	@Column(name = "VEHICLE_PLATECOLOR")
 	private Integer vehiclePlateColor;//车牌颜色;
 	@NotBlank
+	@Size(max = 20)
+	@Column(name = "CARD_ID")
+	private String cardId;
+	@NotBlank
 	@Column(name = "INFO")
 	private String info;//补缴原因
 	@NotNull
@@ -67,7 +71,8 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	private Integer payee;// 收款方 1-黔通 2-渠道
 
 	/**审核相关*/
-	@NotNull
+	@Column(name = "IS_OBJECTIONS")
+	private boolean isObjections = false;//是否申诉
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
 	private AuditStatus status;//审核状态

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssReimburseOrderTrans.java

@@ -30,7 +30,7 @@ public class AssReimburseOrderTrans extends StringPropertyUUIDEntity {
 	private String orderNo;//订单编号
 	@NotNull
 	@Column(name = "FEE")
-	private Long fee;//补缴金额
+	private Long fee;//流水金额
 	@NotBlank
 	@Column(name = "VEHICLE_ID")
 	private String vehicleId;

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/ass/AssReimburseOrderRepo.java

@@ -8,7 +8,7 @@ import cn.com.taiji.core.entity.ass.AssReimburseOrder;
 public interface AssReimburseOrderRepo extends AbstractJpaRepo<AssReimburseOrder, String> {
 
     //根据订单号查询
-    @Query(" from AssReimburseOrder where reimburseOrderId=?1")
-    public AssReimburseOrder findByReimburseOrderId(String reimburseOrderId);
+    @Query(" from AssReimburseOrder where orderNo=?1")
+    public AssReimburseOrder findByOrderNo(String orderNo);
 
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/ass/AssReimburseOrderTransRepo.java

@@ -0,0 +1,11 @@
+package cn.com.taiji.core.repo.jpa.ass;
+
+import cn.com.taiji.core.entity.ass.AssReimburseOrderTrans;
+import org.springframework.data.jpa.repository.Query;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.ass.AssReimburseOrder;
+
+public interface AssReimburseOrderTransRepo extends AbstractJpaRepo<AssReimburseOrderTrans, String> {
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/AssReimburseOrderPageRequest.java

@@ -1,10 +1,11 @@
 package cn.com.taiji.core.repo.request.ass;
 
+import java.util.List;
+
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
 import cn.com.taiji.core.entity.ass.AssReimburseOrder;
 import cn.com.taiji.core.entity.dict.AuditStatus;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,15 +13,21 @@ import lombok.Setter;
 @Setter
 public class AssReimburseOrderPageRequest extends JpaDateTimePageableDataRequest<AssReimburseOrder> {
 
-    private String reimburseOrderId; // 订单id
-    private SourceType sourceType;//来源
-    private String operateStaffId;// 录入员工工号
-    private String customerId;//用户编号
-    private String cardId;//卡号
+    private String orderNo;//订单编号
+//    private SourceType orderSource;//订单来源
+    private List<String> agencyIds;//订单渠道编号
+    private String staffOpenId;//业务员openid
+    private String customerId;//客户openID
+
     private String vehicleId;
-    private String agencyIds;
-    private String payOrderNo;//支付订单编号 自己规则生成 商户订单号
-    private AuditStatus status;//审核状态
+    private String vehiclePlate;//车牌号;
+    private Integer vehiclePlateColor;//车牌颜色;
+    private String cardId;//卡id;
+
+    private Integer payee;
+    private boolean isObjections;//是否申诉
+    private AuditStatus status;
+
 
     public AssReimburseOrderPageRequest() {
         this.orderBy="updateTime";
@@ -30,14 +37,13 @@ public class AssReimburseOrderPageRequest extends JpaDateTimePageableDataRequest
     @Override
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from AssReimburseOrder where 1=1 ");
-        hql.append(" and reimburseOrderId = :reimburseOrderId", reimburseOrderId);
-        hql.append(" and sourceType = :sourceType", sourceType);
-        hql.append(" and operateStaffId = :operateStaffId", operateStaffId);
-        hql.append(" and customerId = :customerId", customerId);
-        hql.append(" and cardId = :cardId", cardId);
-        hql.append(" and vehicleId = :vehicleId", vehicleId);
+        hql.append(" and orderNo = :orderNo", orderNo);
+//        hql.append(" and orderSource = :orderSource", orderSource);
         hql.append(" and agencyId in (:agencyIds)", agencyIds);
-        hql.append(" and payOrderNo = :payOrderNo", payOrderNo);
+        hql.append(" and staffOpenId = :staffOpenId", staffOpenId);
+        hql.append(" and vehicleId = :vehicleId", vehicleId);
+        hql.append(" and vehiclePlate = :vehiclePlate", vehiclePlate);
+        hql.append(" and vehiclePlateColor = :vehiclePlateColor", vehiclePlateColor);
         hql.append(" and status = :status", status);
         return hql;
     }