diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 5a6655bf9..484faa8e1 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -204,6 +204,10 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta 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) { outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf) if err != nil { @@ -1530,6 +1534,8 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei } } for _, v := range outOrders { + fmt.Println("v", utils.Format4Output(v, false)) + fmt.Println("freightPrice", freightPrice) if v.Weight <= 3000 { freightPrice += 500 } else if v.Weight > 3000 && v.Weight <= splitMatterOrderMinWeight {