From 9cf268ae7872cdded566e37d52bdd774df735c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 17 Jun 2020 17:35:11 +0800
Subject: [PATCH] imgorigin

---
 business/jxstore/cms/sync_store_sku.go       | 3 ++-
 business/model/dao/store_sku.go              | 3 ++-
 business/partner/purchase/mtwm/store_sku2.go | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index f8085160e..e54cb3d2c 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -283,7 +283,8 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
 			skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0)
 			if skuItem.ImgWatermark != "" {
 				downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
-				skuItem.ImgMix = jxutils.MixWatermarkImg(downLoad, skuItem.Img, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
+				fmt.Println("testdo", downLoad)
+				skuItem.ImgMix = jxutils.MixWatermarkImg(downLoad, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
 			}
 		}
 	}
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 8b2c5a671..e1067875d 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -97,6 +97,7 @@ type StoreSkuSyncInfo struct {
 	DescImg      string
 	ImgWatermark string `json:"imgWatermark"` //图片水印
 	ImgMix       string //合成水印后的图片
+	ImgOrigin    string //skuname里的img
 
 	VendorVendorCatID int64  `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）
 	CategoryName      string `json:"categoryName"`                //分类名
@@ -410,7 +411,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end, t1.jds_ware_id,
 	t2.*,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.category_id name_category_id, t3.yb_name_suffix,
-	t3.jds_stock_switch, t3.preparation_time, t3.img_watermark, t3.ex_vendor_id,
+	t3.jds_stock_switch, t3.preparation_time, t3.img_watermark, t3.ex_vendor_id, t3.img img_origin,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	IF(t15.%s <> '', t15.%s, t3.img3) img3,
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index 73e9484ba..3ae1790cf 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -2,7 +2,6 @@ package mtwm
 
 import (
 	"encoding/json"
-	"fmt"
 	"regexp"
 	"strings"
 
@@ -278,7 +277,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 			if img2 == "" {
 				img2 = storeSku.Img
 			}
-			fmt.Println("testmix", storeSku.ImgMix)
 			if storeSku.ImgMix != "" {
 				foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.ImgMix, img2, storeSku.ImgMix, storeSku.ImgMix, storeSku.ImgMix), ",")
 			} else {