liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

京西京东商城测试

Browse Source
This commit is contained in:
苏尹岚
2020-09-04 10:06:09 +08:00
parent f32c7be967
commit baa7d3acfa
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxcallback/orderman/order_afs.go
View File

@@ -262,7 +262,13 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af
} }
} }
if len(vendorSkuIDs) > 0 { if len(vendorSkuIDs) > 0 {
l, err := dao.GetStoreSkuPriceAndWeight(db, order.VendorStoreID, order.VendorID, vendorSkuIDs) var vendorStoreID string
if order.VendorID == model.VendorIDJDShop {
vendorStoreID = model.JdShopMainVendorStoreID
} else {
vendorStoreID = order.VendorStoreID
}
l, err := dao.GetStoreSkuPriceAndWeight(db, vendorStoreID, order.VendorID, vendorSkuIDs)
if err != nil { if err != nil {
globals.SugarLogger.Warnf("updateAfsOrderSkuOtherInfo orderID:%s failed with err:%v", order.VendorOrderID, err) globals.SugarLogger.Warnf("updateAfsOrderSkuOtherInfo orderID:%s failed with err:%v", order.VendorOrderID, err)
return err return err

12
business/partner/purchase/jdshop/order_afs.go
View File

@@ -6,8 +6,6 @@ import (
"math" "math"
"time" "time"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
@@ -62,11 +60,11 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
} }
orderStatus := buildOrderStatus(ctx, order, reason) orderStatus := buildOrderStatus(ctx, order, reason)
afsOrder := &model.AfsOrder{ afsOrder := &model.AfsOrder{
VendorID: order.VendorID, VendorID: order.VendorID,
AfsOrderID: orderStatus.VendorOrderID, AfsOrderID: orderStatus.VendorOrderID,
VendorOrderID: orderStatus.RefVendorOrderID, VendorOrderID: orderStatus.RefVendorOrderID,
VendorStoreID: order.VendorStoreID, // VendorStoreID: order.VendorStoreID,
StoreID: jxutils.GetSaleStoreIDFromOrder(order), // StoreID: jxutils.GetSaleStoreIDFromOrder(order),
AfsCreatedAt: time.Now(), AfsCreatedAt: time.Now(),
VendorAppealType: "", VendorAppealType: "",
AppealType: model.AfsAppealTypeRefund, AppealType: model.AfsAppealTypeRefund,