1

business/partner/delivery/rider.go

@@ -409,7 +409,14 @@ func UpdateFakeWayBillToTiktok() {
 
 		// 设置骑手和下一状态时间
 		makeRiderInfo(fakeWayBill[i], riderInfo)
-
+		if riderInfo.CourierName == "" && fakeWayBill[i].CourierName != "" {
+			riderInfo.CourierName = fakeWayBill[i].CourierName
+			riderInfo.CourierPhone = fakeWayBill[i].CourierMobile
+		}
+		if riderInfo.CourierName == "" && fakeWayBill[i].CourierName == "" {
+			riderInfo.CourierName = "石锋"
+			riderInfo.CourierPhone = "18048531223"
+		}
 		if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider {
 			riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
 		}
@@ -452,7 +459,7 @@ func UpdateFakeWayBillToTiktok() {
 				globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())
 			}
 			// 饿百订单推送订单送达
-			if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM {
+			if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDTaoVegetable || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM {
 				if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {
 					globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err)
 				}

business/partner/purchase/tao_vegetable/order_afs.go

@@ -71,10 +71,10 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
 	var err error
 	var db = dao.GetDB()
 	orderStatus, scarceGoods := c.callbackAfsMsg2Status(status, msg)
-	// 用户取消售后
 	switch status {
 	case tao_vegetable.OrderStatusApplyAfs:
 		refundData := msg.(*tao_vegetable.UserApplyRefundCallBack)
+		globals.SugarLogger.Debugf("================OrderStatusApplyAfs : %s", utils.Format4Output(msg, false))
 		var afsOrder *model.AfsOrder
 		var api = getAPI("", 0, refundData.StoreId)
 
@@ -289,12 +289,14 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
 		if scarceGoods != nil {
 			var afsOrder *model.AfsOrder
 			refundSuccess := msg.(*tao_vegetable.RefundOrderFinish)
+			globals.SugarLogger.Debugf("================OrderStatusRefundSuccess : %s", utils.Format4Output(msg, false))
 			var api = getAPI("", 0, refundSuccess.StoreId)
 
 			afsOrder = &model.AfsOrder{
 				VendorID:         model.VendorIDTaoVegetable,
 				AfsOrderID:       refundSuccess.OutMainRefundId,
 				VendorOrderID:    orderStatus.RefVendorOrderID,
+				VendorOrderID2:   refundSuccess.BizSubRefundId,
 				VendorStoreID:    refundSuccess.StoreId,
 				StoreID:          0,
 				AfsCreatedAt:     orderStatus.StatusTime,