aa

2020-12-08 10:44:52 +08:00
parent 9ed6bb4974
commit 6b6d2d6b06
4 changed files with 27 additions and 16 deletions
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -2693,6 +2693,13 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
 				EndAt:        toTimeP,
 			}
 			dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
+			if imgWaterMark != "" {
+				if skuNames, err := dao.GetSkuNames(db, []int{nameID}, nil, "", false); err == nil {
+					if ImgMix := jxutils.MixWatermarkImg(imgWaterMark, skuNames[0].Img, &fromTimeP, &toTimeP); ImgMix != "" {
+						skuEx.ImgWatermarkMix = ImgMix
+					}
+				}
+			}
 			skuExs, _ := dao.GetSkuExinfos(db, []int{nameID}, []int{vendorID}, "", utils.ZeroTimeValue, utils.ZeroTimeValue)
 			if len(skuExs) > 0 {
 				skuEx2 := skuExs[0]