diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 94b79e6c8..e6662dd29 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -409,6 +409,10 @@ func SplitSkuName(skuName string) (prefix, name, comment, specUnit, unit string, return prefix, name, comment, specUnit, unit, specQuality } +func GenFakeUPC(skuID int) string { + return fmt.Sprintf("%013d", int64(skuID)+6666000000000) +} + func MakeValidationMapFromSlice(validValues []string, flag int) map[string]int { retVal := make(map[string]int) for _, v := range validValues { diff --git a/business/jxutils/jxutils_act_test.go b/business/jxutils/jxutils_act_test.go index 79d4d1577..9e3563557 100644 --- a/business/jxutils/jxutils_act_test.go +++ b/business/jxutils/jxutils_act_test.go @@ -2,18 +2,14 @@ package jxutils import ( "testing" - - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) func TestGetActStoreSku(t *testing.T) { - actStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(dao.GetDB(), 0, []int{model.VendorIDMTWM}, []int{102046}, []int{25430, 30611}, - utils.Str2Time("2019-07-27 13:29:57"), utils.Str2Time("2019-07-27 13:29:57")) - if err != nil { - t.Fatal(err) - } - storeSkuMap := jxutils.NewActStoreSkuMap(actStoreSkuList, false) - t.Log(storeSkuMap.GetActStoreSku(1, 2, 3)) + // actStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(dao.GetDB(), 0, []int{model.VendorIDMTWM}, []int{102046}, []int{25430, 30611}, + // utils.Str2Time("2019-07-27 13:29:57"), utils.Str2Time("2019-07-27 13:29:57")) + // if err != nil { + // t.Fatal(err) + // } + // storeSkuMap := jxutils.NewActStoreSkuMap(actStoreSkuList, false) + // t.Log(storeSkuMap.GetActStoreSku(1, 2, 3)) } diff --git a/business/jxutils/jxutils_cms_test.go b/business/jxutils/jxutils_cms_test.go index 701e3093b..864bdd23c 100644 --- a/business/jxutils/jxutils_cms_test.go +++ b/business/jxutils/jxutils_cms_test.go @@ -2,12 +2,10 @@ package jxutils import ( "fmt" - "strings" "testing" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) func TestSplitSlice(t *testing.T) { @@ -109,22 +107,22 @@ func TestCalcPolygonAreaAutonavi(t *testing.T) { // pointers := GetPolygonFromCircle(104.065702, 30.657488, 3000, 128) // area := CalcPolygonAreaAutonavi(pointers) // t.Logf("area:%f", area) - db := dao.GetDB() - storeList, err := dao.GetStoreList(db, nil, nil, "") - if err != nil { - t.Fatal(err) - } + // db := dao.GetDB() + // storeList, err := dao.GetStoreList(db, nil, nil, "") + // if err != nil { + // t.Fatal(err) + // } - strBuilder := &strings.Builder{} - strBuilder.WriteString("\n") - for _, v := range storeList { - if v.DeliveryRangeType == model.DeliveryRangeTypePolygon { - pointers := CoordinateStr2Points(v.DeliveryRange) - area1 := CalcPolygonAreaAutonavi(pointers) - strBuilder.WriteString(fmt.Sprintf("%d,%f\n", v.ID, area1)) - } - } - t.Log(strBuilder.String()) + // strBuilder := &strings.Builder{} + // strBuilder.WriteString("\n") + // for _, v := range storeList { + // if v.DeliveryRangeType == model.DeliveryRangeTypePolygon { + // pointers := CoordinateStr2Points(v.DeliveryRange) + // area1 := CalcPolygonAreaAutonavi(pointers) + // strBuilder.WriteString(fmt.Sprintf("%d,%f\n", v.ID, area1)) + // } + // } + // t.Log(strBuilder.String()) } func TestCaculateSkuPrice(t *testing.T) { diff --git a/business/jxutils/jxutils_test.go b/business/jxutils/jxutils_test.go index 55a78db84..f1bab58e6 100644 --- a/business/jxutils/jxutils_test.go +++ b/business/jxutils/jxutils_test.go @@ -284,3 +284,20 @@ func TestGetOneEmailFromStr(t *testing.T) { } } } + +func TestGenFakeUPC(t *testing.T) { + for _, v := range [][]string{ + []string{ + "6666000000123", + "123", + }, + []string{ + "6666007654321", + "7654321", + }, + } { + if str := GenFakeUPC(int(utils.Str2Int64(v[1]))); str != v[0] { + t.Errorf("%s failed, result:%s, expect:%s", v[1], str, v[0]) + } + } +}