rabbitmq 修改 提交

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo.mongo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
@@ -39,6 +40,7 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
     private String checkedAt;
     private String checkUserId;
 
+    private LocalDateTime changeDate;
 
     private static final KylinOrderTicketEntitiesVo obj = new KylinOrderTicketEntitiesVo();
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
@@ -98,6 +99,13 @@ public class KylinOrderTicketVo implements Serializable {
     private String createdAt;
     private String updatedAt;
 
+    private LocalDateTime changeDate;
+
+    private Integer isTrueName;
+    private String noticeImage;
+    private Integer ticketType;
+    private String fieldName;
+
     private List<KylinOrderTicketEntitiesVo> entitiesVoList;
 
     public void setOrderTicket(KylinOrderTickets orderTicket) {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -11,7 +11,6 @@ import java.util.List;
 @Data
 public class OrderDetailsVo {
     private KylinOrderTicketVo orderTicketVo;
-    private List<KylinOrderTicketEntitiesVo> orderTicketEntitiesVo;
     private KylinPerformanceVo performanceVo;
     private String express_number;
     private String express_company;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java

@@ -36,6 +36,7 @@ public abstract class DateUtil {
         yyyyMMddHHmm("yyyy-MM-dd HH:mm"),
         yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"),
         yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
+        yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"),
         ddHHmmssTrim("ddHHmmss"),
         yyyy_MM_dd_zh("yyyy年MM月dd日"),
         MM_dd_zh("MM月dd日"),

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

@@ -129,9 +129,9 @@ public class KylinOrderTicketEntities implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject() {
+    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                isPayment, updatedAt, orderId
+                isPayment, updatedAt, orderId,updateTime,createTime
         };
     }
 }

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

@@ -87,9 +87,9 @@ public class KylinOrderTicketStatus implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject() {
+    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                status, payStatus, updatedAt, orderId
+                status, payStatus, updatedAt, orderId,updateTime,createTime
         };
     }
 
@@ -98,9 +98,9 @@ public class KylinOrderTicketStatus implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject() {
+    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                status, updatedAt, orderId
+                status, updatedAt, orderId,updateTime,createTime
         };
     }
 }

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

@@ -212,9 +212,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getPayAgainObject() {
+    public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                orderType, updatedAt, orderCode, orderTicketsId
+                orderType, updatedAt, orderCode, orderTicketsId,updateTime,createTime
         };
     }
 
@@ -223,9 +223,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject() {
+    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId
+                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
         };
     }
 
@@ -234,9 +234,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject() {
+    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                updatedAt, orderTicketsId
+                updatedAt, orderTicketsId,updateTime,createTime
         };
     }
 }

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -100,7 +100,12 @@ public class ConsumerProcessor {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -121,7 +126,12 @@ public class ConsumerProcessor {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -142,7 +152,12 @@ public class ConsumerProcessor {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -163,7 +178,12 @@ public class ConsumerProcessor {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -184,7 +204,12 @@ public class ConsumerProcessor {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 }

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

@@ -10,14 +10,22 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 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 order_type = ? ,order_code = ? , updated_at = ?  WHERE order_tickets_id = ?
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_type = ? ,order_code = ? , updated_at = ?  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.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ?
-kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? 
-kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? 
+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 = ?)
+kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at = ? or created_at = ?)
+
+
 
 # ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE  kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? 
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? 
+kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+