Merge branch 'ysx-魔方改版-20230313' into dev

service/service_ly_common.go

@@ -416,6 +416,12 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 									break outerLoop
 								}
 							}
+						} else {
+							if sku.Eccn == eccn {
+								fmt.Println("全匹配")
+								findedRatio = true
+								break outerLoop
+							}
 						}
 					}
 				}

service/service_price.go

 package service
 
 import (
-	"github.com/gomodule/redigo/redis"
-	"github.com/syyongx/php2go"
-	"github.com/tidwall/gjson"
 	"go_sku_server/model"
 	"go_sku_server/pkg/gredis"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/syyongx/php2go"
+	"github.com/tidwall/gjson"
 )
 
 type PriceService struct {
@@ -20,7 +21,6 @@ func (ls *LyService) GetActivityPrice(sku model.LySku, suffix string, power Powe
 	if len(sku.LadderPrice) == 0 {
 		return sku
 	}
-
 	// 这个是针对贸泽的活动价?如果有成本价就是代表有活动,而且活动模块没法设置mouse的活动价
 	if suffix == "" && sku.SupplierId == 14 {
 		return getMouserActivityPrice(sku)