Parcourir la source

fix:详情修改

duxin il y a 3 semaines
Parent
commit
38fc2c84e0

+ 6 - 0
internal/logic/product/bigmember/bigmember.go

@@ -257,6 +257,12 @@ func (p jyBigProduct) SaveUpdate(ctx context.Context, masterKey string) error {
 				Unit: filter.GiftType,
 			})
 		} else {
+			if len(filter.SupServiceIds) == 0 {
+				filter.ComboId = oldFilter.ComboId
+				if oldFilter.ComboId == 6 && oldFilter.FinalAreaCount == 1 {
+					filter.ComboId = 30190
+				}
+			}
 			filter.FinalAccountCount = p.param.Filter.BuyAccountCount + p.param.Filter.GiftAccountCount + oldFilter.FinalAccountCount //继承上级
 			sVal, err := service.Product().GetProduct(p.param.ProductCode)
 			if err != nil {

+ 1 - 1
internal/logic/user/getService.go

@@ -434,7 +434,7 @@ WHERE %s and jod.product_type = '%s'  and jod.status =1 ORDER BY dor.create_time
 			if linkedId == 0 {
 				linkedId = gconv.Int(m2["id"])
 			}
-			if product_code := gconv.String(m2["product_code"]); product_code != "" {
+			if product_code := gconv.String(m2["product_code"]); productCode == "" && product_code != "" {
 				productCode = product_code
 			}
 			if gconv.String(m2["service_endtime"]) > time.Now().String() {