1

business/partner/delivery/rider.go

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

business/partner/purchase/tao_vegetable/order.go

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