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-19 16:20:31 +08:00
parent ad4e2712f5
commit 97ed9080df
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -770,7 +770,8 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
outJxOrder.FreightPrice = 0
}
//表示此订单为物料配送订单
if fromStoreID != 0 {
if jxOrder.OrderType != model.OrderTypeNormal {
// if fromStoreID != 0 {
storeDetail2, err2 := dao.GetStoreDetail(db, fromStoreID, model.VendorIDJX)
if err = err2; err != nil {
return nil, nil, fmt.Errorf("fromStoreID有误,[%v]", fromStoreID)
@@ -803,6 +804,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
outJxOrder.FreightPrice = 0
}
}
fmt.Println("test11111111111111111111111111111111111111", IsDeliverySelf)
if IsDeliverySelf {
outJxOrder.FreightPrice = 0
}
@@ -814,6 +816,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
outJxOrder = nil
deliveryAddress = nil
}
fmt.Println("test222222222222222222222222222222222222", utils.Format4Output(outJxOrder, false))
return outJxOrder, deliveryAddress, err
}