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-08-31 11:44:43 +08:00
parent 6750c35ebd
commit 9fa65e15a1
1 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1388,21 +1388,19 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde
} }
stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "") stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
store := stores[0] store := stores[0]
order := &model.GoodsOrder{ order := orders[0]
StoreID: storeID, order.ID = 0
StoreName: store.Name, order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000) + utils.Int2Str(99)
VendorStoreID: storeMaps[0].VendorStoreID, order.VendorOrderID2 = strings.Join(orderIDs, ",")
VendorOrderID: utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000) + utils.Int2Str(99), order.Status = model.OrderStatusNew
VendorOrderID2: strings.Join(orderIDs, ","),
Status: model.OrderStatusNew,
}
setJdsOrderSeq(order) setJdsOrderSeq(order)
if order.BusinessType == model.BusinessTypeImmediate {
var ( var (
opentime1 = jxutils.JxOperationTime2TimeByDate(store.OpenTime1, time.Now()) opentime1 = jxutils.JxOperationTime2TimeByDate(store.OpenTime1, order.CreatedAt)
opentime2 = jxutils.JxOperationTime2TimeByDate(store.OpenTime2, time.Now()) opentime2 = jxutils.JxOperationTime2TimeByDate(store.OpenTime2, order.CreatedAt)
closetime1 = jxutils.JxOperationTime2TimeByDate(store.CloseTime1, time.Now()) closetime1 = jxutils.JxOperationTime2TimeByDate(store.CloseTime1, order.CreatedAt)
closetime2 = jxutils.JxOperationTime2TimeByDate(store.CloseTime2, time.Now()) closetime2 = jxutils.JxOperationTime2TimeByDate(store.CloseTime2, order.CreatedAt)
orderCreatedAt = time.Now() orderCreatedAt = order.CreatedAt
) )
if store.OpenTime1 == 0 || store.CloseTime1 == 0 { if store.OpenTime1 == 0 || store.CloseTime1 == 0 {
return "", fmt.Errorf("该门店没有营业时间，不能接单！门店：[%v]", storeID) return "", fmt.Errorf("该门店没有营业时间，不能接单！门店：[%v]", storeID)
@@ -1430,9 +1428,7 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde
} }
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
} }
} else { }
order.BusinessType = model.BusinessTypeImmediate
order.ExpectedDeliveredTime = time.Now().Add(time.Hour)
} }
//结算类型 //结算类型
if store.PayPercentage < 50 { if store.PayPercentage < 50 {