liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-14 17:07:59 +08:00
parent 3521286562
commit a73ecfb86c
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/order.go
View File

@@ -392,7 +392,6 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
} }
_, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID") _, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID")
if created { if created {
globals.SugarLogger.Debugf("==========order.Skus======== : %s", utils.Format4Output(order.Skus, false))
if err = dao.CreateMultiEntities(db, order.Skus); err != nil { 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) baseapi.SugarLogger.Warnf("saveOrder orderID:%s, save order_sku failed with error:%v", order.VendorOrderID, err)
} }

4
business/model/const.go
View File

@@ -387,8 +387,8 @@ const (
) )
const ( const (
BusinessTypeImmediate = 1 // 立即达 BusinessTypeImmediate = 1 // 定时单
BusinessTypeDingshida = 2 // 定时达 BusinessTypeDingshida = 2 // 预订单
) )
const ( const (

1
business/partner/delivery/rider.go
View File

@@ -191,6 +191,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
if riderInfo.OrderId == "" { if riderInfo.OrderId == "" {
riderInfo.OrderId = v.VendorOrderID riderInfo.OrderId = v.VendorOrderID
riderInfo.LogisticsProviderCode = "10017"
} }
if riderInfo.ThirdCarrierOrderId == "" { if riderInfo.ThirdCarrierOrderId == "" {

6
business/partner/purchase/tao_vegetable/order.go
View File

@@ -171,10 +171,10 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
// 期望送达时间两小时内为立即达 // 期望送达时间两小时内为立即达
earliestTime := utils.Str2Time(strings.Split(*orderDetail.ReceiveInfo.ExpectArriveTime, "~")[0]).Unix() earliestTime := utils.Str2Time(strings.Split(*orderDetail.ReceiveInfo.ExpectArriveTime, "~")[0]).Unix()
if earliestTime-time.Now().Unix() > 2*60*60 { if earliestTime-time.Now().Unix() > 2*60*60 {
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeDingshida
order.ExpectedDeliveredTime = getTimeFromTimestamp(earliestTime + 30*60) // 预计最晚送达时间 order.ExpectedDeliveredTime = getTimeFromTimestamp(earliestTime + 30*60) // 预计最晚送达时间
} else { // 定时达 } else { // 定时达
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeImmediate
order.ExpectedDeliveredTime = getTimeFromTimestamp(earliestTime + 30*60) // 预计最晚送达时间 order.ExpectedDeliveredTime = getTimeFromTimestamp(earliestTime + 30*60) // 预计最晚送达时间
} }
@@ -206,7 +206,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
order.OrderSeq = orderSeq + 1 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 { if store != nil {
order.PackagePrice = int(*orderDetail.PackageFee) + store.PackageSetting order.PackagePrice = int(*orderDetail.PackageFee) + store.PackageSetting
} else { } else {