From badacc25e1892b2fb23df3ae162b46d64a479696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Apr 2023 16:41:06 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order_afs.go | 12 +++++------- business/partner/purchase/jx/phpjx/order_afs.go | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index e9f5d8777..3766797ed 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -72,14 +72,12 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode } }() - if orderStatus.VendorID != model.VendorIDJX { - isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) - if err != nil || isDuplicated { - if err == nil { - dao.Commit(db, txDB) - } - return err + isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) + if err != nil || isDuplicated { + if err == nil { + dao.Commit(db, txDB) } + return err } var existAfsOrder *model.AfsOrder diff --git a/business/partner/purchase/jx/phpjx/order_afs.go b/business/partner/purchase/jx/phpjx/order_afs.go index 2e2fbd109..420d0ed1e 100644 --- a/business/partner/purchase/jx/phpjx/order_afs.go +++ b/business/partner/purchase/jx/phpjx/order_afs.go @@ -58,6 +58,7 @@ func buildAfsOrder(msg *CallbackMsg) (outAfsOrder *model.AfsOrder, err error) { VendorAppealType: afsOrder.VendorAppealType, AppealType: int8(utils.Str2Int64WithDefault(afsOrder.VendorAppealType, 0)), Flag: model.OrderFlagMaskTempJX, + RefundType: model.AfsTypeFullRefund, } outAfsOrder.Status = int(utils.Str2Int64WithDefault(afsOrder.VendorStatus, 0))