同步错误返回解决冲突

business/jxutils/datares/datares.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"image"
+	"image/gif"
 	"image/jpeg"
 	"image/png"
 	"net/http"
@@ -43,6 +44,8 @@ func Binary2Image(binaryData []byte, mimeType string) (img image.Image, outMimeT
 		img, err = jpeg.Decode(bytes.NewReader(binaryData))
 	case model.MimeTypePng:
 		img, err = png.Decode(bytes.NewReader(binaryData))
+	case model.MimeTypeGif:
+		img, err = gif.Decode(bytes.NewReader(binaryData))
 	}
 	return img, mimeType, err
 }
@@ -108,8 +111,10 @@ func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, h
 		return dataRes, err
 	}
 	if imgType > 0 {
-		// 忽略上传错误
-		UploadImage2Vendors(ctx, nil, dataRes, resBinary, isAsyncUpload2Vendor)
+		if globals.EnableStoreWrite {
+			// 忽略上传错误
+			UploadImage2Vendors(ctx, nil, dataRes, resBinary, isAsyncUpload2Vendor)
+		}
 	}
 	return dataRes, err
 }
@@ -173,7 +178,8 @@ func UploadImage2Vendors(ctx *jxcontext.Context, parentTask tasksch.ITask, dataR
 						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 							vendorID := batchItemList[0].(int)
 							if handler := partner.GetPurchasePlatformFromVendorID(vendorID); handler != nil {
-								imgHint, err2 := handler.UploadImg(ctx, dataRes.MainURL, imgData, imgName, int(dataRes.UseType))
+								// TODO vendorOrgCode
+								imgHint, err2 := handler.UploadImg(ctx, "", dataRes.MainURL, imgData, imgName, int(dataRes.UseType))
 								if err = err2; err == nil {
 									retVal = [][]interface{}{
 										[]interface{}{

business/jxutils/jxutils_act_test.go

@@ -14,6 +14,6 @@ func TestGetActStoreSku(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	storeSkuMap := NewActStoreSkuMap(actStoreSkuList, false)
+	storeSkuMap := jxutils.NewActStoreSkuMap(actStoreSkuList, false)
 	t.Log(storeSkuMap.GetActStoreSku(1, 2, 3))
 }

business/jxutils/jxutils_cms.go

@@ -326,6 +326,13 @@ func CaculatePriceByPricePack(l model.PricePercentagePack, defPricePercentage, p
 	return CaculateSkuVendorPrice(price, pricePercentage, priceAdd)
 }
 
+func ConstrainPayPercentage(payPerCentage int) int {
+	if payPerCentage <= 50 {
+		payPerCentage = 70
+	}
+	return payPerCentage
+}
+
 func IsSkuSpecial(specQuality float32, specUnit string) bool {
 	return int(specQuality) == model.SpecialSpecQuality && (specUnit == model.SpecialSpecUnit || specUnit == model.SpecialSpecUnit2)
 }