diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index b50969a62..0b81e106b 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -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 }