From b5a8976fce62058e9ffa2609886ae5dee14701fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 10:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 43 ++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 556aed05a..7fc959200 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -9,8 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/business/jxutils/datares"
-
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1501,7 +1499,10 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	var skuNames []*model.SkuName
+	var (
+		skuNames []*model.SkuName
+		db       = dao.GetDB()
+	)
 	sql := `
 	 	SELECT DISTINCT a.* 
 	 	FROM sku_name a, store_sku_bind b, sku c
@@ -1513,13 +1514,35 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
-		fmt.Println("test1", *v)
-		resBinary1, hashCode1, _ := jxutils.DownloadFileByURL(v.Img)
-		resBinary2, hashCode2, _ := jxutils.DownloadFileByURL(v.Img2)
-		resBinary3, hashCode3, _ := jxutils.DownloadFileByURL(v.DescImg)
-		datares.RegisterDataResource(ctx, v.Name, v.Img, http.DetectContentType(resBinary1), hashCode1, resBinary1, model.ImgTypeMain, false)
-		datares.RegisterDataResource(ctx, v.Name, v.Img2, http.DetectContentType(resBinary2), hashCode2, resBinary2, model.ImgTypeMain, false)
-		datares.RegisterDataResource(ctx, v.Name, v.DescImg, http.DetectContentType(resBinary3), hashCode3, resBinary3, model.ImgTypeMain, false)
+		for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
+			datar := &model.DataResource{
+				MainURL: vv,
+			}
+			err = dao.GetEntity(db, datar, "MainURL")
+			resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
+			handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
+			img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
+			if dao.IsNoRowsError(err) {
+				dataRes := &model.DataResource{
+					Name:         v.Name,
+					HashCode:     hashCode,
+					ResourceType: http.DetectContentType(resBinary),
+					MainURL:      vv,
+					JdsURL:       img,
+				}
+				if vv == v.DescImg {
+					dataRes.UseType = model.ImgTypeDesc
+				} else {
+					dataRes.UseType = model.ImgTypeMain
+				}
+				dao.CreateEntity(db, dataRes)
+			} else {
+				if err == nil {
+					datar.JdsURL = img
+					dao.UpdateEntity(db, datar, "JdsURL")
+				}
+			}
+		}
 		break
 	}
 	return err