From ce4b9607bc0cc3f99758e68605cffd7d94c8db99 Mon Sep 17 00:00:00 2001
From: "yan.y" <yiyan@021.com>
Date: Wed, 8 May 2024 19:46:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/api/goods.go | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/business/api/goods.go b/business/api/goods.go
index cf131e4..1a8c811 100644
--- a/business/api/goods.go
+++ b/business/api/goods.go
@@ -59,24 +59,28 @@ func (p DefParty) goodsList() web_iris.Party {
 			var goodsT1 []GoodsDetail
 			var goodsT2 []GoodsDetail
 			var goodsT3 []GoodsDetail
+			var goodsT4 []GoodsDetail
 			for _, value := range goodsList {
-				if value.GoodsType == 2 {
-					goodsT2 = append(goodsT2, value)
+				if value.GoodsType == 4 {
+					goodsT4 = append(goodsT4, value)
 				}
 				if value.GoodsType == 3 {
 					goodsT3 = append(goodsT3, value)
 				}
+				if value.GoodsType == 2 {
+					goodsT2 = append(goodsT2, value)
+				}
 				if value.GoodsType == 1 {
 					goodsT1 = append(goodsT1, value)
 				}
 			}
 			goodsT1Main := GoodsDetail{
-				Name:         "基础服务",
+				Name:         "洗护",
 				GoodsSubList: goodsT1,
 				GoodsType:    1,
 			}
 			goodsT2Main := GoodsDetail{
-				Name:         "附加产品",
+				Name:         "美容",
 				GoodsSubList: goodsT2,
 				GoodsType:    2,
 			}
@@ -85,8 +89,13 @@ func (p DefParty) goodsList() web_iris.Party {
 				GoodsSubList: goodsT3,
 				GoodsType:    3,
 			}
+			goodsT4Main := GoodsDetail{
+				Name:         "附加产品",
+				GoodsSubList: goodsT4,
+				GoodsType:    4,
+			}
 			var goodsTs []GoodsDetail
-			goodsTs = append(goodsTs, goodsT1Main, goodsT2Main, goodsT3Main)
+			goodsTs = append(goodsTs, goodsT1Main, goodsT2Main, goodsT3Main, goodsT4Main)
 			zap_server.ZAPLOG.Info("key", zap.Any("key1", key), zap.Any("key2", key1), zap.Any("key3", key2), zap.Any("key4", key3), zap.Any("key5", key4))
 			Success(ctx, goodsListRequest, GoodsListResponse{goodsTs})
 		})