diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index bdeaf0fa4..c0710c4c7 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -51,7 +51,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb need[i] = &cfg.Game_atn{ A: v.A, T: v.T, - N: int32(math.Ceil(float64(v.N) * float64(conf.Sale) / float64(100))), + N: int32(math.Ceil(float64(v.N) * float64(conf.Sale) / float64(1000))), } } diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 50610f544..07b8ac4a8 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -31,11 +31,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) tdata time.Duration ltime time.Duration ) - defer func() { - if code == pb.ErrorCode_Success { - session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{Goods: goods}) - } - }() + if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil && err != mgo.MongodbNil { code = pb.ErrorCode_SystemError return @@ -138,7 +134,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) } } else { code = pb.ErrorCode_ReqParameterError + return } - + session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{Goods: goods}) return } diff --git a/modules/shop/core.go b/modules/shop/core.go index c11532cf4..15cab6075 100644 --- a/modules/shop/core.go +++ b/modules/shop/core.go @@ -4,6 +4,7 @@ import ( "crypto/rand" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "math" "math/big" ) @@ -56,7 +57,7 @@ func transGoods(goods []*cfg.Game_shopitemData, ushoputem map[int32]*pb.DBShopIt result[i].Consume[i1] = &pb.UserAssets{ A: v1.A, T: v1.T, - N: v1.N, + N: int32(math.Ceil(float64(v1.N) * float64(v.Sale) / float64(1000))), } } }