Merge remote-tracking branch 'origin/master'

consume/zhios_order_hjy.go

@@ -32,7 +32,7 @@ func ZhiosOrderHjy(queue md.MqQueue) {
 	//1、将自己绑定到交换机上
 	ch.Bind(queue.Name, queue.ExchangeName, queue.RoutKey)
 	//2、取出数据进行消费
-	ch.Qos(1000)
+	ch.Qos(500)
 	delivery := ch.Consume(queue.Name, false)
 
 	var res amqp.Delivery
@@ -173,6 +173,12 @@ func handleZhiosOrderHjy(msg []byte) error {
 	//	}
 	//
 	//}
+	var ordRelate = make([]model.OrdListRelate, 0)
+	sess.Where("oid=?", canalMsg.Oid).Find(&ordRelate)
+	if len(ordRelate) > 0 {
+		sess.Commit()
+		return nil
+	}
 	if ordData.State != 4 && int64(ordData.ConfirmAt) > 0 && int64(ordData.ConfirmAt) < utils.TimeStdParseUnix("2023-11-01 00:00:00") {
 		ordData.State = 5
 		ordData.SettleAt = ordData.ConfirmAt