1

business/partner/purchase/jd/order.go

@@ -351,8 +351,9 @@ func Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
 		order.Skus = append(order.Skus, sku)
 	}
 	// 包装袋金额设置
-	store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
+	store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, order.VendorID, order.VendorOrgCode)
 	order.PackagePrice = store.PackageSetting
+	order.JxStoreID = store.ID
 	jxutils.RefreshOrderSkuRelated(order)
 	return order
 }

business/partner/purchase/tiktok_store/order.go

@@ -587,20 +587,35 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
 			}
 		}
 	}
-
-	//转门店自送通知抖音发货
-	err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
+	logisticsAdd := &order_logisticsAdd_request.OrderLogisticsAddParam{
 		OrderId:          order.VendorOrderID,
 		Company:          "",
-		CompanyCode:      "chengdouruoxi",
+		CompanyCode:      "",
 		LogisticsCode:    order.VendorOrderID,
 		IsRefundReject:   false,
 		IsRejectRefund:   false,
 		SerialNumberList: nil,
 		AddressId:        0,
 		StoreId:          utils.Str2Int64(order.VendorStoreID),
-	})
-	return err
+	}
+	switch order.WaybillVendorID {
+	case model.VendorIDDada:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeDaDa
+	case model.VendorIDMTPS:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeMeiTuan
+	case model.VendorIDFengNiao:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeFengNiao
+	case model.VendorIDSFPS:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeSF
+	case model.VendorIDUUPT:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeUU
+	case model.VendorJXFakeWL, -1:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeMerchant
+	default:
+		logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeMerchant
+	}
+	//转门店自送通知抖音发货
+	return api.OrderDelivering(logisticsAdd)
 }
 
 // Swtich2SelfDelivered 暂无自送完成