- don't call FilterMb4 when saving order, instead call FilterMb4 when create waybill.

This commit is contained in:
gazebo
2018-10-31 11:53:35 +08:00
parent f0cd9aee08
commit 0e09f42468
6 changed files with 19 additions and 20 deletions

View File

@@ -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{},
}