移动支付:

    移动支付省内消费资金结算表
	移动支付总对比表
	移动支付省内付款单
	移动支付省外付款单
	ETC通行费确认单（支付宝）

gly-base-core/src/main/java/cn/com/taiji/core/entity/settle/mobilepay/MobilePayInpNotice.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.core.entity.settle.mobilepay;
 
 import cn.com.taiji.core.entity.settle.AbstractUUIDEntity;
+import cn.com.taiji.core.entity.settle.notice.InpTransNotice;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,44 +20,71 @@ import java.time.LocalDateTime;
 @Entity
 @Table(name = "settle_mobile_pay_inp_notice")
 public class MobilePayInpNotice extends AbstractUUIDEntity {
-    //清分日期
-    @Column(name = "clear_date")
-    private String clearDate;
+
+    //清分月份
+    @Column(name = "CLEAR_MONTH")
+    private String clearMonth;
+    //UP上半月、DOWN下半月
+    @Column(name = "clear_type")
+    private String clearType;
+
+    //清分开始日期
+    @Column(name = "START_CLEAR_DATE")
+    private String startClearDate;
+    // 清分截止日期
+    @Column(name = "END_CLEAR_DATE")
+    private String endClearDate;
 
     //交易数量
-    @Column(name = "count")
+    @Column(name = "COUNT")
     private Long count;
 
     //交易金额
-    @Column(name = "amount")
+    @Column(name = "AMOUNT")
     private Long amount;
 
     //银行收款交易数量
-    @Column(name = "cash_count")
+    @Column(name = "CASH_COUNT")
     private Long cashCount;
 
     //银行收款交易金额
-    @Column(name = "cash_amount")
+    @Column(name = "CASH_AMOUNT")
     private Long cashAmount;
 
     //付款单是否生成
-    @Column(name = "pay_bill")
+    @Column(name = "PAY_BILL")
     private boolean payBill = false;
 
     //付款单生成时间
-    @Column(name = "pay_bill_time")
+    @Column(name = "PAY_BILL_TIME")
     private LocalDateTime payBillTime;
 
     //付款单文件路径
-    @Column(name = "pay_bill_url")
+    @Column(name = "PAY_BILL_URL")
     private String payBillUrl;
 
+    //是否生成文件
+    @Column(name = "DATA_FILE")
+    private boolean dataFile = false;
+    //文件生成时间
+    @Column(name = "DATA_FILE_TIME")
+    private LocalDateTime dataFileTime;
+    //文件路径
+    @Column(name = "DATA_FILE_URL")
+    private String dataFileUrl;
+
 
     public MobilePayInpNotice savePayBill(String url){
         this.setPayBill(true);
         this.setPayBillUrl(url);
         this.setPayBillTime(LocalDateTime.now());
-//        this.setPayBillId(payBillId);
+        return this;
+    }
+
+    public MobilePayInpNotice saveDataFile(String url){
+        this.setDataFile(true);
+        this.setDataFileUrl(url);
+        this.setDataFileTime(LocalDateTime.now());
         return this;
     }
 }

gly-base-core/src/main/java/cn/com/taiji/core/entity/settle/mobilepay/MobilePayOutNotice.java

@@ -44,6 +44,24 @@ public class MobilePayOutNotice extends AbstractUUIDEntity {
     @Column(name = "pay_bill_url")
     private String payBillUrl;
 
+    //是否生成文件
+    @Column(name = "data_file")
+    private boolean dataFile = false;
+    //文件生成时间
+    @Column(name = "data_file_time")
+    private LocalDateTime dataFileTime;
+    //文件路径
+    @Column(name = "data_file_url")
+    private String dataFileUrl;
+
+    public MobilePayOutNotice saveDataFile(String url){
+        this.setDataFile(true);
+        this.setDataFileUrl(url);
+        this.setDataFileTime(LocalDateTime.now());
+        return this;
+    }
+
+
     public MobilePayOutNotice savePayBill(String url){
         this.setPayBill(true);
         this.setPayBillUrl(url);

gly-base-core/src/main/java/cn/com/taiji/core/entity/settle/report/EtcTollConfirmZfb.java

@@ -54,7 +54,7 @@ public class EtcTollConfirmZfb extends AbstractUUIDEntity {
     @Column(name = "initial_num")
     private Long initialNum;//期初数
     @Column(name = "validate_num")
-    private Long validateNum;//校验
+    private String validateNum;//校验
     @Column(name = "update_time")
     private LocalDateTime updateTime;//更新时间
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/settle/mobilepay/MobilePayInpNoticeRepo.java

@@ -2,6 +2,7 @@ package cn.com.taiji.core.repo.jpa.settle.mobilepay;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.settle.mobilepay.MobilePayInpNotice;
+import cn.com.taiji.core.entity.settle.notice.InpTransNotice;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
@@ -13,10 +14,8 @@ import java.util.List;
  */
 public interface MobilePayInpNoticeRepo extends AbstractJpaRepo<MobilePayInpNotice, String> {
 
-    MobilePayInpNotice findByClearDate(String clearDate);
+    // 省内清分方式  上半月: 1-15 日   下半月: 16-月底
+    @Query(" from MobilePayInpNotice where clearType = ?1 and clearMonth = ?2")
+    MobilePayInpNotice findBy(String clearType, String clearMonth);
 
-    @Query("from MobilePayInpNotice where clearDate between ?1 and ?2")
-    List<MobilePayInpNotice> listByBetweenClearDate(String startClearDate, String endClearDate);
-
-//    List<MobilePayInpNotice> findByPayBillId(String payBillId);
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/settle/mobilepay/MobilePayOutNoticeRepo.java

@@ -2,6 +2,10 @@ package cn.com.taiji.core.repo.jpa.settle.mobilepay;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.settle.mobilepay.MobilePayOutNotice;
+import cn.com.taiji.core.entity.settle.notice.OutTransNotice;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 /**
  * @author nieqiongqiong
@@ -12,4 +16,7 @@ public interface MobilePayOutNoticeRepo extends AbstractJpaRepo<MobilePayOutNoti
 
     MobilePayOutNotice findByClearDate(String clearDate);
 
+    @Query(" from MobilePayOutNotice where clearDate >= ?1 and clearDate <= ?2 order by clearDate asc")
+    List<MobilePayOutNotice> listBy(String startClearDate, String endClearDate);
+
 }