1

2023-02-01 16:32:45 +08:00
parent 359cee1264
commit 5b66565cb2
3 changed files with 101 additions and 94 deletions
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -69,51 +69,51 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 				}
 				err = scheduler.ErrCanNotFindOrder
 			}
-			globals.SugarLogger.Debugf("SelfDeliveringAndUpdateStatus=============err %v", err)
+			vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName())
+			remark := ""
+			if err != nil {
+				vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName())
+				remark = err.Error()
+				partner.CurOrderManager.OnOrderMsg(order, vendorStatus, remark)
+				return err
+			}
+
+			// 上面是真的转自送,支持美团,饿百,京东,如果时抖店,抖店暂时全部是自送的!但是有骑手信息时,就是一个白嫖单子!
+			if order.VendorID == model.VendorIDDD && courierName != "" && courierMobile != "" {
+				timeNow := time.Now()
+				rand.Seed(timeNow.UnixNano())
+				randNumber := rand.Int63n(640)
+				if randNumber < 60 {
+					randNumber += 60
+				}
+				randTime := time.Duration(randNumber) * time.Second
+				bill := &model.Waybill{
+					VendorWaybillID:   order.VendorOrderID,
+					VendorWaybillID2:  "",
+					WaybillVendorID:   model.VendorJXFakeWL,
+					VendorOrderID:     order.VendorOrderID,
+					OrderVendorID:     model.VendorIDDD,
+					CourierName:       courierName,
+					CourierMobile:     courierMobile,
+					Status:            model.OrderStatusNew,
+					VendorStatus:      utils.Int2Str(model.OrderStatusNew),
+					ActualFee:         500,
+					DesiredFee:        order.ActualPayPrice,
+					TipFee:            0,
+					DuplicatedCount:   0,
+					DeliveryFlag:      0,
+					WaybillCreatedAt:  timeNow,
+					WaybillFinishedAt: utils.DefaultTimeValue,
+					StatusTime:        timeNow.Add(randTime), // 下一状态时间
+					OriginalData:      "",
+					Remark:            "自定义物流单",
+					VendorOrgCode:     order.VendorOrgCode,
+				}
+				err = dao.CreateEntity(dao.GetDB(), bill)
+			}
 			return err
 		}()
-		globals.SugarLogger.Debugf("SelfDeliveringAndUpdateStatus2=============err %v", err)
 	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
-	vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName())
-	remark := ""
-	if err != nil {
-		vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName())
-		remark = err.Error()
-	}
-	partner.CurOrderManager.OnOrderMsg(order, vendorStatus, remark)
-	// 上面是真的转自送,支持美团,饿百,京东,如果时抖店,抖店暂时全部是自送的!但是有骑手信息时,就是一个白嫖单子!
-	if order.VendorID == model.VendorIDDD && courierName != "" && courierMobile != "" {
-		timeNow := time.Now()
-		rand.Seed(timeNow.UnixNano())
-		randNumber := rand.Int63n(640)
-		if randNumber < 60 {
-			randNumber += 60
-		}
-		randTime := time.Duration(randNumber) * time.Second
-		bill := &model.Waybill{
-			VendorWaybillID:   order.VendorOrderID,
-			VendorWaybillID2:  "",
-			WaybillVendorID:   model.VendorJXFakeWL,
-			VendorOrderID:     order.VendorOrderID,
-			OrderVendorID:     model.VendorIDDD,
-			CourierName:       courierName,
-			CourierMobile:     courierMobile,
-			Status:            model.OrderStatusNew,
-			VendorStatus:      utils.Int2Str(model.OrderStatusNew),
-			ActualFee:         500,
-			DesiredFee:        order.ActualPayPrice,
-			TipFee:            0,
-			DuplicatedCount:   0,
-			DeliveryFlag:      0,
-			WaybillCreatedAt:  timeNow,
-			WaybillFinishedAt: utils.DefaultTimeValue,
-			StatusTime:        timeNow.Add(randTime), // 下一状态时间
-			OriginalData:      "",
-			Remark:            "自定义物流单",
-			VendorOrgCode:     order.VendorOrgCode,
-		}
-		err = dao.CreateEntity(dao.GetDB(), bill)
-	}
 	return err
 }