From 0e09f424687675107a2a09712035e296451a1a07 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 31 Oct 2018 11:53:35 +0800 Subject: [PATCH] - don't call FilterMb4 when saving order, instead call FilterMb4 when create waybill. --- business/partner/delivery/dada/waybill.go | 6 +++--- business/partner/delivery/mtps/waybill.go | 6 +++--- business/partner/purchase/ebai/order.go | 9 ++++----- business/partner/purchase/ebai/store_sku.go | 2 +- business/partner/purchase/elm/order.go | 8 ++++---- business/partner/purchase/jd/order.go | 8 ++++---- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 51132253c..938fd1e6d 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -101,8 +101,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del OriginID: jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), CargoPrice: jxutils.IntPrice2Standard(order.ActualPayPrice), IsPrepay: 0, - ReceiverName: order.ConsigneeName, - ReceiverAddress: order.ConsigneeAddress, + ReceiverName: utils.FilterMb4(order.ConsigneeName), + ReceiverAddress: utils.FilterMb4(order.ConsigneeAddress), ReceiverPhone: order.ConsigneeMobile, } if billParams.CargoPrice > maxCargoPrice { @@ -112,7 +112,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil { billParams.ReceiverLng, billParams.ReceiverLat, _ = jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) addParams := map[string]interface{}{ - "info": order.BuyerComment, + "info": utils.FilterMb4(order.BuyerComment), // "origin_mark": model.VendorNames[order.VendorID], "origin_mark_no": fmt.Sprintf("%d", order.OrderSeq), "cargo_type": 13, diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 8daa3206d..a284dd55e 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -211,8 +211,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del billParams := &mtpsapi.CreateOrderByShopParam{ OrderID: jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), DeliveryServiceCode: mtpsapi.DeliveryServiceCodeRapid, - ReceiverName: order.ConsigneeName, - ReceiverAddress: order.ConsigneeAddress, + ReceiverName: utils.FilterMb4(order.ConsigneeName), + ReceiverAddress: utils.FilterMb4(order.ConsigneeAddress), ReceiverPhone: order.ConsigneeMobile, CoordinateType: model.CoordinateTypeMars, ReceiverLng: jxutils.StandardCoordinate2Int(lngFloat), @@ -243,7 +243,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del item.GoodCount += goodItem.GoodCount } } - addParams := utils.Params2Map("note", order.BuyerComment, "goods_detail", string(utils.MustMarshal(goods)), "poi_seq", fmt.Sprintf("#%d", order.OrderSeq)) + addParams := utils.Params2Map("note", utils.FilterMb4(order.BuyerComment), "goods_detail", string(utils.MustMarshal(goods)), "poi_seq", fmt.Sprintf("#%d", order.OrderSeq)) result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams) if err = err2; err != nil { globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index df277d2bb..e26bb982e 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -1,7 +1,6 @@ package ebai import ( - "strings" "time" "git.rosy.net.cn/baseapi/platformapi/autonavi" @@ -44,16 +43,16 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde VendorStoreID: shopMap["baidu_shop_id"].(string), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(shopMap["id"]), 0)), StoreName: shopMap["name"].(string), - ConsigneeName: utils.FilterMb4(userMap["name"].(string)), + ConsigneeName: userMap["name"].(string), ConsigneeMobile: userMap["phone"].(string), - ConsigneeAddress: utils.FilterMb4(userMap["address"].(string)), + ConsigneeAddress: userMap["address"].(string), CoordinateType: model.CoordinateTypeBaiDu, - BuyerComment: utils.FilterMb4(strings.Trim(utils.Interface2String(orderMap["remark"]), "\n\r\t ")), + BuyerComment: utils.TrimBlanChar(utils.Interface2String(orderMap["remark"])), ExpectedDeliveredTime: getTimeFromTimestampStr(utils.Interface2String(orderMap["send_time"])), VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])), OrderSeq: int(utils.Str2Int64(utils.Interface2String(orderMap["order_index"]))), StatusTime: getTimeFromTimestampStr(utils.Interface2String(orderMap["create_time"])), - OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))), + OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.MustInterface2Int64(orderMap["user_fee"]), Skus: []*model.OrderSku{}, } diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 3c51651b6..1f2977110 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -477,7 +477,7 @@ func (p *PurchaseHandler) updateLocalCatAsNew(db *dao.DaoDB, localCatMap map[str } func formatName(name string) string { - return strings.Trim(utils.FilterMb4(name), "\n\r\t ") + return utils.TrimBlanChar(utils.FilterMb4(name)) } // 饿百的排序是从大到小 diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index 9e4fa16ae..e4eb221a8 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -136,15 +136,15 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err VendorStoreID: utils.Int64ToStr(utils.MustInterface2Int64(result["shopId"])), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["openId"]), 0)), StoreName: result["shopName"].(string), - ConsigneeName: utils.FilterMb4(result["consignee"].(string)), + ConsigneeName: result["consignee"].(string), ConsigneeMobile: consigneeMobile, - ConsigneeAddress: utils.FilterMb4(result["address"].(string)), - BuyerComment: strings.Trim(utils.FilterMb4(utils.Interface2String(result["description"])), "\n\r\t "), + ConsigneeAddress: result["address"].(string), + BuyerComment: utils.TrimBlanChar(utils.Interface2String(result["description"])), ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue), VendorStatus: utils.Interface2String(result["status"]), // 取订单的原始status，不合并消息类型（因为当前消息类型没有意义） OrderSeq: int(utils.MustInterface2Int64(result["daySn"])), StatusTime: utils.Str2Time(result["activeAt"].(string)), - OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))), + OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalPrice"])), Skus: []*model.OrderSku{}, } diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 3c4c4b926..369b3b93a 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -68,16 +68,16 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err VendorStoreID: result["produceStationNo"].(string), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["produceStationNoIsv"]), 0)), StoreName: result["produceStationName"].(string), - ConsigneeName: utils.FilterMb4(result["buyerFullName"].(string)), + ConsigneeName: result["buyerFullName"].(string), ConsigneeMobile: result["buyerMobile"].(string), - ConsigneeAddress: utils.FilterMb4(result["buyerFullAddress"].(string)), + ConsigneeAddress: result["buyerFullAddress"].(string), CoordinateType: model.CoordinateTypeMars, - BuyerComment: strings.Trim(utils.FilterMb4(utils.Interface2String(result["orderBuyerRemark"])), "\n\r\t "), + BuyerComment: utils.TrimBlanChar(utils.Interface2String(result["orderBuyerRemark"])), ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue), VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])), OrderSeq: int(utils.MustInterface2Int64(result["orderNum"])), StatusTime: utils.Str2Time(result["orderPurchaseTime"].(string)), - OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))), + OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), Skus: []*model.OrderSku{}, }