03.29

cmd/controller/art_show.go

@@ -219,3 +219,63 @@ func (p *ArtShowProvider) ArtworkPriceList(_ context.Context, req *artShow.ShowD
 	}
 	return
 }
+
+func (p *ArtShowProvider) CancelShow(_ context.Context, req *artShow.CancelShowReq) (res *artShow.CommonRes, err error) {
+	res = new(artShow.CommonRes)
+	err = service.CancelShow(req)
+	if err != nil {
+		res.Msg = err.Error()
+		err = errors.New(m.ERROR_DELETE)
+		return
+	}
+	res.Msg = m.DELETE_SUCCESS
+	return
+}
+
+func (p *ArtShowProvider) UpdateArtworkReward(_ context.Context, req *artShow.UpdateArtworkRewardReq) (res *artShow.CommonRes, err error) {
+	if len(req.Data) < 1 {
+		res.Msg = m.ERROR_INVALID_PARAM
+		err = errors.New(m.ERROR_INVALID_PARAM)
+		return
+	}
+	res = new(artShow.CommonRes)
+	err = service.UpdateArtworkPriceReward(req)
+	if err != nil {
+		res.Msg = err.Error()
+		err = errors.New(m.UPDATE_FAILED)
+		return
+	}
+	res.Msg = m.UPDATE_SUCCESS
+	return
+}
+
+func (p *ArtShowProvider) UpdateArtworkSaleAddress(_ context.Context, req *artShow.UpdateArtworkSaleAddressReq) (res *artShow.CommonRes, err error) {
+	if len(req.Data) < 1 {
+		res.Msg = m.ERROR_INVALID_PARAM
+		err = errors.New(m.ERROR_INVALID_PARAM)
+		return
+	}
+	res = new(artShow.CommonRes)
+	err = service.UpdateArtworkPriceSaleAddress(req)
+	if err != nil {
+		res.Msg = err.Error()
+		err = errors.New(m.UPDATE_FAILED)
+		return
+	}
+	res.Msg = m.UPDATE_SUCCESS
+	return
+}
+
+func (p *ArtShowProvider) QueryShowStatus(_ context.Context, req *artShow.ShowStatusReq) (res *artShow.ShowStatusRes, err error) {
+	if len(req.ShowUID) < 1 {
+		err = errors.New(m.ERROR_INVALID_PARAM)
+		return
+	}
+	res = new(artShow.ShowStatusRes)
+	err, res = service.QueryShowStatus(req)
+	if err != nil {
+		err = errors.New(m.ERROR_QUERY)
+		return
+	}
+	return
+}

cmd/controller/sale_address.go

@@ -0,0 +1,21 @@
+package controller
+
+import (
+	"context"
+	"fonchain-artshow/cmd/service"
+	"fonchain-artshow/pb/artShow"
+	"fonchain-artshow/pkg/m"
+)
+
+func (p *ArtShowProvider) QuerySaleAddress(_ context.Context, req *artShow.SaleAddressReq) (res *artShow.SaleAddressRes, err error) {
+	if req.ParentName == "" {
+		req.ParentName = "0"
+	}
+	res = new(artShow.SaleAddressRes)
+	res, err = service.QuerySaleAddress(req)
+	if err != nil {
+		res.Msg = m.ERROR_QUERY
+		return res, err
+	}
+	return
+}

cmd/dao/art_show.go

