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-15 09:42:46 +08:00
parent 2757e20771
commit c7557fec8b
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
business/partner/purchase/jdshop/callback.go
View File

@@ -67,11 +67,11 @@ func SaveJdsOrders(msg *jdshopapi.CallBackResult) (err error) {
if err != nil || order == nil {
return err
}
order.StoreID = 102919
order.JxStoreID = 102919
order.StoreName = "商城模板(成都发货)"
order.VendorStoreID = model.JdShopMainVendorStoreID
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
// order.StoreID = 102919
// order.JxStoreID = 102919
// order.StoreName = "商城模板(成都发货)"
// order.VendorStoreID = model.JdShopMainVendorStoreID
// order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
noticeMsg := fmt.Sprintf("京东商城新订单，订单号：[%v] ,将要发到的门店id：[%v] , 门店名：[%v]", order.VendorOrderID, order.StoreID, order.StoreName)
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "京东商城来新订单了！", noticeMsg)
@@ -142,31 +142,35 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
return order, err
}
if len(storeList) > 0 {
// for _, store := range storeList {
// order.StoreID = store.ID
// order.JxStoreID = store.ID
// order.StoreName = store.Name
// globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID)
// //结算类型
// storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop)
// if storeDetail != nil {
// if storeDetail.PayPercentage < 50 {
// order.EarningType = model.EarningTypePoints
// } else {
// order.EarningType = model.EarningTypeQuote
// }
// }
// if order.EarningType == model.EarningTypeQuote {
// var shopPriceSum int
// storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, skuIDs)
// for _, storeSku := range storeSkuList {
// shopPriceSum += storeSku.Price
// }
// if shopPriceSum+700 > int(order.TotalShopMoney) {
// }
// }
// }
for _, store := range storeList {
order.StoreID = store.ID
order.JxStoreID = store.ID
order.StoreName = store.Name
globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID)
//结算类型
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop)
if storeDetail != nil {
if storeDetail.PayPercentage < 50 {
order.EarningType = model.EarningTypePoints
} else {
order.EarningType = model.EarningTypeQuote
}
}
if order.EarningType == model.EarningTypeQuote {
var shopPriceSum int
storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, skuIDs)
for _, storeSku := range storeSkuList {
shopPriceSum += storeSku.Price
}
if shopPriceSum+700 > int(order.TotalShopMoney) {
order.StoreID = 102919
order.JxStoreID = 102919
order.StoreName = "商城模板(成都发货)"
order.VendorStoreID = model.JdShopMainVendorStoreID
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
}
}
}
} else {
order.StoreID = 102919
order.JxStoreID = 102919