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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-06 11:59:48 +08:00
parent d302095877
commit c4bd9f6c76
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
business/jxcallback/orderman/order.go
View File

@@ -11,7 +11,6 @@ import (
"git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/jdeclpapi" "git.rosy.net.cn/baseapi/platformapi/jdeclpapi"
"git.rosy.net.cn/jx-callback/business/jxstore/common"
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
@@ -1882,7 +1881,7 @@ func SaveJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd ti
func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (orders []*model.GoodsOrder, err error) { func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (orders []*model.GoodsOrder, err error) {
for _, jdsOrder := range result.OrderList { for _, jdsOrder := range result.OrderList {
//等待付款的排除 //等待付款的排除
if jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusWaittingExport && jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusPause { if jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusWaittingExport && jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusPause && jdsOrder.OrderStatus != 51 {
continue continue
} }
//有可能是库里已经有这个订单了 //有可能是库里已经有这个订单了
@@ -1935,17 +1934,17 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
order.ConsigneeLng = jxutils.StandardCoordinate2Int(lng) order.ConsigneeLng = jxutils.StandardCoordinate2Int(lng)
order.ConsigneeLat = jxutils.StandardCoordinate2Int(lat) order.ConsigneeLat = jxutils.StandardCoordinate2Int(lat)
} }
storeList, err := common.GetStoreListByLocation(ctx, jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), 5000, false, true, 0) // storeList, err := common.GetStoreListByLocation(ctx, jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), 5000, false, true, 0)
if err != nil { // if err != nil {
globals.SugarLogger.Debugf("jds GetStoreListByLocation error: %v", err.Error()) // globals.SugarLogger.Debugf("jds GetStoreListByLocation error: %v", err.Error())
continue // continue
} // }
order.StoreID = storeList[0].ID // order.StoreID = storeList[0].ID
order.StoreName = storeList[0].Name // order.StoreName = storeList[0].Name
storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") // storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
if len(storeMaps) > 0 { // if len(storeMaps) > 0 {
order.VendorStoreID = storeMaps[0].VendorStoreID // order.VendorStoreID = storeMaps[0].VendorStoreID
} // }
//如果是暂停，表示是预订单 //如果是暂停，表示是预订单
if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusPause { if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusPause {
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
@@ -1960,14 +1959,14 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
// } // }
//结算类型 //结算类型
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop, "") // storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop, "")
if storeDetail != nil { // if storeDetail != nil {
if storeDetail.PayPercentage < 50 { // if storeDetail.PayPercentage < 50 {
order.EarningType = model.EarningTypePoints // order.EarningType = model.EarningTypePoints
} else { // } else {
order.EarningType = model.EarningTypeQuote // order.EarningType = model.EarningTypeQuote
} // }
} // }
setJdsOrderSeq(order) setJdsOrderSeq(order)
for _, v := range jdsOrder.OrderItems { for _, v := range jdsOrder.OrderItems {
sku := &model.OrderSku{ sku := &model.OrderSku{