@@ -213,7 +213,7 @@ func UniqueShowName(showName string) (out *model.ArtShowRes, err error) {
 
 func QueryArtShow(showUids []string) (err error, out []*model.ArtShowRes) {
 	out = make([]*model.ArtShowRes, 0)
-	err = db.DbArtShow.Table("art_show as a ").Select("a.show_uid, a.show_seq, a.show_name, a.artist_name, a.artist_uid, a.artwork_num, a.ruler, a.price, a.create_time, a.operator,a.is_show, b.address ,b.show_time").Joins("left join  show_rel as b on a.show_uid = b.show_uid").Where("a.show_uid in ? ", showUids).Find(&out).Error
+	err = db.DbArtShow.Table("art_show as a ").Select("a.show_uid, a.show_seq, a.show_name, a.artist_name, a.artist_uid, a.artwork_num, a.ruler, a.price, a.create_time, a.operator,a.is_show, b.address ,b.show_time").Joins("left join  show_rel as b on a.show_uid = b.show_uid").Where("a.show_uid in ? and b.deleted_at is null ", showUids).Find(&out).Error
 	if err != nil {
 		zap.L().Error("ArtShow Find err", zap.Error(err))
 		return

cmd/dao/artwork_price.go

@@ -78,3 +78,20 @@ func DelArtworkPrice_showUID(tx *gorm.DB, show_uid string) (err error) {
 	}
 	return
 }
+
+func UpdateArtworkInfoWithMap(tx *gorm.DB, in map[string]interface{}, showUid, artworkPriceUid string) (err error) {
+	if artworkPriceUid != "" {
+		err = tx.Model(&model.ArtworkPrice{}).Omit("artwork_price_uid").Where("artwork_price_uid = ? and deleted_at is null ", artworkPriceUid).Updates(in).Error
+		if err != nil {
+			zap.L().Error("Artwork price update  err", zap.Error(err))
+			return
+		}
+	} else if showUid != "" {
+		err = tx.Model(&model.ArtworkPrice{}).Omit("artwork_price_uid,show_uid").Where("show_uid = ? and deleted_at is null ", showUid).Updates(in).Error
+		if err != nil {
+			zap.L().Error("Artwork price update  err", zap.Error(err))
+			return
+		}
+	}
+	return
+}

cmd/dao/sale_address.go

@@ -0,0 +1,16 @@
+package dao
+
+import (
+	"fonchain-artshow/cmd/model"
+	"fonchain-artshow/pb/artShow"
+	"fonchain-artshow/pkg/db"
+)
+
+func QuerySaleAddress(in *artShow.SaleAddressReq) (out []*model.SaleAddress, err error) {
+	out = make([]*model.SaleAddress, 0)
+	err = db.DbArtShow.Table("sale_address").Where("parent_name = ? ", in.ParentName).Find(&out).Error
+	if err != nil {
+		return nil, err
+	}
+	return
+}

cmd/dao/show_rel.go

@@ -56,7 +56,7 @@ func SaveShowRel(tx *gorm.DB, showRel *model.ShowRel) (err error) {
 	return
 }
 
-func DelShowRel(tx *gorm.DB, showRelUIDs []string) (err error) {
+func DelShowRelWithUID(tx *gorm.DB, showRelUIDs []string) (err error) {
 	err = tx.Where("show_rel_uid in (?)", showRelUIDs).Delete(&model.ShowRel{}).Error
 	if err != nil {
 		zap.L().Error("ShowRel delete err", zap.Error(err))
@@ -65,10 +65,19 @@ func DelShowRel(tx *gorm.DB, showRelUIDs []string) (err error) {
 	return
 }
 
-func DelShowRelByApplyUID(tx *gorm.DB, applyUID string) (err error) {
+func DelShowReWithApplyUID(tx *gorm.DB, applyUID string) (err error) {
 	err = tx.Where("apply_uid = ? ", applyUID).Delete(&model.ShowRel{}).Error
 	if err != nil {
-		zap.L().Error("ShowRel by applyUID delete err", zap.Error(err))
+		zap.L().Error("DelShowReWithApplyUID  err", zap.Error(err))
+		return
+	}
+	return
+}
+
+func DelShowReWithShowUID(tx *gorm.DB, showUID string) (err error) {
+	err = tx.Where("show_uid = ? ", showUID).Delete(&model.ShowRel{}).Error
+	if err != nil {
+		zap.L().Error("DelShowReWithShowUID  err", zap.Error(err))
 		return
 	}
 	return
@@ -88,12 +97,15 @@ func QueryShowRel_showUID(showUID string) (err error, out *model.ShowRel) {
 	return
 }
 
-func QueryShowRelList(applyUID string) (err error, out []*model.ShowRel) {
+func QueryShowRelList(applyUID string, showUID string) (err error, out []*model.ShowRel) {
 	out = make([]*model.ShowRel, 0)
 	findDB := db.DbArtShow.Model(&model.ShowRel{})
 	if applyUID != "" {
 		findDB = findDB.Where("apply_uid = ? ", applyUID)
 	}
+	if showUID != "" {
+		findDB = findDB.Where("show_uid = ? ", showUID)
+	}
 	err = findDB.Find(&out).Error
 	if err != nil {
 		zap.L().Error("QueryShowRelList err", zap.Error(err))

cmd/model/artwork_price.go

@@ -8,6 +8,7 @@ type ArtworkPrice struct {
 	ArtworkPriceUID string `json:"artwork_price_uid" gorm:"artwork_price_uid"`
 	ShowUID         string `json:"show_uid" gorm:"show_uid"`               //  画展ID
 	ArtworkUID      string `json:"artwork_uid" gorm:"artwork_uid"`         //  画作ID
+	Tfnum           string `json:"tfnum" gorm:"tfnum"`                     //  画作编号
 	ArtworkName     string `json:"artwork_name" gorm:"artwork_name"`       //  画作名称
 	ArtistName      string `json:"artist_name" gorm:"artist_name"`         //  画家名称
 	SmallPic        string `json:"small_pic" gorm:"small_pic"`             //  画作小图
@@ -21,6 +22,6 @@ type ArtworkPrice struct {
 	CopyrightPrice  int64  `json:"copyright_price" gorm:"copyright_price"` //  版权价格
 	ArtistPrice     int64  `json:"artist_price" gorm:"artist_price"`       //  画家价格 (润格 * 平尺)
 	FloatPrice      int64  `json:"float_price" gorm:"float_price"`         //  浮动价格
-	Reward          int64  `json:"reward" gorm:"reward"`                   //  润格
+	Reward          string `json:"reward" gorm:"reward"`                   //  润格
 	SaleAddress     string `json:"sale_address" gorm:"sale_address"`       //  销售地址
 }

cmd/model/sale_address.go

@@ -0,0 +1,11 @@
+package model
+
+import "gorm.io/gorm"
+
+type SaleAddress struct {
+	gorm.Model
+	Address    string `json:"address" gorm:"address"`
+	ParentName string `json:"parent_name" gorm:"parent_name"`
+	Level      int    `json:"level" gorm:"level"`
+	StoreID    string `json:"store_id" gorm:"store_id"`
+}

cmd/service/art_show.go

@@ -141,7 +141,7 @@ func DelArtShow(in *artShow.DelShowReq) (err error) {
 	}
 	tx := db.DbArtShow.Begin()
 	for i := 0; i < len(shows); i++ {
-		if shows[i].IsShow != m.ARTSHOW_SHOWING {
+		if shows[i].IsShow < m.ARTSHOW_SALE_ADDRESS_PASS {
 			delArtShowErr := dao.DelArtShow(tx, shows[i].ShowUID)
 			if err != nil {
 				tx.Rollback()
@@ -201,7 +201,7 @@ func ShowArtworkInfo(in *artShow.ArtworkDetailReq) (err error, out *artShow.Show
 	if err != nil {
 		return
 	}
-	out.Data = serializer.BuildShowArtworkRpc(artworkPriceS)
+	out.Data = serializer.BuildShowArtworkListRpc(artworkPriceS)
 	return
 }
 
@@ -250,3 +250,47 @@ func QueryArtShowForArtwork(in *artShow.ShowListForArtworkReq) (err error, out *
 	}
 	return
 }
+
+/*
+  1、取消画展包 展出 , 状态 回退 到 2 (画展包可出展状态)
+ TODO
+  2、未做当前 画展包 状态检查  待确认 何种状态下 可以取消 (在 客户端 调用 画作系统 ，判断 画展包是否已 出库)
+*/
+func CancelShow(in *artShow.CancelShowReq) (err error) {
+	//  不删除 画展的画展包数量申请
+	tx := db.DbArtShow.Begin()
+
+	for i := 0; i < len(in.ShowUID); i++ {
+		// 删除  关联表
+		err = dao.DelShowReWithShowUID(tx, in.ShowUID[i])
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+		// 更新 画展包状态  为 可展
+		show := serializer.BuildArtShowIsShowM(in.ShowUID[i], m.ARTSHOW_PASS)
+		err = dao.UpdateArtShow(tx, show)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		// 删除相关 数据 (画作润格, 画作销售站点)
+		err = dao.UpdateArtworkInfoWithMap(tx, map[string]interface{}{"reward": "", "sale_address": ""}, in.ShowUID[i], "")
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	err = tx.Commit().Error
+	return
+}
+
+func QueryShowStatus(in *artShow.ShowStatusReq) (err error, out *artShow.ShowStatusRes) {
+	err, shows := dao.QueryArtShow(in.ShowUID)
+	if err != nil {
+		return
+	}
+	out = new(artShow.ShowStatusRes)
+	out.Status = serializer.BuildShowStatusRpc(shows)
+	return
+}

cmd/service/sale_address.go

@@ -0,0 +1,16 @@
+package service
+
+import (
+	"fonchain-artshow/cmd/dao"
+	"fonchain-artshow/pb/artShow"
+	"fonchain-artshow/pkg/serializer"
+)
+
+func QuerySaleAddress(in *artShow.SaleAddressReq) (out *artShow.SaleAddressRes, err error) {
+	address, err := dao.QuerySaleAddress(in)
+	if err != nil {
+		return nil, err
+	}
+	out = serializer.BuildSaleAddressRpc(address)
+	return
+}

cmd/service/show_apply.go

@@ -55,8 +55,8 @@ func UpdateShowApplyWithShowRel(in *artShow.SaveApplyReq) (err error, applyUID s
 		}
 
 		for i := 0; i < len(newShowRelS); i++ {
-			// 更新 画展包状态  为 已展
+			// 更新 画展包状态  为 画展包的画展地址和时间 通过
-			show := serializer.BuildArtShowIsShowM(newShowRelS[i].ShowUID, m.ARTSHOW_SHOWING)
+			show := serializer.BuildArtShowIsShowM(newShowRelS[i].ShowUID, m.ARTSHOW_SALE_ADDRESS_PASS)
 			err := dao.UpdateArtShow(tx, show)
 			if err != nil {
 				tx.Rollback()
@@ -81,7 +81,7 @@ func UpdateShowApplyWithShowRel(in *artShow.SaveApplyReq) (err error, applyUID s
 		}
 
 		// 删除关联记录
-		err = dao.DelShowRel(tx, del)
+		err = dao.DelShowRelWithUID(tx, del)
 		if err != nil {
 			tx.Rollback()
 			return err, showApply.ApplyUID
@@ -155,13 +155,13 @@ func DelApplyRelByApplyUID(in *artShow.DelApplyReq) (err error) {
 	tx := db.DbArtShow.Begin()
 
 	for i := 0; i < len(in.ApplyUID); i++ {
-		err = dao.DelShowRelByApplyUID(tx, in.ApplyUID[i])
+		err = dao.DelShowReWithApplyUID(tx, in.ApplyUID[i])
 		if err != nil {
 			tx.Rollback()
 			return
 		}
 
-		queryShowRelErr, showRels := dao.QueryShowRelList(in.ApplyUID[i])
+		queryShowRelErr, showRels := dao.QueryShowRelList(in.ApplyUID[i], "")
 		if queryShowRelErr != nil {
 			tx.Rollback()
 			return queryShowRelErr

cmd/service/show_price.go

@@ -1,9 +1,12 @@
 package service
 
 import (
+	"fmt"
 	"fonchain-artshow/cmd/dao"
 	"fonchain-artshow/cmd/model"
 	"fonchain-artshow/pb/artShow"
+	"fonchain-artshow/pkg/db"
+	"fonchain-artshow/pkg/m"
 	"fonchain-artshow/pkg/serializer"
 )
 
@@ -25,3 +28,59 @@ func ArtworkPriceList(in *artShow.ShowDetailReq) (err error, artworkPriceList []
 	}
 	return
 }
+
+func UpdateArtworkPriceReward(in *artShow.UpdateArtworkRewardReq) (err error) {
+
+	err, artworkPrice := dao.QueryArtworkPrice_uid(in.Data[0].ArtworkPriceUid)
+	if err != nil {
+		return err
+	}
+
+	tx := db.DbArtShow.Begin()
+
+	err = dao.UpdateArtShow(tx, &model.ArtShow{
+		ShowUID: artworkPrice.ShowUID,
+		IsShow:  m.ARTSHOW_REWARD_PASS,
+	})
+	if err != nil {
+		fmt.Println("update art_show err is :", err)
+		return err
+	}
+
+	for i := 0; i < len(in.Data); i++ {
+		err = dao.UpdateArtworkInfoWithMap(tx, map[string]interface{}{"reward": in.Data[i].Reward}, "", in.Data[i].ArtworkPriceUid)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	err = tx.Commit().Error
+	return err
+}
+
+func UpdateArtworkPriceSaleAddress(in *artShow.UpdateArtworkSaleAddressReq) (err error) {
+	err, artworkPrice := dao.QueryArtworkPrice_uid(in.Data[0].ArtworkPriceUid)
+	if err != nil {
+		return err
+	}
+
+	tx := db.DbArtShow.Begin()
+
+	err = dao.UpdateArtShow(tx, &model.ArtShow{
+		ShowUID: artworkPrice.ShowUID,
+		IsShow:  m.ARTSHOW_SALE_ADDRESS_PASS,
+	})
+	if err != nil {
+		fmt.Println("update art_show err is :", err)
+		return err
+	}
+	for i := 0; i < len(in.Data); i++ {
+		err = dao.UpdateArtworkInfoWithMap(tx, map[string]interface{}{"sale_address": in.Data[i].SaleAddress}, "", in.Data[i].ArtworkPriceUid)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	err = tx.Commit().Error
+	return err
+}

conf/conf.ini

@@ -14,8 +14,8 @@ mode = prod #正式prod #测试dev
 ;正式服 192.168.12.3  old
 ;[mysql]
 ;Db = mysql
-;DbHost = mysql
+;DbHost = 192.168.12.3
-;DbPort = 3306
+;DbPort = 9005
 ;DbUser = root
 ;DbPassWord = sLl0b7stlbwvZ883TV
 ;DbName = art_show

pb/artShow/artshow.validator.pb.go

@@ -222,3 +222,64 @@ func (this *UpdateApplyStatusReq) Validate() error {
 func (this *DelApplyReq) Validate() error {
 	return nil
 }
+func (this *CancelShowReq) Validate() error {
+	return nil
+}
+func (this *ArtworkReward) Validate() error {
+	return nil
+}
+func (this *UpdateArtworkRewardReq) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *ArtworkSaleAddress) Validate() error {
+	return nil
+}
+func (this *UpdateArtworkSaleAddressReq) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *ShowStatusReq) Validate() error {
+	return nil
+}
+func (this *ShowStatus) Validate() error {
+	return nil
+}
+func (this *ShowStatusRes) Validate() error {
+	for _, item := range this.Status {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Status", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *SaleAddressReq) Validate() error {
+	return nil
+}
+func (this *SaleAddress) Validate() error {
+	return nil
+}
+func (this *SaleAddressRes) Validate() error {
+	for _, item := range this.Address {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Address", err)
+			}
+		}
+	}
+	return nil
+}

pb/artShow/artshow_triple.pb.go

@@ -46,6 +46,11 @@ type ArtShowClient interface {
 	ApplyList(ctx context.Context, in *ApplyListReq, opts ...grpc_go.CallOption) (*ApplyListRes, common.ErrorWithAttachment)
 	ApplyDetail(ctx context.Context, in *ApplyShowReq, opts ...grpc_go.CallOption) (*ApplyShowRes, common.ErrorWithAttachment)
 	ArtworkPriceList(ctx context.Context, in *ShowDetailReq, opts ...grpc_go.CallOption) (*ArtworkPriceListRes, common.ErrorWithAttachment)
+	CancelShow(ctx context.Context, in *CancelShowReq, opts ...grpc_go.CallOption) (*CommonRes, common.ErrorWithAttachment)
+	UpdateArtworkReward(ctx context.Context, in *UpdateArtworkRewardReq, opts ...grpc_go.CallOption) (*CommonRes, common.ErrorWithAttachment)
+	UpdateArtworkSaleAddress(ctx context.Context, in *UpdateArtworkSaleAddressReq, opts ...grpc_go.CallOption) (*CommonRes, common.ErrorWithAttachment)
+	QueryShowStatus(ctx context.Context, in *ShowStatusReq, opts ...grpc_go.CallOption) (*ShowStatusRes, common.ErrorWithAttachment)
+	QuerySaleAddress(ctx context.Context, in *SaleAddressReq, opts ...grpc_go.CallOption) (*SaleAddressRes, common.ErrorWithAttachment)
 }
 
 type artShowClient struct {
@@ -53,24 +58,29 @@ type artShowClient struct {
 }
 
 type ArtShowClientImpl struct {
-	CreateShow          func(ctx context.Context, in *SaveShowReq) (*SaveShowRes, error)
+	CreateShow               func(ctx context.Context, in *SaveShowReq) (*SaveShowRes, error)
-	UpdateShow          func(ctx context.Context, in *SaveShowReq) (*SaveShowRes, error)
+	UpdateShow               func(ctx context.Context, in *SaveShowReq) (*SaveShowRes, error)
-	DelShow             func(ctx context.Context, in *DelShowReq) (*CommonRes, error)
+	DelShow                  func(ctx context.Context, in *DelShowReq) (*CommonRes, error)
-	ShowList            func(ctx context.Context, in *ShowListReq) (*ShowListRes, error)
+	ShowList                 func(ctx context.Context, in *ShowListReq) (*ShowListRes, error)
-	ShowListWithRel     func(ctx context.Context, in *ShowListReq) (*ShowListRes, error)
+	ShowListWithRel          func(ctx context.Context, in *ShowListReq) (*ShowListRes, error)
-	ShowListForArtwork  func(ctx context.Context, in *ShowListForArtworkReq) (*ShowListForArtworkRes, error)
+	ShowListForArtwork       func(ctx context.Context, in *ShowListForArtworkReq) (*ShowListForArtworkRes, error)
-	ShowArtworkInfo     func(ctx context.Context, in *ArtworkDetailReq) (*ShowArtworkDetailRes, error)
+	ShowArtworkInfo          func(ctx context.Context, in *ArtworkDetailReq) (*ShowArtworkDetailRes, error)
-	ShowDetail          func(ctx context.Context, in *ShowDetailReq) (*ShowDetailRes, error)
+	ShowDetail               func(ctx context.Context, in *ShowDetailReq) (*ShowDetailRes, error)
-	ShowStatisticalInfo func(ctx context.Context, in *ShowStatisticalInfoReq) (*ShowStatisticalInfoRes, error)
+	ShowStatisticalInfo      func(ctx context.Context, in *ShowStatisticalInfoReq) (*ShowStatisticalInfoRes, error)
-	ArtworkPrice        func(ctx context.Context, in *ArtworkPriceReq) (*ArtworkPriceRes, error)
+	ArtworkPrice             func(ctx context.Context, in *ArtworkPriceReq) (*ArtworkPriceRes, error)
-	CreateApply         func(ctx context.Context, in *SaveApplyReq) (*SaveApplyRes, error)
+	CreateApply              func(ctx context.Context, in *SaveApplyReq) (*SaveApplyRes, error)
-	UpdateApply         func(ctx context.Context, in *SaveApplyReq) (*SaveApplyRes, error)
+	UpdateApply              func(ctx context.Context, in *SaveApplyReq) (*SaveApplyRes, error)
-	DelApply            func(ctx context.Context, in *DelApplyReq) (*CommonRes, error)
+	DelApply                 func(ctx context.Context, in *DelApplyReq) (*CommonRes, error)
-	ShowListWithApply   func(ctx context.Context, in *ShowListReq) (*ShowListRes, error)
+	ShowListWithApply        func(ctx context.Context, in *ShowListReq) (*ShowListRes, error)
-	UpdateApplyStatus   func(ctx context.Context, in *UpdateApplyStatusReq) (*CommonRes, error)
+	UpdateApplyStatus        func(ctx context.Context, in *UpdateApplyStatusReq) (*CommonRes, error)
-	ApplyList           func(ctx context.Context, in *ApplyListReq) (*ApplyListRes, error)
+	ApplyList                func(ctx context.Context, in *ApplyListReq) (*ApplyListRes, error)
-	ApplyDetail         func(ctx context.Context, in *ApplyShowReq) (*ApplyShowRes, error)
+	ApplyDetail              func(ctx context.Context, in *ApplyShowReq) (*ApplyShowRes, error)
-	ArtworkPriceList    func(ctx context.Context, in *ShowDetailReq) (*ArtworkPriceListRes, error)
+	ArtworkPriceList         func(ctx context.Context, in *ShowDetailReq) (*ArtworkPriceListRes, error)
+	CancelShow               func(ctx context.Context, in *CancelShowReq) (*CommonRes, error)
+	UpdateArtworkReward      func(ctx context.Context, in *UpdateArtworkRewardReq) (*CommonRes, error)
+	UpdateArtworkSaleAddress func(ctx context.Context, in *UpdateArtworkSaleAddressReq) (*CommonRes, error)
+	QueryShowStatus          func(ctx context.Context, in *ShowStatusReq) (*ShowStatusRes, error)
+	QuerySaleAddress         func(ctx context.Context, in *SaleAddressReq) (*SaleAddressRes, error)
 }
 
 func (c *ArtShowClientImpl) GetDubboStub(cc *triple.TripleConn) ArtShowClient {
@@ -193,6 +203,36 @@ func (c *artShowClient) ArtworkPriceList(ctx context.Context, in *ShowDetailReq,
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ArtworkPriceList", in, out)
 }
 
+func (c *artShowClient) CancelShow(ctx context.Context, in *CancelShowReq, opts ...grpc_go.CallOption) (*CommonRes, common.ErrorWithAttachment) {
+	out := new(CommonRes)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CancelShow", in, out)
+}
+
+func (c *artShowClient) UpdateArtworkReward(ctx context.Context, in *UpdateArtworkRewardReq, opts ...grpc_go.CallOption) (*CommonRes, common.ErrorWithAttachment) {
+	out := new(CommonRes)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UpdateArtworkReward", in, out)
+}
+
+func (c *artShowClient) UpdateArtworkSaleAddress(ctx context.Context, in *UpdateArtworkSaleAddressReq, opts ...grpc_go.CallOption) (*CommonRes, common.ErrorWithAttachment) {
+	out := new(CommonRes)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UpdateArtworkSaleAddress", in, out)
+}
+
+func (c *artShowClient) QueryShowStatus(ctx context.Context, in *ShowStatusReq, opts ...grpc_go.CallOption) (*ShowStatusRes, common.ErrorWithAttachment) {
+	out := new(ShowStatusRes)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/QueryShowStatus", in, out)
+}
+
+func (c *artShowClient) QuerySaleAddress(ctx context.Context, in *SaleAddressReq, opts ...grpc_go.CallOption) (*SaleAddressRes, common.ErrorWithAttachment) {
+	out := new(SaleAddressRes)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/QuerySaleAddress", in, out)
+}
+
 // ArtShowServer is the server API for ArtShow service.
 // All implementations must embed UnimplementedArtShowServer
 // for forward compatibility
@@ -215,6 +255,11 @@ type ArtShowServer interface {
 	ApplyList(context.Context, *ApplyListReq) (*ApplyListRes, error)
 	ApplyDetail(context.Context, *ApplyShowReq) (*ApplyShowRes, error)
 	ArtworkPriceList(context.Context, *ShowDetailReq) (*ArtworkPriceListRes, error)
+	CancelShow(context.Context, *CancelShowReq) (*CommonRes, error)
+	UpdateArtworkReward(context.Context, *UpdateArtworkRewardReq) (*CommonRes, error)
+	UpdateArtworkSaleAddress(context.Context, *UpdateArtworkSaleAddressReq) (*CommonRes, error)
+	QueryShowStatus(context.Context, *ShowStatusReq) (*ShowStatusRes, error)
+	QuerySaleAddress(context.Context, *SaleAddressReq) (*SaleAddressRes, error)
 	mustEmbedUnimplementedArtShowServer()
 }
 
@@ -277,6 +322,21 @@ func (UnimplementedArtShowServer) ApplyDetail(context.Context, *ApplyShowReq) (*
 func (UnimplementedArtShowServer) ArtworkPriceList(context.Context, *ShowDetailReq) (*ArtworkPriceListRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ArtworkPriceList not implemented")
 }
+func (UnimplementedArtShowServer) CancelShow(context.Context, *CancelShowReq) (*CommonRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CancelShow not implemented")
+}
+func (UnimplementedArtShowServer) UpdateArtworkReward(context.Context, *UpdateArtworkRewardReq) (*CommonRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateArtworkReward not implemented")
+}
+func (UnimplementedArtShowServer) UpdateArtworkSaleAddress(context.Context, *UpdateArtworkSaleAddressReq) (*CommonRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateArtworkSaleAddress not implemented")
+}
+func (UnimplementedArtShowServer) QueryShowStatus(context.Context, *ShowStatusReq) (*ShowStatusRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QueryShowStatus not implemented")
+}
+func (UnimplementedArtShowServer) QuerySaleAddress(context.Context, *SaleAddressReq) (*SaleAddressRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QuerySaleAddress not implemented")
+}
 func (s *UnimplementedArtShowServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -827,6 +887,151 @@ func _ArtShow_ArtworkPriceList_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ArtShow_CancelShow_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelShowReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("CancelShow", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_UpdateArtworkReward_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateArtworkRewardReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("UpdateArtworkReward", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_UpdateArtworkSaleAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateArtworkSaleAddressReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("UpdateArtworkSaleAddress", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_QueryShowStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ShowStatusReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("QueryShowStatus", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_QuerySaleAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SaleAddressReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("QuerySaleAddress", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // ArtShow_ServiceDesc is the grpc_go.ServiceDesc for ArtShow service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -906,6 +1111,26 @@ var ArtShow_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "ArtworkPriceList",
 			Handler:    _ArtShow_ArtworkPriceList_Handler,
 		},
+		{
+			MethodName: "CancelShow",
+			Handler:    _ArtShow_CancelShow_Handler,
+		},
+		{
+			MethodName: "UpdateArtworkReward",
+			Handler:    _ArtShow_UpdateArtworkReward_Handler,
+		},
+		{
+			MethodName: "UpdateArtworkSaleAddress",
+			Handler:    _ArtShow_UpdateArtworkSaleAddress_Handler,
+		},
+		{
+			MethodName: "QueryShowStatus",
+			Handler:    _ArtShow_QueryShowStatus_Handler,
+		},
+		{
+			MethodName: "QuerySaleAddress",
+			Handler:    _ArtShow_QuerySaleAddress_Handler,
+		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
 	Metadata: "pb/artshow.proto",

pb/artshow.proto

@@ -22,6 +22,11 @@ service  ArtShow {
       rpc  ApplyList (ApplyListReq) returns (ApplyListRes) {} // 画展包申请列表
       rpc  ApplyDetail (ApplyShowReq) returns (ApplyShowRes) {} // 画展包申请列表
       rpc  ArtworkPriceList (ShowDetailReq) returns (ArtworkPriceListRes) {} // 画作详情列表
+      rpc  CancelShow (CancelShowReq) returns (CommonRes) {}   // 画展包取消展出
+      rpc  UpdateArtworkReward(UpdateArtworkRewardReq) returns (CommonRes) {} // 更新 画作润格
+      rpc  UpdateArtworkSaleAddress(UpdateArtworkSaleAddressReq) returns (CommonRes) {} // 更新 画作销售地址
+      rpc  QueryShowStatus(ShowStatusReq) returns (ShowStatusRes) {} // 查询 画展包状态
+      rpc  QuerySaleAddress(SaleAddressReq) returns (SaleAddressRes) {} // 画作 销售地址查询
 }
 
 // 创建 更新画展包
@@ -89,7 +94,7 @@ message ShowDetailRes {
 }
 
 message ShowArtworkDetailRes {
-      repeated ArtworkDetail  data = 1 [json_name = "data"];
+      repeated ArtworkPriceDetail  data = 1 [json_name = "data"];
       string Msg = 2 [json_name = "msg"];
 }
 
@@ -150,6 +155,7 @@ message ArtworkDetail {
       int32   Width       = 7 [json_name = "width"];
       int32   Ruler = 8 [json_name = "ruler"];
       string  SmallPic  = 9 [json_name = "small_pic"];
+      string  Tfnum = 10 [json_name = "tfnum"];
 }
 
 // 画作详情
@@ -168,6 +174,9 @@ message ArtworkPriceDetail {
       int64   ArtworkPrice = 12 [json_name = "artwork_price"];
       int64   MarketPrice = 13 [json_name = "market_price"];
       int64   CopyrightPrice = 14 [json_name = "copyright_price"];
+      string  Tfnum = 15 [json_name = "tfnum"];
+      string  Reward = 16 [json_name = "reward"];
+      string  SaleAddress = 17 [json_name = "sale_address"];
 }
 
 message ArtworkPriceListRes {
@@ -210,6 +219,7 @@ message ArtworkPriceRes  {
             int64 ArtworkPrice = 3 [json_name = "artwork_price"];
             int64 MarketPrice = 4 [json_name = "market_price"];
             int64 CopyrightPrice = 5 [json_name = "copyright_price"];
+            int64 Reward = 6 [json_name = "reward"];
       }
       PriceInfo Data = 1 [json_name = "data"];
       string Msg = 2 [json_name = "msg"];
@@ -300,3 +310,54 @@ message UpdateApplyStatusReq {
 message DelApplyReq {
       repeated  string  ApplyUID = 1 [json_name = "apply_uid"];
 }
+
+
+message CancelShowReq {
+     repeated string   ShowUID = 1 [json_name = "show_uid"];
+}
+
+message ArtworkReward {
+      string ArtworkPriceUid = 1 [json_name = "artwork_price_uid"];
+      string  Reward = 2 [json_name = "reward"];
+}
+
+message UpdateArtworkRewardReq {
+      repeated ArtworkReward data = 1 [json_name = "data"];
+}
+
+message ArtworkSaleAddress {
+      string ArtworkPriceUid = 1 [json_name = "artwork_price_uid"];
+      string  SaleAddress = 2 [json_name = "sale_address"];
+}
+
+message UpdateArtworkSaleAddressReq {
+      repeated ArtworkSaleAddress data = 1 [json_name = "data"];
+}
+
+message ShowStatusReq {
+      repeated  string  ShowUID = 1 [json_name = "show_uid"];
+}
+
+message  ShowStatus {
+      string  ShowUID = 1 [json_name = "show_uid"];
+      int32  IsShow = 2 [json_name = "is_show"];
+}
+
+message  ShowStatusRes {
+      repeated  ShowStatus Status = 1 [json_name = "status"];
+}
+
+
+message SaleAddressReq {
+      string  ParentName = 1 [json_name = "parent_name"];
+}
+
+message SaleAddress {
+      string Address  = 1 [json_name = "address"];
+      string StoreID = 2 [json_name = "store_id"];
+}
+
+message SaleAddressRes {
+      repeated SaleAddress Address = 1 [json_name = "address"];
+      string Msg = 2 [json_name = "msg"];
+}

pb/grpc/artshow_grpc.pb.go

@@ -41,6 +41,11 @@ type ArtShowClient interface {
 	ApplyList(ctx context.Context, in *artShow.ApplyListReq, opts ...grpc.CallOption) (*artShow.ApplyListRes, error)
 	ApplyDetail(ctx context.Context, in *artShow.ApplyShowReq, opts ...grpc.CallOption) (*artShow.ApplyShowRes, error)
 	ArtworkPriceList(ctx context.Context, in *artShow.ShowDetailReq, opts ...grpc.CallOption) (*artShow.ArtworkPriceListRes, error)
+	CancelShow(ctx context.Context, in *artShow.CancelShowReq, opts ...grpc.CallOption) (*artShow.CommonRes, error)
+	UpdateArtworkReward(ctx context.Context, in *artShow.UpdateArtworkRewardReq, opts ...grpc.CallOption) (*artShow.CommonRes, error)
+	UpdateArtworkSaleAddress(ctx context.Context, in *artShow.UpdateArtworkSaleAddressReq, opts ...grpc.CallOption) (*artShow.CommonRes, error)
+	QueryShowStatus(ctx context.Context, in *artShow.ShowStatusReq, opts ...grpc.CallOption) (*artShow.ShowStatusRes, error)
+	QuerySaleAddress(ctx context.Context, in *artShow.SaleAddressReq, opts ...grpc.CallOption) (*artShow.SaleAddressRes, error)
 }
 
 type artShowClient struct {
@@ -213,6 +218,51 @@ func (c *artShowClient) ArtworkPriceList(ctx context.Context, in *artShow.ShowDe
 	return out, nil
 }
 
+func (c *artShowClient) CancelShow(ctx context.Context, in *artShow.CancelShowReq, opts ...grpc.CallOption) (*artShow.CommonRes, error) {
+	out := new(artShow.CommonRes)
+	err := c.cc.Invoke(ctx, "/ArtShow.ArtShow/CancelShow", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *artShowClient) UpdateArtworkReward(ctx context.Context, in *artShow.UpdateArtworkRewardReq, opts ...grpc.CallOption) (*artShow.CommonRes, error) {
+	out := new(artShow.CommonRes)
+	err := c.cc.Invoke(ctx, "/ArtShow.ArtShow/UpdateArtworkReward", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *artShowClient) UpdateArtworkSaleAddress(ctx context.Context, in *artShow.UpdateArtworkSaleAddressReq, opts ...grpc.CallOption) (*artShow.CommonRes, error) {
+	out := new(artShow.CommonRes)
+	err := c.cc.Invoke(ctx, "/ArtShow.ArtShow/UpdateArtworkSaleAddress", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *artShowClient) QueryShowStatus(ctx context.Context, in *artShow.ShowStatusReq, opts ...grpc.CallOption) (*artShow.ShowStatusRes, error) {
+	out := new(artShow.ShowStatusRes)
+	err := c.cc.Invoke(ctx, "/ArtShow.ArtShow/QueryShowStatus", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *artShowClient) QuerySaleAddress(ctx context.Context, in *artShow.SaleAddressReq, opts ...grpc.CallOption) (*artShow.SaleAddressRes, error) {
+	out := new(artShow.SaleAddressRes)
+	err := c.cc.Invoke(ctx, "/ArtShow.ArtShow/QuerySaleAddress", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ArtShowServer is the server API for ArtShow service.
 // All implementations must embed UnimplementedArtShowServer
 // for forward compatibility
@@ -235,6 +285,11 @@ type ArtShowServer interface {
 	ApplyList(context.Context, *artShow.ApplyListReq) (*artShow.ApplyListRes, error)
 	ApplyDetail(context.Context, *artShow.ApplyShowReq) (*artShow.ApplyShowRes, error)
 	ArtworkPriceList(context.Context, *artShow.ShowDetailReq) (*artShow.ArtworkPriceListRes, error)
+	CancelShow(context.Context, *artShow.CancelShowReq) (*artShow.CommonRes, error)
+	UpdateArtworkReward(context.Context, *artShow.UpdateArtworkRewardReq) (*artShow.CommonRes, error)
+	UpdateArtworkSaleAddress(context.Context, *artShow.UpdateArtworkSaleAddressReq) (*artShow.CommonRes, error)
+	QueryShowStatus(context.Context, *artShow.ShowStatusReq) (*artShow.ShowStatusRes, error)
+	QuerySaleAddress(context.Context, *artShow.SaleAddressReq) (*artShow.SaleAddressRes, error)
 	mustEmbedUnimplementedArtShowServer()
 }
 
@@ -296,6 +351,21 @@ func (UnimplementedArtShowServer) ApplyDetail(context.Context, *artShow.ApplySho
 func (UnimplementedArtShowServer) ArtworkPriceList(context.Context, *artShow.ShowDetailReq) (*artShow.ArtworkPriceListRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ArtworkPriceList not implemented")
 }
+func (UnimplementedArtShowServer) CancelShow(context.Context, *artShow.CancelShowReq) (*artShow.CommonRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CancelShow not implemented")
+}
+func (UnimplementedArtShowServer) UpdateArtworkReward(context.Context, *artShow.UpdateArtworkRewardReq) (*artShow.CommonRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateArtworkReward not implemented")
+}
+func (UnimplementedArtShowServer) UpdateArtworkSaleAddress(context.Context, *artShow.UpdateArtworkSaleAddressReq) (*artShow.CommonRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateArtworkSaleAddress not implemented")
+}
+func (UnimplementedArtShowServer) QueryShowStatus(context.Context, *artShow.ShowStatusReq) (*artShow.ShowStatusRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QueryShowStatus not implemented")
+}
+func (UnimplementedArtShowServer) QuerySaleAddress(context.Context, *artShow.SaleAddressReq) (*artShow.SaleAddressRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QuerySaleAddress not implemented")
+}
 func (UnimplementedArtShowServer) mustEmbedUnimplementedArtShowServer() {}
 
 // UnsafeArtShowServer may be embedded to opt out of forward compatibility for this service.
@@ -633,6 +703,96 @@ func _ArtShow_ArtworkPriceList_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ArtShow_CancelShow_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(artShow.CancelShowReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ArtShowServer).CancelShow(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ArtShow.ArtShow/CancelShow",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ArtShowServer).CancelShow(ctx, req.(*artShow.CancelShowReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_UpdateArtworkReward_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(artShow.UpdateArtworkRewardReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ArtShowServer).UpdateArtworkReward(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ArtShow.ArtShow/UpdateArtworkReward",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ArtShowServer).UpdateArtworkReward(ctx, req.(*artShow.UpdateArtworkRewardReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_UpdateArtworkSaleAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(artShow.UpdateArtworkSaleAddressReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ArtShowServer).UpdateArtworkSaleAddress(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ArtShow.ArtShow/UpdateArtworkSaleAddress",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ArtShowServer).UpdateArtworkSaleAddress(ctx, req.(*artShow.UpdateArtworkSaleAddressReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_QueryShowStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(artShow.ShowStatusReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ArtShowServer).QueryShowStatus(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ArtShow.ArtShow/QueryShowStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ArtShowServer).QueryShowStatus(ctx, req.(*artShow.ShowStatusReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ArtShow_QuerySaleAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(artShow.SaleAddressReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ArtShowServer).QuerySaleAddress(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/ArtShow.ArtShow/QuerySaleAddress",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ArtShowServer).QuerySaleAddress(ctx, req.(*artShow.SaleAddressReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // ArtShow_ServiceDesc is the grpc.ServiceDesc for ArtShow service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -712,6 +872,26 @@ var ArtShow_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ArtworkPriceList",
 			Handler:    _ArtShow_ArtworkPriceList_Handler,
 		},
+		{
+			MethodName: "CancelShow",
+			Handler:    _ArtShow_CancelShow_Handler,
+		},
+		{
+			MethodName: "UpdateArtworkReward",
+			Handler:    _ArtShow_UpdateArtworkReward_Handler,
+		},
+		{
+			MethodName: "UpdateArtworkSaleAddress",
+			Handler:    _ArtShow_UpdateArtworkSaleAddress_Handler,
+		},
+		{
+			MethodName: "QueryShowStatus",
+			Handler:    _ArtShow_QueryShowStatus_Handler,
+		},
+		{
+			MethodName: "QuerySaleAddress",
+			Handler:    _ArtShow_QuerySaleAddress_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "pb/artshow.proto",

pkg/m/msg.go

@@ -30,9 +30,11 @@ const (
 
 // 画展包及画展包申请状态码定义
 const (
-	ARTSHOW_INSIDE  = iota + 1 // 内部
+	ARTSHOW_INSIDE = iota + 1 // 内部
-	ARTSHOW_PASS               // 可展
+	ARTSHOW_PASS              // 可展
-	ARTSHOW_SHOWING            // 已展
+	//ARTSHOW_SHOW_PASS                    // 画展包的画展地址和时间 审批
+	ARTSHOW_SALE_ADDRESS_PASS // 画展包中画作的销售地址 审批
+	ARTSHOW_REWARD_PASS       // 润格 审批
 )
 
 const (

pkg/serializer/art_show.go

@@ -63,3 +63,14 @@ func BuildArtShowIsShowM(show_uid string, isShow int8) (out *model.ArtShow) {
 	out.IsShow = isShow
 	return
 }
+
+func BuildShowStatusRpc(in []*model.ArtShowRes) (out []*artShow.ShowStatus) {
+	out = make([]*artShow.ShowStatus, 0)
+	for i := 0; i < len(in); i++ {
+		out = append(out, &artShow.ShowStatus{
+			ShowUID: in[i].ShowUID,
+			IsShow:  int32(in[i].IsShow),
+		})
+	}
+	return out
+}

pkg/serializer/artwork_price.go

@@ -3,6 +3,7 @@ package serializer
 import (
 	"fonchain-artshow/cmd/model"
 	"fonchain-artshow/pb/artShow"
+	"strconv"
 )
 
 func BuildShowArtworkM(in []*artShow.ArtworkDetail, showUID string) (out []*model.ArtworkPrice) {
@@ -10,6 +11,7 @@ func BuildShowArtworkM(in []*artShow.ArtworkDetail, showUID string) (out []*mode
 	for i := 0; i < len(in); i++ {
 		artworkPrice := new(model.ArtworkPrice)
 		artworkPrice.ArtworkUID = in[i].ArtworkUID
+		artworkPrice.Tfnum = in[i].Tfnum
 		artworkPrice.ArtworkName = in[i].ArtworkName
 		artworkPrice.ArtistName = in[i].ArtistName
 		artworkPrice.SmallPic = in[i].SmallPic
@@ -52,6 +54,7 @@ func BuildShowArtworkRpc(in []*model.ArtworkPrice) (out []*artShow.ArtworkDetail
 		artworkPrice.ArtworkPriceUID = in[i].ArtworkPriceUID
 		artworkPrice.ShowUID = in[i].ShowUID
 		artworkPrice.ArtworkUID = in[i].ArtworkUID
+		artworkPrice.Tfnum = in[i].Tfnum
 		artworkPrice.ArtworkName = in[i].ArtworkName
 		artworkPrice.ArtistName = in[i].ArtistName
 		artworkPrice.SmallPic = in[i].SmallPic
@@ -82,6 +85,9 @@ func BuildShowArtworkListRpc(in []*model.ArtworkPrice) (out []*artShow.ArtworkPr
 		artworkPrice.ArtworkPrice = in[i].ArtworkPrice
 		artworkPrice.MarketPrice = in[i].MarketPrice
 		artworkPrice.CopyrightPrice = in[i].CopyrightPrice
+		artworkPrice.Tfnum = in[i].Tfnum
+		artworkPrice.Reward = in[i].Reward
+		artworkPrice.SaleAddress = in[i].SaleAddress
 
 		out[i] = artworkPrice
 	}
@@ -96,6 +102,11 @@ func BuildArtworkPriceRes(artworkPrice *model.ArtworkPrice) (out *artShow.Artwor
 	out.Data.ArtworkPrice = artworkPrice.ArtworkPrice
 	out.Data.MarketPrice = artworkPrice.MarketPrice
 	out.Data.CopyrightPrice = artworkPrice.CopyrightPrice
+	if artworkPrice.Reward == "" {
+		out.Data.Reward = 0
+	} else {
+		out.Data.Reward, _ = strconv.ParseInt(artworkPrice.Reward, 10, 64)
+	}
 	return
 }
 

pkg/serializer/sale_address.go

@@ -0,0 +1,19 @@
+package serializer
+
+import (
+	"fmt"
+	"fonchain-artshow/cmd/model"
+	"fonchain-artshow/pb/artShow"
+)
+
+func BuildSaleAddressRpc(in []*model.SaleAddress) (out *artShow.SaleAddressRes) {
+	out = new(artShow.SaleAddressRes)
+	for i := 0; i < len(in); i++ {
+		fmt.Println(in[i])
+		out.Address = append(out.Address, &artShow.SaleAddress{
+			Address: in[i].Address,
+			StoreID: in[i].StoreID,
+		})
+	}
+	return
+}