diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index b82fcf907..c01094b6e 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -25,11 +25,14 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err var ( rewardId int32 atno []*pb.UserAtno + recycle []*pb.UserAtno ) //校验customer类型,因为有的类型是不能进入交易逻辑的 - this.module.ModuleEquipment.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId())) - + if errdata, recycle = this.module.ModuleEquipment.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId())); errdata != nil { + return + } + atno = append(atno, recycle...) cus, rewardId, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId) if err != nil { var customErr = new(comm.CustomError) @@ -55,10 +58,10 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err } // 发奖励 - if errdata, atno = this.module.DispenseAtno(session, conf.Reword, true); errdata != nil { + if errdata, recycle = this.module.DispenseAtno(session, conf.Reword, true); errdata != nil { return } - + atno = append(atno, recycle...) rsp := &pb.SmithySellResp{ CustomerId: req.CustomerId, EquipIds: req.EquipIds,