diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index d021103c2..7896db770 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -549,8 +549,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i } var tmpList []*tGetStoresSkusInfo beginTime := time.Now() - fmt.Println("test1", sql) - fmt.Println(sqlParams) if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil { dao.Rollback(db) return nil, err diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 9f9b4271a..067fbeb2d 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -61,10 +61,14 @@ var ( } ) -func mapDeliveryType(ebaiDeliveryParty int) (deliveryType string) { - deliveryType = deliveryTypeMap[ebaiDeliveryParty] - if deliveryType == "" { - deliveryType = model.OrderDeliveryTypePlatform +func mapDeliveryType(ebaiDeliveryParty int, businessType int) (deliveryType string) { + if businessType == ebaiapi.DeliveryBusinessTypeZT { + return model.OrderDeliveryTypeSelfTake + } else { + deliveryType = deliveryTypeMap[ebaiDeliveryParty] + if deliveryType == "" { + deliveryType = model.OrderDeliveryTypePlatform + } } return deliveryType } @@ -226,7 +230,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]), BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]), TotalShopMoney: utils.ForceInterface2Int64(orderMap["shop_fee"]), - DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))), + DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"])), int(utils.ForceInterface2Int64(orderMap["business_type"]))), InvoiceTitle: utils.Interface2String(orderMap["invoice_title"]), InvoiceTaxerID: utils.Interface2String(orderMap["taxer_id"]),