diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 8f5f34930..7c2d02618 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -392,7 +392,6 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao } _, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID") if created { - globals.SugarLogger.Debugf("==========order.Skus======== : %s", utils.Format4Output(order.Skus, false)) if err = dao.CreateMultiEntities(db, order.Skus); err != nil { baseapi.SugarLogger.Warnf("saveOrder orderID:%s, save order_sku failed with error:%v", order.VendorOrderID, err) } diff --git a/business/model/const.go b/business/model/const.go index 96609bfad..2df65c8fc 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -387,8 +387,8 @@ const ( ) const ( - BusinessTypeImmediate = 1 // 立即达 - BusinessTypeDingshida = 2 // 定时达 + BusinessTypeImmediate = 1 // 定时单 + BusinessTypeDingshida = 2 // 预订单 ) const ( diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 76d07ea61..b4612520b 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -191,6 +191,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { if riderInfo.OrderId == "" { riderInfo.OrderId = v.VendorOrderID + riderInfo.LogisticsProviderCode = "10017" } if riderInfo.ThirdCarrierOrderId == "" { diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index e9bdd8173..67c80201d 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -171,10 +171,10 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve // 期望送达时间两小时内为立即达 earliestTime := utils.Str2Time(strings.Split(*orderDetail.ReceiveInfo.ExpectArriveTime, "~")[0]).Unix() if earliestTime-time.Now().Unix() > 2*60*60 { - order.BusinessType = model.BusinessTypeImmediate + order.BusinessType = model.BusinessTypeDingshida order.ExpectedDeliveredTime = getTimeFromTimestamp(earliestTime + 30*60) // 预计最晚送达时间 } else { // 定时达 - order.BusinessType = model.BusinessTypeDingshida + order.BusinessType = model.BusinessTypeImmediate order.ExpectedDeliveredTime = getTimeFromTimestamp(earliestTime + 30*60) // 预计最晚送达时间 } @@ -206,7 +206,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve order.OrderSeq = orderSeq + 1 // 包装袋金额 - store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) + store, _ := dao.GetStoreDetail2(dao.GetDB(), 0, order.VendorStoreID, model.VendorIDTaoVegetable) if store != nil { order.PackagePrice = int(*orderDetail.PackageFee) + store.PackageSetting } else {