|
@@ -163,16 +163,16 @@ func handleZhiosOrderHjy(msg []byte) error { |
|
|
sess.Commit() |
|
|
sess.Commit() |
|
|
return nil |
|
|
return nil |
|
|
} |
|
|
} |
|
|
if ordData.State == 1 || ordData.State == 3 { |
|
|
|
|
|
if int64(ordData.ConfirmAt) >= utils.TimeStdParseUnix("2023-11-01 00:00:00") { |
|
|
|
|
|
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 { |
|
|
|
|
|
// if int64(ordData.ConfirmAt) >= utils.TimeStdParseUnix("2023-11-01 00:00:00") { |
|
|
|
|
|
// isSettle, settleTime := GetHjyOrderCommission(eg, canalMsg.Mid, utils.IntToStr(ordData.HjyOid)) |
|
|
|
|
|
// if isSettle == "1" { |
|
|
|
|
|
// ordData.State = 5 |
|
|
|
|
|
// ordData.SettleAt = int(utils.TimeStdParseUnix(settleTime)) |
|
|
|
|
|
// } |
|
|
|
|
|
// } |
|
|
|
|
|
// |
|
|
|
|
|
//} |
|
|
if int64(ordData.ConfirmAt) < utils.TimeStdParseUnix("2023-11-01 00:00:00") { |
|
|
if int64(ordData.ConfirmAt) < utils.TimeStdParseUnix("2023-11-01 00:00:00") { |
|
|
ordData.State = 5 |
|
|
ordData.State = 5 |
|
|
ordData.SettleAt = ordData.ConfirmAt |
|
|
ordData.SettleAt = ordData.ConfirmAt |
|
|