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-04-28 10:29:41 +08:00
parent 69948b966c
commit 82ea38d86b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/purchase/jx/localjx/order.go
View File

@@ -204,6 +204,10 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
return countInfo, err return countInfo, err
} }
//fromStoreID 为0 表示非物料订单（京西商城订单等）
//fromStoreID 为 门店ID ，表示是物料订单，fromStoreID表示是哪个门店申请的物料
//fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的
//fromStoreID 在后面 generateOrder中有用
func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool) (outJxOrder *JxOrderInfo, err error) { func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool) (outJxOrder *JxOrderInfo, err error) {
outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf) outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf)
if err != nil { if err != nil {
@@ -1530,6 +1534,8 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
} }
} }
for _, v := range outOrders { for _, v := range outOrders {
fmt.Println("v", utils.Format4Output(v, false))
fmt.Println("freightPrice", freightPrice)
if v.Weight <= 3000 { if v.Weight <= 3000 {
freightPrice += 500 freightPrice += 500
} else if v.Weight > 3000 && v.Weight <= splitMatterOrderMinWeight { } else if v.Weight > 3000 && v.Weight <= splitMatterOrderMinWeight {