liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- trim string after FilterMb4.

Browse Source
This commit is contained in:
gazebo
2018-10-08 16:53:11 +08:00
parent 922e5175c7
commit 4b150a0181
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/sku.go
View File

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

10
business/partner/purchase/ebai/store_sku.go
View File

@@ -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 ")
}

2
business/partner/purchase/elm/order.go
View File

@@ -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"])),

2
business/partner/purchase/jd/order.go
View File

@@ -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"])),