diff --git a/business/model/sku.go b/business/model/sku.go index c972df891..bcfe78a1a 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -161,7 +161,7 @@ type SkuName struct { Unit string `orm:"size(8)" json:"unit"` Price int `json:"price"` // 单位为分,标准价,不为份的就为实际标准价,为份的为每市斤价,实际还要乘质量。todo 为份的确定必须有质量 Img string `orm:"size(255)" json:"img"` - ElmImgHashCode string `orm:"size(64)" json:"-"` + ElmImgHashCode string `orm:"size(255)" json:"-"` // 长度255的原因是从京东初始化数据时临时需要 } // func (*SkuName) TableUnique() [][]string { diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 5f7708666..e7eae5c42 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -324,7 +324,7 @@ func (p *PurchaseHandler) syncOneStoreCategoriesFromRemote2Local(db *dao.DaoDB, if err = dao.GetRows(db, &catList, sql, storeID, utils.DefaultTimeValue, utils.DefaultTimeValue); err == nil { cat1Map := map[string]*tStoreCatInfo{} for _, v := range catList { - v.Name = utils.FilterMb4(v.Name) + v.Name = formatName(v.Name) globals.SugarLogger.Debug(v.Name) if v.Level == 1 { cat1 := cat1Map[v.Name] @@ -389,13 +389,13 @@ func (p *PurchaseHandler) SyncOneStoreCategories(db *dao.DaoDB, storeID int, use if catInfo.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 { // 删除 err = api.EbaiAPI.ShopCategoryDelete(strStoreID, catInfo.EbaiID) } else if catInfo.EbaiSyncStatus&model.SyncFlagNewMask != 0 { // 新增 - ebaiID, err2 := api.EbaiAPI.ShopCategoryCreate(strStoreID, catInfo.ParentEbaiID, utils.FilterMb4(catInfo.Name), int(catInfo.Seq+1), utils.Int2Str(catInfo.CategoryID)) + ebaiID, err2 := api.EbaiAPI.ShopCategoryCreate(strStoreID, catInfo.ParentEbaiID, formatName(catInfo.Name), int(catInfo.Seq+1), utils.Int2Str(catInfo.CategoryID)) if err = err2; err == nil { catInfo.EbaiID = ebaiID updateFields = append(updateFields, model.FieldEbaiID) } } else if catInfo.EbaiSyncStatus&model.SyncFlagModifiedMask != 0 { // 修改 - err = api.EbaiAPI.ShopCategoryUpdate(strStoreID, catInfo.EbaiID, utils.FilterMb4(catInfo.Name), int(catInfo.Seq+1), utils.Int2Str(catInfo.CategoryID)) + err = api.EbaiAPI.ShopCategoryUpdate(strStoreID, catInfo.EbaiID, formatName(catInfo.Name), int(catInfo.Seq+1), utils.Int2Str(catInfo.CategoryID)) } if err == nil { catInfo.EbaiSyncStatus = 0 @@ -459,3 +459,7 @@ func (p *PurchaseHandler) updateLocalCatAsNew(db *dao.DaoDB, localCatMap map[str } return nil } + +func formatName(name string) string { + return strings.Trim(utils.FilterMb4(name), "\n\r\t ") +} diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index 979edaa60..eca53b3d2 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -140,7 +140,7 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err ConsigneeName: utils.FilterMb4(result["consignee"].(string)), ConsigneeMobile: consigneeMobile, ConsigneeAddress: utils.FilterMb4(result["address"].(string)), - BuyerComment: utils.FilterMb4(strings.Trim(utils.Interface2String(result["description"]), "\n\r\t ")), + BuyerComment: strings.Trim(utils.FilterMb4(utils.Interface2String(result["description"])), "\n\r\t "), ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue), VendorStatus: utils.Interface2String(result["status"]), // 取订单的原始status,不合并消息类型(因为当前消息类型没有意义) OrderSeq: int(utils.MustInterface2Int64(result["daySn"])), diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 19d7f5abc..4456a9072 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -76,7 +76,7 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err ConsigneeMobile: result["buyerMobile"].(string), ConsigneeAddress: utils.FilterMb4(result["buyerFullAddress"].(string)), CoordinateType: model.CoordinateTypeMars, - BuyerComment: utils.FilterMb4(strings.Trim(utils.Interface2String(result["orderBuyerRemark"]), "\n\r\t ")), + BuyerComment: strings.Trim(utils.FilterMb4(utils.Interface2String(result["orderBuyerRemark"])), "\n\r\t "), ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue), VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])), OrderSeq: int(utils.MustInterface2Int64(result["orderNum"])),