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-08-22 11:22:09 +08:00
parent 6524349ab4
commit 201fb04e2f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,8 +433,12 @@ func UpdateFakeWayBillToTiktok() {
randNumber, _ := rand.Int(rand.Reader, big.NewInt(640)) randNumber, _ := rand.Int(rand.Reader, big.NewInt(640))
randTime := randNumber.Int64() randTime := randNumber.Int64()
if randTime < 66 { if randTime < 300 {
randTime += 60 randTime += 300
}
// 推送完成时加多加十分钟,相当于是配送中状态多存货十分钟
if fakeWayBill[i].Status == model.WaybillStatusDelivered {
randTime += 480
} }
fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local() fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local()
fakeWayBill[i].WaybillFinishedAt = time.Now() fakeWayBill[i].WaybillFinishedAt = time.Now()

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

@@ -554,10 +554,13 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
if err != nil { if err != nil {
return err return err
} }
if err = api.DeliveryFinish(param); err == nil { err = api.DeliveryFinish(param)
if err == nil {
paramDelivery := OrderStatusChangeDelivery(order, tao_vegetable.OrderStatusDelivery) paramDelivery := OrderStatusChangeDelivery(order, tao_vegetable.OrderStatusDelivery)
// 开始配送 // 开始配送
return api.DeliveryFinish(paramDelivery) return api.DeliveryFinish(paramDelivery)
} else if strings.Contains(err.Error(), "当前状态不允许更新, 请求更新状态") { // "当前状态不允许更新, 请求更新状态: PACKAGED, 当前状态：SHIPPING" 这个时候代表上一次状态以及更新成了,返回错误消息不在处理
return nil
} }
return err return err