Merge remote-tracking branch 'origin/dev_stone' into dev_stone

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class KylinOrderTickets implements Serializable ,Cloneable {
+public class KylinOrderTickets implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -228,7 +228,7 @@ public class KylinOrderTickets implements Serializable ,Cloneable {
                 orderTicketsId, userId, userName, userMobile, performanceTitle, orderCode, qrCode, orderType, orderVersion,
                 number, price, priceMember, priceTotal, priceVoucher, priceActual, priceExpress, priceRefund, refundNumber,
                 payType, paymentType, timePay, expressContacts, expressAddress, expressPhone, couponType, getTicketType,
-                getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt,payCode
+                getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt, payCode
         };
     }
 
@@ -237,9 +237,9 @@ public class KylinOrderTickets implements Serializable ,Cloneable {
      *
      * @return
      */
-    public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getPayAgainObject(LocalDateTime updateTime, LocalDateTime createTime) {
         return new Object[]{
-                 updatedAt, payCode, orderTicketsId,updateTime,createTime
+                updatedAt, payCode, payType, orderTicketsId, updateTime, createTime
         };
     }
 
@@ -248,9 +248,9 @@ public class KylinOrderTickets implements Serializable ,Cloneable {
      *
      * @return
      */
-    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getSynOrderObject(LocalDateTime updateTime, LocalDateTime createTime) {
         return new Object[]{
-                paymentId,paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
+                paymentId, paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId, updateTime, createTime
         };
     }
 
@@ -266,6 +266,7 @@ public class KylinOrderTickets implements Serializable ,Cloneable {
     }
 
     private static final KylinOrderTickets obj = new KylinOrderTickets();
+
     public static KylinOrderTickets getNew() {
         try {
             return (KylinOrderTickets) obj.clone();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -9,12 +9,6 @@ kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_t
 kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
-# ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-
 
 
 # ------------------------支付回调----------------------------

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -12,7 +12,7 @@ kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ti
 kylin_order_coupon.add=INSERT INTO kylin_order_coupons(order_id ,coupon_code ,coupon_type ,coupon_price,created_at,updated_at)VALUES(?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?, pay_type = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -9,13 +9,6 @@ kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_t
 kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
-# ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-
-
 
 # ------------------------支付回调----------------------------
 kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)