diff --git a/consume/init.go b/consume/init.go index ad6a2c1..51d741f 100644 --- a/consume/init.go +++ b/consume/init.go @@ -19,7 +19,7 @@ func Init() { func initConsumes() { jobs[consumeMd.ZhiosOrderSettleTotalFunName] = ZhiosSettleTotal - //jobs[consumeMd.ZhiosOrderHjyFunName] = ZhiosOrderHjy + jobs[consumeMd.ZhiosOrderHjyFunName] = ZhiosOrderHjy jobs[consumeMd.ZhiosOrderBuckleFunName] = ZhiosOrderBuckle // jobs[consumeMd.ZhiosSupplierAfterOrderFunName] = ZhiosSupplierAfterOrder diff --git a/consume/zhios_order_hjy.go b/consume/zhios_order_hjy.go index 01d5941..8f9813e 100644 --- a/consume/zhios_order_hjy.go +++ b/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(100) + ch.Qos(1000) delivery := ch.Consume(queue.Name, false) var res amqp.Delivery @@ -159,14 +159,16 @@ func handleZhiosOrderHjy(msg []byte) error { return nil } - if ordData.State != 1 && ordData.State != 3 { + if ordData.State == 5 { sess.Commit() return nil } - isSettle, settleTime := GetHjyOrderCommission(eg, canalMsg.Mid, utils.IntToStr(ordData.HjyOid)) - if isSettle == "1" { - ordData.State = 5 - ordData.SettleAt = int(utils.TimeStdParseUnix(settleTime)) + if ordData.State == 1 || ordData.State == 3 { + isSettle, settleTime := GetHjyOrderCommission(eg, canalMsg.Mid, utils.IntToStr(ordData.HjyOid)) + if isSettle == "1" { + ordData.State = 5 + ordData.SettleAt = int(utils.TimeStdParseUnix(settleTime)) + } } fmt.Println(ordData) //加入分佣关系链