aa
This commit is contained in:
@@ -1963,7 +1963,6 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
|
|||||||
ActualPayPrice: orderDetail.ActualPayPrice,
|
ActualPayPrice: orderDetail.ActualPayPrice,
|
||||||
Status: model.OrderStatusNew,
|
Status: model.OrderStatusNew,
|
||||||
TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)),
|
TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)),
|
||||||
DeliveryFlag: model.OrderDeliveryFlagMaskScheduleDisabled,
|
|
||||||
DeliveryType: model.OrderDeliveryTypeStoreSelf,
|
DeliveryType: model.OrderDeliveryTypeStoreSelf,
|
||||||
StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
|
StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
|
||||||
OrderSeq: 0,
|
OrderSeq: 0,
|
||||||
@@ -2019,6 +2018,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
|
|||||||
order.StoreID = store.ID
|
order.StoreID = store.ID
|
||||||
order.JxStoreID = store.ID
|
order.JxStoreID = store.ID
|
||||||
order.StoreName = store.Name
|
order.StoreName = store.Name
|
||||||
|
order.VendorStoreID = utils.Int64ToStr(jdsOrder.MdbStoreID)
|
||||||
globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID)
|
globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID)
|
||||||
//结算类型
|
//结算类型
|
||||||
if store.PayPercentage < 50 {
|
if store.PayPercentage < 50 {
|
||||||
|
|||||||
Reference in New Issue
Block a user