- SplitSkuName don't use comment as name

- add DownloadFileByURL
- refactor UploadWeimobImg4SkuName
- ignore RefreshMissingDadaStores error
- add BuildSkuFromEbaiStore

business/jxstore/cms/cms.go

@@ -1,8 +1,6 @@
 package cms
 
 import (
-	"crypto/md5"
-	"fmt"
 	"strconv"
 	"time"
 
@@ -80,7 +78,7 @@ func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTok
 	upTokenInfo = map[string]interface{}{
 		"token":    putPolicy.UploadToken(api.QiniuAPI),
 		"expires":  putPolicy.Expires,
-		"fileName": genPicFileName(suffix),
+		"fileName": jxutils.GenPicFileName(suffix),
 		"hit":      imgURL != "",
 		"img":      imgURL,
 	}
@@ -145,8 +143,3 @@ func UpdatePlace(ctx *jxcontext.Context, placeCode int, payload map[string]inter
 func GetCoordinateDistrictCode(ctx *jxcontext.Context, lng, lat float64) (code int, err error) {
 	return api.AutonaviAPI.GetCoordinateDistrictCode(lng, lat), nil
 }
-
-/////
-func genPicFileName(suffix string) string {
-	return fmt.Sprintf("%x%s", md5.Sum([]byte(utils.GetUUID()+suffix)), suffix)
-}

business/jxstore/cms/sku.go

@@ -6,12 +6,12 @@ import (
 	"strings"
 
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/business/jxstore/initdata"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 type SkuNamesInfo struct {
@@ -452,6 +452,23 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		skuNameExt.SpecQuality = skuNameExt.Skus[0].SpecQuality
 		skuNameExt.SpecUnit = skuNameExt.Skus[0].SpecUnit
 	}
+	imgContent, imgMD5, err := jxutils.DownloadFileByURL(skuNameExt.Img)
+	if err != nil {
+		dao.Rollback(db)
+		return nil, err
+	}
+	if globals.EnableWscStoreWrite {
+		if skuNameExt.ImgWeimob, err = api.WeimobAPI.UploadImg(imgContent, ""); err != nil {
+			dao.Rollback(db)
+			return nil, err
+		}
+	}
+	if skuNameExt.ImgHashCode == "" {
+		skuNameExt.ImgHashCode = imgMD5
+	} else if skuNameExt.ImgHashCode != imgMD5 {
+		dao.Rollback(db)
+		return nil, errors.New("图片HASH值不同")
+	}
 	if err = dao.CreateEntity(db, &skuNameExt.SkuName); err != nil {
 		dao.Rollback(db)
 		return nil, err
@@ -488,7 +505,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	}
 	outSkuNameExt = tmpInfo.SkuNames[0]
 	_, err = CurVendorSync.SyncSku(ctx, db, outSkuNameExt.SkuName.ID, -1, false, false, userName)
-	initdata.UploadWeimobImg4SkuName(ctx, []int{skuNameExt.SkuName.ID}, true, true)
 	return outSkuNameExt, err
 }
 
@@ -510,6 +526,16 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 		dao.Begin(db)
 		defer dao.Rollback(db)
 		if valid["img"] != "" {
+			imgContent, imgMD5, err2 := jxutils.DownloadFileByURL(valid["img"].(string))
+			if err = err2; err != nil {
+				return 0, err
+			}
+			valid["ImgHashCode"] = imgMD5
+			if globals.EnableWscStoreWrite {
+				if valid["ImgWeimob"], err = api.WeimobAPI.UploadImg(imgContent, ""); err != nil {
+					return 0, err
+				}
+			}
 			valid["imgWeimob"] = ""
 		}
 		if num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, skuName, valid, userName, nil, model.FieldJdSyncStatus, model.SyncFlagModifiedMask); err == nil && num == 1 {
@@ -538,9 +564,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 				if err == nil {
 					dao.Commit(db)
 					_, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, false, userName)
-					if valid["img"] != "" {
-						initdata.UploadWeimobImg4SkuName(ctx, []int{nameID}, true, true)
-					}
 				}
 			}
 		}

business/jxstore/cms/store.go

@@ -419,7 +419,7 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i
 	dao.WrapAddIDCULDEntity(store, userName)
 	store.ID = existingID
 	if err = dao.CreateEntity(nil, store); err == nil {
-		_, err = RefreshMissingDadaStores(ctx, store.ID, false, false)
+		RefreshMissingDadaStores(ctx, store.ID, false, false)
 		return store.ID, err
 	}
 	return 0, err