Merge branch 'sxy' into dev

internal/dao/bundleDao.go

@@ -201,6 +201,7 @@ func BundleListV2(req *bundle.BundleListRequest) (res *bundle.BundleListResponse
 				CompanySign:           bundleProfile.CompanySign,
 				ContractDuration:      int64(bundleProfile.ContractDuration),
 				Sort:                  bundleProfile.Sort,
+				ImgOption:             int32(bundleProfile.ImgOption),
 				BgImg1:                bundleProfile.BgImg1,
 				BgImg2:                bundleProfile.BgImg2,
 				SelectValueAddService: selectValueAddService,

internal/logic/bundleLogic.go

@@ -72,6 +72,7 @@ func SaveBundle(req *bundle.BundleProfile) (res *bundle.SaveResponse, err error)
 		Price:       req.Price,
 		PriceType:   req.PriceType,
 		Contract:    "https://e-cdn.fontree.cn/fonchain-main/prod/file/saas/contract/template-25032801.pdf",
+		ImgOption:   int8(req.ImgOption),
 		BgImg1:      req.BgImg1,
 		BgImg2:      req.BgImg2,
 		ShelfStatus: 2, //默认初始状态为2-下架
@@ -238,6 +239,7 @@ func SaveBundle(req *bundle.BundleProfile) (res *bundle.SaveResponse, err error)
 				"content":    req.Content,
 				"price":      req.Price,
 				"price_type": req.PriceType,
+				"img_option": req.ImgOption,
 				"bg_img1":    req.BgImg1,
 				"bg_img2":    req.BgImg2,
 			}
@@ -327,6 +329,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
 		bundleProfile.Content = detail.Content
 		bundleProfile.Price = detail.Price
 		bundleProfile.PriceType = detail.PriceType
+		bundleProfile.ImgOption = int32(detail.ImgOption)
 		bundleProfile.BgImg1 = detail.BgImg1
 		bundleProfile.BgImg2 = detail.BgImg2
 		bundleProfile.Sort = detail.Sort

internal/model/bundle.go

@@ -21,6 +21,7 @@ type BundleProfile struct {
 
 	Sort                    int64                     `json:"sort" gorm:"column:sort;type:int;comment:套餐排序"` //数字越小越靠前，同大小后创建优先
 	ShelfStatus             int64                     `json:"shelfStatus" gorm:"column:shelf_status;type:int;default:2;comment:上架状态  1:上架 2:下架"`
+	ImgOption               int8                      `json:"imgOption" gorm:"column:img_option;type:int;default:1;comment:图片选择 1:背景图1 2 3"`
 	BgImg1                  string                    `json:"bgImg1" gorm:"column:bg_img1;type:varchar(1024);comment:背景图-首页"`
 	BgImg2                  string                    `json:"bgImg2" gorm:"column:bg_img2;type:varchar(1024);comment:背景图-我的"`
 	BundleToValueAddService []BundleToValueAddService `gorm:"foreignKey:BundleUuid;references:UUID" json:"bundleToValueAddService"`

pb/bundle.proto

@@ -69,6 +69,7 @@ message BundleProfile {
   int64 shelfStatus = 16 [json_name = "shelfStatus"]; // 1 上架 2 下架
   repeated SelectValueAddService selectValueAddService = 17 [json_name = "SelectValueAddService"];
   repeated BundleProfileLang bundleProfileLang = 18 [json_name = "bundleProfileLang"];
+  int32 imgOption = 19 [json_name = "imgOption"];
 }
 message BundleProfileLang {
   string uuid = 1 [json_name = "uuid"];