From e6d1b90338eed969e337c0d8fbd960c003aec1e7 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Wed, 19 Jun 2024 13:58:47 +0800 Subject: [PATCH] by Robin at 20240619 --- api/consts/option.go | 8 ++ api/errcode/errcode.go | 8 ++ api/proto/hvyogo/proto/hvyogo_ext.go | 5 + api/proto/hvyogo/proto/hvyogo_vo.go | 11 ++ .../proto/single_distribute_his_op.go | 66 +++++++++++ app/mix/controller/hvyogo_callback.go | 17 ++- app/mix/controller/init.go | 8 ++ .../controller/single_distribute_his_op.go | 73 ++++++++++++ app/mix/dao/mongo.go | 52 +++++++++ app/mix/service/apiservice.go | 27 ++++- app/mix/service/hvyogoservice.go | 17 ++- .../service/logic/single_distribute_his.go | 65 +++++++++++ app/mix/service/service.go | 107 +++++++++++++++++- codecreate/codecreate.go | 8 +- codecreate/resource/EntityDefine.xlsx | Bin 53381 -> 54764 bytes dbstruct/single_distribute_his.go | 23 ++++ library/idgenerator/genid.go | 7 ++ 17 files changed, 492 insertions(+), 10 deletions(-) create mode 100644 api/proto/single_distribute_his/proto/single_distribute_his_op.go create mode 100644 app/mix/controller/single_distribute_his_op.go create mode 100644 app/mix/service/logic/single_distribute_his.go create mode 100644 dbstruct/single_distribute_his.go diff --git a/api/consts/option.go b/api/consts/option.go index 33637af5..b407cd61 100644 --- a/api/consts/option.go +++ b/api/consts/option.go @@ -63,3 +63,11 @@ const ( const ( StreamerAcct_MatchPhraseLen = 3 ) + +const ( + BankCard = 10 //银行卡 + Alipay = 20 //支付宝 + Weixin = 30 //微信 + MerchantWeixin = 40 //商户方微信 + CPAccount = 51 //中金支付电子账户 +) diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go index 506ce95c..4da010af 100644 --- a/api/errcode/errcode.go +++ b/api/errcode/errcode.go @@ -215,6 +215,9 @@ var ErrCodeMsgMap = map[ErrCode]string{ ErrCodeWorkerIdSrvFail: "用户职业者id映射表服务错误", ErrCodeWorkerIdNotExist: "用户职业者id映射表不存在", + ErrCodeSingleDistributeHisSrvFail: "慧用工下发打款历史表服务错误", + ErrCodeSingleDistributeHisNotExist: "慧用工下发打款历史表不存在", + ErrCodeHvyogoSrvFail: "慧用工接口服务错误", } @@ -515,6 +518,11 @@ const ( ErrCodeWorkerIdSrvFail ErrCode = -41001 // 用户职业者id映射表服务错误 ErrCodeWorkerIdNotExist ErrCode = -41002 // 用户职业者id映射表不存在 + // SingleDistributeHis: 42xxx + ErrCodeSingleDistributeHisSrvOk ErrCode = ErrCodeOk + ErrCodeSingleDistributeHisSrvFail ErrCode = -42001 // 慧用工下发打款历史表服务错误 + ErrCodeSingleDistributeHisNotExist ErrCode = -42002 // 慧用工下发打款历史表不存在 + // Media: 60xxx ErrCodeMediaSrvOk ErrCode = ErrCodeOk ErrCodeMediaSrvFail ErrCode = -60001 // 媒体服务错误 diff --git a/api/proto/hvyogo/proto/hvyogo_ext.go b/api/proto/hvyogo/proto/hvyogo_ext.go index 2d622d59..199c0bd5 100644 --- a/api/proto/hvyogo/proto/hvyogo_ext.go +++ b/api/proto/hvyogo/proto/hvyogo_ext.go @@ -4,3 +4,8 @@ type ExtAgreeCallbackReq struct { CooperatorId string `json:"cooperatorId"` // 商户对接唯一标识 BusinessBody string `json:"businessBody"` // AES加密后的字符串 } + +type ExtSingleDistributeCallbackReq struct { + CooperatorId string `json:"cooperatorId"` // 商户对接唯一标识 + BusinessBody string `json:"businessBody"` // AES加密后的字符串 +} diff --git a/api/proto/hvyogo/proto/hvyogo_vo.go b/api/proto/hvyogo/proto/hvyogo_vo.go index f556c30e..7d514be0 100644 --- a/api/proto/hvyogo/proto/hvyogo_vo.go +++ b/api/proto/hvyogo/proto/hvyogo_vo.go @@ -7,6 +7,17 @@ type ExtAgreeCallbackVO struct { WorkerMobile string `json:"workerMobile"` // 自由职业者手机号 } +type ExtSingleDistributeCallbackVO struct { + RequestNo string `json:"request_no"` //商户下发请求单号 + DistributeId string `json:"distribute_id"` //慧用工平台处理单号 + DistributeStatus int `json:"distribute_status"` //下发状态 + ServiceCharge string `json:"service_charge"` //该笔下发的服务费(单位:分) + DistributeAmount string `json:"distribute_amount"` //下发金额(单位:分) + Timestamp string `json:"timestamp"` //下单时间 + Remark string `json:"remark"` //银行返回打款备注 + ReasonCode string `json:"reason_code"` //余额不足时会返回E00001 +} + type WorkerAgreeStateVO struct { StatusCode string `json:"statusCode"` StatusText string `json:"statusText"` diff --git a/api/proto/single_distribute_his/proto/single_distribute_his_op.go b/api/proto/single_distribute_his/proto/single_distribute_his_op.go new file mode 100644 index 00000000..b738a50b --- /dev/null +++ b/api/proto/single_distribute_his/proto/single_distribute_his_op.go @@ -0,0 +1,66 @@ +package proto + +import ( + "service/api/base" + "service/dbstruct" +) + +// op 创建 +type OpCreateReq struct { + base.BaseRequest + *dbstruct.SingleDistributeHis +} + +type OpCreateData struct { +} + +type OpCreateResp struct { + base.BaseResponse + Data *OpCreateData `json:"data"` +} + +// op 删除 +type OpDeleteReq struct { + base.BaseRequest + Id int64 `json:"id"` +} + +type OpDeleteData struct { +} + +type OpDeleteResp struct { + base.BaseResponse + Data *OpDeleteData `json:"data"` +} + +// op 更新 +type OpUpdateReq struct { + base.BaseRequest + *dbstruct.SingleDistributeHis +} + +type OpUpdateData struct { +} + +type OpUpdateResp struct { + base.BaseResponse + Data *OpUpdateData `json:"data"` +} + +// op 列表 +type OpListReq struct { + base.BaseRequest + Offset int `json:"offset"` + Limit int `json:"limit"` +} + +type OpListData struct { + List []*dbstruct.SingleDistributeHis `json:"list"` + Offset int `json:"offset"` + More int `json:"more"` +} + +type OpListResp struct { + base.BaseResponse + Data *OpListData `json:"data"` +} diff --git a/app/mix/controller/hvyogo_callback.go b/app/mix/controller/hvyogo_callback.go index 50bd56a5..84ba944f 100644 --- a/app/mix/controller/hvyogo_callback.go +++ b/app/mix/controller/hvyogo_callback.go @@ -17,7 +17,7 @@ func ExtAgreeCallback(ctx *gin.Context) { // 存入数据 ec := service.DefaultService.SaveAgreeCallback(ctx, req) - if ec != errcode.ErrCodeWorkerIdSrvOk { + if ec != errcode.ErrCodeHvyogoSrvOk { logger.Error("SaveAgreeCallback fail, req: %v, ec: %v", util.ToJson(req), ec) response.ReplyErrCodeMsg(ctx, ec) return @@ -25,3 +25,18 @@ func ExtAgreeCallback(ctx *gin.Context) { response.ReplyOk(ctx, nil) } + +func ExtSingleDistributeCallback(ctx *gin.Context) { + + req := ctx.MustGet("client_req").(*hvyogoproto.ExtSingleDistributeCallbackReq) + + // 存入数据 + ec := service.DefaultService.SaveSingleDistributeCallback(ctx, req) + if ec != errcode.ErrCodeHvyogoSrvOk { + logger.Error("SaveSingleDistributeCallback fail, req: %v, ec: %v", util.ToJson(req), ec) + response.ReplyErrCodeMsg(ctx, ec) + return + } + + response.ReplyOk(ctx, nil) +} diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go index a4068a0c..8db76b5b 100644 --- a/app/mix/controller/init.go +++ b/app/mix/controller/init.go @@ -317,6 +317,7 @@ func Init(r *gin.Engine) { // 慧用工 extHvyogoGroup := r.Group("/ext/hvyogo") extHvyogoGroup.POST("agree_callback", middleware.JSONParamValidator(hvyogoproto.ExtAgreeCallbackReq{}), ExtAgreeCallback) + extHvyogoGroup.POST("single_distribute_callback", middleware.JSONParamValidator(hvyogoproto.ExtSingleDistributeCallbackReq{}), ExtSingleDistributeCallback) // 验证码 opVeriCodeGroup := r.Group("/op/veri_code", PrepareOp()) @@ -539,6 +540,13 @@ func Init(r *gin.Engine) { // 空间相关每日报表 opDailyStatementZoneInfoGroup := r.Group("/op/daily_statement_zone_info", PrepareOp()) opDailyStatementZoneInfoGroup.POST("list", middleware.JSONParamValidator(daily_statement_zone_info_proto.OpListReq{}), middleware.JwtAuthenticator(), OpGetDailyStatementZoneInfoList) + + // 慧用工下发打款历史表 + // opSingleDistributeHisGroup := r.Group("/api/single_distribute_his", PrepareOp()) + // opSingleDistributeHisGroup.POST("create", middleware.JSONParamValidator(single_distribute_hisproto.OpCreateReq{}), middleware.JwtAuthenticator(), OpCreateSingleDistributeHis) + // opSingleDistributeHisGroup.POST("update", middleware.JSONParamValidator(single_distribute_hisproto.OpUpdateReq{}), middleware.JwtAuthenticator(), OpUpdateSingleDistributeHis) + // opSingleDistributeHisGroup.POST("delete", middleware.JSONParamValidator(single_distribute_hisproto.OpDeleteReq{}), middleware.JwtAuthenticator(), OpDeleteSingleDistributeHis) + // opSingleDistributeHisGroup.POST("list", middleware.JSONParamValidator(single_distribute_hisproto.OpListReq{}), middleware.JwtAuthenticator(), OpGetSingleDistributeHisList) } func ServeFile(ctx *gin.Context) { diff --git a/app/mix/controller/single_distribute_his_op.go b/app/mix/controller/single_distribute_his_op.go new file mode 100644 index 00000000..b854ee33 --- /dev/null +++ b/app/mix/controller/single_distribute_his_op.go @@ -0,0 +1,73 @@ +package controller + +import ( + "service/api/consts" + "service/api/errcode" + single_distribute_his_proto "service/api/proto/single_distribute_his/proto" + "service/app/mix/service" + "service/bizcommon/util" + "service/library/logger" + + "github.com/gin-gonic/gin" +) + +func OpCreateSingleDistributeHis(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*single_distribute_his_proto.OpCreateReq) + ec := service.DefaultService.OpCreateSingleDistributeHis(ctx, req) + if ec != errcode.ErrCodeSingleDistributeHisSrvOk { + logger.Error("OpCreateSingleDistributeHis fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrorMsg(ctx, "server error") + return + } + + ReplyOk(ctx, nil) +} + +func OpUpdateSingleDistributeHis(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*single_distribute_his_proto.OpUpdateReq) + ec := service.DefaultService.OpUpdateSingleDistributeHis(ctx, req) + if ec != errcode.ErrCodeSingleDistributeHisSrvOk { + logger.Error("OpUpdateSingleDistributeHis fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + ReplyOk(ctx, nil) +} + +func OpDeleteSingleDistributeHis(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*single_distribute_his_proto.OpDeleteReq) + ec := service.DefaultService.OpDeleteSingleDistributeHis(ctx, req.Id) + if ec != errcode.ErrCodeSingleDistributeHisSrvOk { + logger.Error("OpDeleteSingleDistributeHis fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + ReplyOk(ctx, nil) +} + +func OpGetSingleDistributeHisList(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*single_distribute_his_proto.OpListReq) + + //设置默认页长 + if req.Limit == 0 { + req.Limit = consts.DefaultPageSize + } + + list, ec := service.DefaultService.OpGetSingleDistributeHisList(ctx, req) + if ec != errcode.ErrCodeSingleDistributeHisSrvOk { + logger.Error("OpGetSingleDistributeHisList fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + data := &single_distribute_his_proto.OpListData{ + List: list, + Offset: req.Offset + len(list), + } + if len(list) >= req.Limit { + data.More = 1 + } + ReplyOk(ctx, data) +} diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go index 6ced387c..f9b62604 100644 --- a/app/mix/dao/mongo.go +++ b/app/mix/dao/mongo.go @@ -33,6 +33,7 @@ import ( moment_audit_taskproto "service/api/proto/moment_audit_task/proto" productproto "service/api/proto/product/proto" realname_authenticationproto "service/api/proto/realname_authentication/proto" + single_distribute_his_proto "service/api/proto/single_distribute_his/proto" streamerproto "service/api/proto/streamer/proto" streamerauthapprovalproto "service/api/proto/streamerauthapproval/proto" streamerlinkproto "service/api/proto/streamerlink/proto" @@ -217,6 +218,9 @@ const ( DBWorkerId = "worker_id" COLWorkerId = "worker_id" + + DBSingleDistributeHis = "single_distribute_his" + COLSingleDistributeHis = "single_distribute_his" ) // 商品表 @@ -548,6 +552,11 @@ func (m *Mongo) getColWorkerId() *qmgo.Collection { return m.clientMix.Database(DBWorkerId).Collection(COLWorkerId) } +// 慧用工下发打款历史表表 +func (m *Mongo) getColSingleDistributeHis() *qmgo.Collection { + return m.clientMix.Database(DBSingleDistributeHis).Collection(COLSingleDistributeHis) +} + // 商品相关 func (m *Mongo) CreateProduct(ctx *gin.Context, product *dbstruct.Product) error { col := m.getColProduct() @@ -5270,3 +5279,46 @@ func (m *Mongo) GetWorkerIdByMid(ctx *gin.Context, req *workeridproto.OpListByMi } return workerId, err } + +// 慧用工下发打款历史表相关 +func (m *Mongo) CreateSingleDistributeHis(ctx *gin.Context, single_distribute_his *dbstruct.SingleDistributeHis) error { + col := m.getColSingleDistributeHis() + _, err := col.InsertOne(ctx, single_distribute_his) + return err +} + +func (m *Mongo) UpdateSingleDistributeHis(ctx *gin.Context, single_distribute_his *dbstruct.SingleDistributeHis) error { + col := m.getColSingleDistributeHis() + set := util.EntityToM(single_distribute_his) + set["ut"] = time.Now().Unix() + up := qmgo.M{ + "$set": set, + } + err := col.UpdateId(ctx, single_distribute_his.GetId(), up) + return err +} + +func (m *Mongo) DeleteSingleDistributeHis(ctx *gin.Context, id int64) error { + col := m.getColSingleDistributeHis() + update := qmgo.M{ + "$set": qmgo.M{ + "del_flag": 1, + }, + } + err := col.UpdateId(ctx, id, update) + return err +} + +func (m *Mongo) GetSingleDistributeHisList(ctx *gin.Context, req *single_distribute_his_proto.OpListReq) ([]*dbstruct.SingleDistributeHis, error) { + list := make([]*dbstruct.SingleDistributeHis, 0) + col := m.getColSingleDistributeHis() + query := qmgo.M{ + "del_flag": 0, + } + err := col.Find(ctx, query).Sort("-ct").Skip(int64(req.Offset)).Limit(int64(req.Limit)).All(&list) + if err == qmgo.ErrNoSuchDocuments { + err = nil + return list, err + } + return list, err +} diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index bb2bf8c4..4b0330e1 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -18,6 +18,7 @@ import ( momentproto "service/api/proto/moment/proto" moment_audit_taskproto "service/api/proto/moment_audit_task/proto" realname_authenticationproto "service/api/proto/realname_authentication/proto" + single_distribute_his_proto "service/api/proto/single_distribute_his/proto" streamerproto "service/api/proto/streamer/proto" streameracctproto "service/api/proto/streamer_acct/proto" streamerauthapprovalproto "service/api/proto/streamerauthapproval/proto" @@ -3374,13 +3375,35 @@ func (s *Service) ApiHvyogoSingleDistribute(ctx *gin.Context, req *hvyogoproto.A msg := &request.HYG10010001Req{ HYGBaseReq: &request.HYGBaseReq{}, WorkerName: detailResp.WorkerName, + ReceiptChannel: consts.BankCard, + WorkerAccount: detailResp.BankCardNo, WorkerType: detailResp.CertificateType, IdNumber: detailResp.IdentNo, WorkerMobile: detailResp.WorkerMobile, DistributeAmount: req.DistributeAmount, } - // 5.调用下发打款接口 + // 5.若上送了别的渠道，则设置参数 + if req.ReceiptChannel != 0 { + msg.ReceiptChannel = int(req.ReceiptChannel) + msg.WorkerAccount = req.WorkerAccount + } + + // 6.写入下发历史表，将历史表id作为requestNo + singleDistributeHis := &single_distribute_his_proto.OpCreateReq{ + SingleDistributeHis: &dbstruct.SingleDistributeHis{ + Mid: goproto.Int64(req.BaseRequest.Mid), + }, + } + err = _DefaultSingleDistributeHis.OpCreate(ctx, singleDistributeHis) + if err != nil { + logger.Error("_DefaultSingleDistributeHis OpCreate fail, err: %v", err) + ec = errcode.ErrCodeSingleDistributeHisSrvFail + return + } + msg.RequestNo = singleDistributeHis.GetId() + + // 7.调用下发打款接口 resp, err := DefaultHvyogoService.SingleDistribute(msg) if err != nil { logger.Error("DefaultHvyogoService SingleDistribute fail, err: %v", err) @@ -3388,7 +3411,7 @@ func (s *Service) ApiHvyogoSingleDistribute(ctx *gin.Context, req *hvyogoproto.A return } - // 6.组装返回结果 + // 8.组装返回结果 data = &hvyogoproto.ApiSingleDistributeData{} deepcopier.Copy(resp).To(data) diff --git a/app/mix/service/hvyogoservice.go b/app/mix/service/hvyogoservice.go index 49ac2d51..f87e1b90 100644 --- a/app/mix/service/hvyogoservice.go +++ b/app/mix/service/hvyogoservice.go @@ -1,6 +1,7 @@ package service import ( + "encoding/hex" "encoding/json" "fmt" "service/api/message/request" @@ -9,6 +10,7 @@ import ( "service/library/configcenter" "service/library/logger" "service/library/mycrypto" + "strings" "time" hvyogoproto "service/api/proto/hvyogo/proto" @@ -119,12 +121,14 @@ func (s *HvyogoService) SingleDistribute(req *request.HYG10010001Req) (vo *hvyog func afterReceiving(resp []byte, vo any) (err error) { baseResponse := &response.HygBaseResponse{} + // 先将返回码和返回信息解码至vo err = json.Unmarshal(resp, vo) if err != nil { logger.Error("json Unmarshal fail, err: %v", err) return } + // 解码response，若不成功则直接返回 err = json.Unmarshal(resp, baseResponse) if err != nil { logger.Error("json Unmarshal fail, err: %v", err) @@ -133,6 +137,8 @@ func afterReceiving(resp []byte, vo any) (err error) { if baseResponse.StatusCode != response.StatusCodeSuccess { return } + + // 获取aes加密串 aesEncryptedStr, ok := baseResponse.Data.(string) if !ok { err = fmt.Errorf("type assertion fail") @@ -140,8 +146,15 @@ func afterReceiving(resp []byte, vo any) (err error) { return } - // 解码aes - bytes, err := mycrypto.CryptoServiceInstance().HygAES.Decrypt([]byte(aesEncryptedStr)) + // 十六进制解码 + encryptedStr, err := hex.DecodeString(strings.ToLower(aesEncryptedStr)) + if err != nil { + logger.Error("Decryption fail, err: %v", err) + return + } + + // aes解码 + bytes, err := mycrypto.CryptoServiceInstance().HygAES.Decrypt([]byte(encryptedStr)) if err != nil { logger.Error("Decryption fail, err: %v", err) return diff --git a/app/mix/service/logic/single_distribute_his.go b/app/mix/service/logic/single_distribute_his.go new file mode 100644 index 00000000..29292472 --- /dev/null +++ b/app/mix/service/logic/single_distribute_his.go @@ -0,0 +1,65 @@ +package logic + +import ( + "service/api/consts" + single_distribute_his_proto "service/api/proto/single_distribute_his/proto" + "service/app/mix/dao" + "service/dbstruct" + "service/library/idgenerator" + "service/library/logger" + "time" + + "github.com/gin-gonic/gin" + goproto "google.golang.org/protobuf/proto" +) + +type SingleDistributeHis struct { + store *dao.Store +} + +func NewSingleDistributeHis(store *dao.Store) (a *SingleDistributeHis) { + a = &SingleDistributeHis{ + store: store, + } + return +} + +func (p *SingleDistributeHis) OpCreate(ctx *gin.Context, req *single_distribute_his_proto.OpCreateReq) error { + req.SingleDistributeHis.Id = goproto.String(idgenerator.GenSingleDistributeHisId()) + req.SingleDistributeHis.Ct = goproto.Int64(time.Now().Unix()) + req.SingleDistributeHis.Ut = goproto.Int64(time.Now().Unix()) + req.SingleDistributeHis.DelFlag = goproto.Int64(consts.Exist) + err := p.store.CreateSingleDistributeHis(ctx, req.SingleDistributeHis) + if err != nil { + logger.Error("CreateSingleDistributeHis fail, err: %v", err) + return err + } + return nil +} + +func (p *SingleDistributeHis) OpUpdate(ctx *gin.Context, req *single_distribute_his_proto.OpUpdateReq) error { + err := p.store.UpdateSingleDistributeHis(ctx, req.SingleDistributeHis) + if err != nil { + logger.Error("UpdateSingleDistributeHis fail, err: %v", err) + return err + } + return nil +} + +func (p *SingleDistributeHis) OpDelete(ctx *gin.Context, id int64) error { + err := p.store.DeleteSingleDistributeHis(ctx, id) + if err != nil { + logger.Error("DeleteSingleDistributeHis fail, err: %v", err) + return err + } + return nil +} + +func (p *SingleDistributeHis) OpList(ctx *gin.Context, req *single_distribute_his_proto.OpListReq) ([]*dbstruct.SingleDistributeHis, error) { + list, err := p.store.GetSingleDistributeHisList(ctx, req) + if err != nil { + logger.Error("GetSingleDistributeHisList fail, err: %v", err) + return make([]*dbstruct.SingleDistributeHis, 0), err + } + return list, nil +} diff --git a/app/mix/service/service.go b/app/mix/service/service.go index ace84723..e7491a4e 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -32,6 +32,7 @@ import ( productproto "service/api/proto/product/proto" realname_authenticationproto "service/api/proto/realname_authentication/proto" resourceproto "service/api/proto/resource/proto" + single_distribute_his_proto "service/api/proto/single_distribute_his/proto" streamerproto "service/api/proto/streamer/proto" streameracctproto "service/api/proto/streamer_acct/proto" streamerauthapprovalproto "service/api/proto/streamerauthapproval/proto" @@ -136,6 +137,7 @@ var ( _DefaultContentAuditRTI *logic.ContentAuditRTI _DefaultStreamerScore *logic.StreamerScore _DefaultWorkerId *logic.WorkerId + _DefaultSingleDistributeHis *logic.SingleDistributeHis ) type Service struct { @@ -228,6 +230,7 @@ func (s *Service) Init(c any) (err error) { _DefaultContentAuditRTI = logic.NewContentAuditRTI(store) _DefaultStreamerScore = logic.NewStreamerScore(store) _DefaultWorkerId = logic.NewWorkerId(store) + _DefaultSingleDistributeHis = logic.NewSingleDistributeHis(store) _DefaultVas = logic.NewVas(store, _DefaultStreamer, _DefaultAccount, _DefaultZone, _DefaultZoneThirdPartner, _DefaultZoneCollaborator) _DefaultStreamerAcct = logic.NewStreamerAcct(store) @@ -4116,7 +4119,7 @@ func (s *Service) OpGetWorkerIdByMid(ctx *gin.Context, req *workeridproto.OpList } func (s *Service) SaveAgreeCallback(ctx *gin.Context, req *hvyogoproto.ExtAgreeCallbackReq) (ec errcode.ErrCode) { - ec = errcode.ErrCodeWorkerIdSrvOk + ec = errcode.ErrCodeHvyogoSrvOk // 解密AES bytes, err := hex.DecodeString(strings.ToLower(req.BusinessBody)) @@ -4173,3 +4176,105 @@ func (s *Service) SaveAgreeCallback(ctx *gin.Context, req *hvyogoproto.ExtAgreeC return } + +func (s *Service) SaveSingleDistributeCallback(ctx *gin.Context, req *hvyogoproto.ExtSingleDistributeCallbackReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeHvyogoSrvOk + + // 解密AES + bytes, err := hex.DecodeString(strings.ToLower(req.BusinessBody)) + if err != nil { + logger.Error("hex DecodeString fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeDecryptionInterceptFail + return + } + decryptedBytes, err := mycrypto.CryptoServiceInstance().HygAES.Decrypt(bytes) + if err != nil { + logger.Error("Decryption fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeDecryptionInterceptFail + return + } + + // 解析BusinessBody + vo := &hvyogoproto.ExtSingleDistributeCallbackVO{} + if err := json.Unmarshal(decryptedBytes, vo); err != nil { + logger.Error("Unmarshal fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAssertionFail + return + } + + // 更新数据 + err = _DefaultSingleDistributeHis.OpUpdate(ctx, &single_distribute_his_proto.OpUpdateReq{ + SingleDistributeHis: &dbstruct.SingleDistributeHis{ + Id: goproto.String(vo.RequestNo), + DistributeId: goproto.String(vo.DistributeId), + DistributeStatus: goproto.Int64(int64(vo.DistributeStatus)), + ServiceCharge: goproto.String(vo.ServiceCharge), + DistributeAmount: goproto.String(vo.DistributeAmount), + Timestamp: goproto.String(vo.Timestamp), + Remark: goproto.String(vo.Remark), + ReasonCode: goproto.String(vo.ReasonCode), + }, + }) + if err == qmgo.ErrNoSuchDocuments { + logger.Error("_DefaultSingleDistributeHis OpUpdate fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeSingleDistributeHisNotExist + return + } + if err != nil { + logger.Error("_DefaultSingleDistributeHis OpUpdate fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeSingleDistributeHisSrvFail + return + } + + return +} + +// SingleDistributeHis +func (s *Service) OpCreateSingleDistributeHis(ctx *gin.Context, req *single_distribute_his_proto.OpCreateReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeSingleDistributeHisSrvOk + err := _DefaultSingleDistributeHis.OpCreate(ctx, req) + if err != nil { + logger.Error("OpCreate fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeSingleDistributeHisSrvFail + return + } + return +} + +func (s *Service) OpUpdateSingleDistributeHis(ctx *gin.Context, req *single_distribute_his_proto.OpUpdateReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeSingleDistributeHisSrvOk + err := _DefaultSingleDistributeHis.OpUpdate(ctx, req) + if err == qmgo.ErrNoSuchDocuments { + ec = errcode.ErrCodeSingleDistributeHisNotExist + err = nil + return + } + if err != nil { + logger.Error("OpUpdate fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeSingleDistributeHisSrvFail + return + } + return +} + +func (s *Service) OpDeleteSingleDistributeHis(ctx *gin.Context, id int64) (ec errcode.ErrCode) { + ec = errcode.ErrCodeSingleDistributeHisSrvOk + err := _DefaultSingleDistributeHis.OpDelete(ctx, id) + if err != nil { + logger.Error("OpDelete fail, id: %v, err: %v", id, err) + ec = errcode.ErrCodeSingleDistributeHisSrvFail + return + } + return +} + +func (s *Service) OpGetSingleDistributeHisList(ctx *gin.Context, req *single_distribute_his_proto.OpListReq) (list []*dbstruct.SingleDistributeHis, ec errcode.ErrCode) { + ec = errcode.ErrCodeSingleDistributeHisSrvOk + list, err := _DefaultSingleDistributeHis.OpList(ctx, req) + if err != nil { + logger.Error("OpGetSingleDistributeHisList fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeSingleDistributeHisSrvFail + return + } + return +} diff --git a/codecreate/codecreate.go b/codecreate/codecreate.go index f6020657..645bf5ac 100644 --- a/codecreate/codecreate.go +++ b/codecreate/codecreate.go @@ -9,10 +9,10 @@ import ( func main() { genSource := &generator.GenSource{ - EntityName: "WorkerId", - ModuleName: "worker_id", - EntityCNName: "用户职业者id映射表", - ErrCodeSeq: "41", + EntityName: "SingleDistributeHis", + ModuleName: "single_distribute_his", + EntityCNName: "慧用工下发打款历史表", + ErrCodeSeq: "42", } generator.CreateFileDirectory(genSource) diff --git a/codecreate/resource/EntityDefine.xlsx b/codecreate/resource/EntityDefine.xlsx index e87515d0426c21777c673d85ed8ff7d6e88bd830..d65c315b957abc52bc332ce4834123c5a9c3ab4c 100644 GIT binary patch delta 9830 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 aW@7E2EC-M9pYH6hyXotTirW95v;PMfqwm20 diff --git a/dbstruct/single_distribute_his.go b/dbstruct/single_distribute_his.go new file mode 100644 index 00000000..eb79a4a6 --- /dev/null +++ b/dbstruct/single_distribute_his.go @@ -0,0 +1,23 @@ +package dbstruct + +type SingleDistributeHis struct { + Id *string `json:"id" bson:"_id"` // 慧用工下发打款历史表id + Mid *int64 `json:"mid" bson:"mid"` // 用户id + DistributeId *string `json:"distribute_id" bson:"distribute_id"` // 慧用工平台处理单号 + DistributeStatus *int64 `json:"distribute_status" bson:"distribute_status"` // 下发状态 + ServiceCharge *string `json:"service_charge" bson:"service_charge"` // 该笔下发的服务费(单位:分) + DistributeAmount *string `json:"distribute_amount" bson:"distribute_amount"` // 下发金额(单位:分) + Timestamp *string `json:"timestamp" bson:"timestamp"` // 下单时间 + Remark *string `json:"remark" bson:"remark"` // 银行返回打款备注 + ReasonCode *string `json:"reason_code" bson:"reason_code"` // 余额不足时会返回E00001 + Ct *int64 `json:"ct" bson:"ct"` // 创建时间 + Ut *int64 `json:"ut" bson:"ut"` // 更新时间 + DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记 +} + +func (p *SingleDistributeHis) GetId() string { + if p != nil && p.Id != nil { + return *p.Id + } + return "" +} diff --git a/library/idgenerator/genid.go b/library/idgenerator/genid.go index 806f8171..27100b50 100644 --- a/library/idgenerator/genid.go +++ b/library/idgenerator/genid.go @@ -54,6 +54,7 @@ const ( NodeZoneThirdPartner // node 空间代运营表 NodeDailyStatementZoneInfo // node 空间相关每日报表 NodeWorkerId // node 用户职业者id映射表 + NodeSingleDistributeHis // node 慧用工下发打款历史表 ) func GenIdInt64(node int64) (int64, error) { @@ -259,3 +260,9 @@ func GenWorkerIdId() int64 { id, _ := GenIdInt64(NodeWorkerId) return id } + +// single_distribute_his +func GenSingleDistributeHisId() string { + id, _ := GenIdString(NodeSingleDistributeHis) + return id +}