fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加竞品数

Browse Source
This commit is contained in:
JNG 2026-02-03 10:18:40 +08:00
parent eee821c4cb
commit fa43fadae2
5 changed files with 64 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/dao/orderRecordsDao.go
View File

@ -607,6 +607,7 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
return nil, errors.New("invalid request") return nil, errors.New("invalid request")
} }
var addOrder []*model.BundleOrderValueAdd var addOrder []*model.BundleOrderValueAdd
var orderInfo *model.BundleOrderRecords
if err := app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}). if err := app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}).
Where("order_no = ?", req.OrderNo). Where("order_no = ?", req.OrderNo).
Find(&addOrder).Error; err != nil { Find(&addOrder).Error; err != nil {
@ -615,16 +616,22 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
if len(addOrder) == 0 { if len(addOrder) == 0 {
return &bundle.OrderInfoByOrderNoResp{}, nil return &bundle.OrderInfoByOrderNoResp{}, nil
} }
if err := app.ModuleClients.BundleDB.Model(&model.BundleOrderRecords{}).
Where("order_no = ?", req.OrderNo).
First(&orderInfo).Error; err != nil {
return nil, err
}
//订单类型 1:套餐 2:单独购买 //订单类型 1:套餐 2:单独购买
userID, err := strconv.ParseInt(addOrder[0].CustomerID, 10, 64) userID, err := strconv.ParseInt(addOrder[0].CustomerID, 10, 64)
if err != nil { if err != nil {
return nil, err return nil, err
} }
res := &bundle.OrderInfoByOrderNoResp{ res := &bundle.OrderInfoByOrderNoResp{
Type: int32(addOrder[0].Source), Type: int32(addOrder[0].Source),
UserId: uint64(userID), UserId: uint64(userID),
OrderUUID: addOrder[0].OrderUUID, OrderUUID: addOrder[0].OrderUUID,
UserName: addOrder[0].CustomerName, UserName: addOrder[0].CustomerName,
PurchaseType: int32(orderInfo.PurchaseType),
} }
for _, item := range addOrder { for _, item := range addOrder {
switch item.ServiceType { switch item.ServiceType {
@ -639,6 +646,8 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
case 5: case 5:
res.Duration += item.Num res.Duration += item.Num
res.Unit = item.Unit // 如果有多个duration记录，最后一个unit会覆盖前面的 res.Unit = item.Unit // 如果有多个duration记录，最后一个unit会覆盖前面的
case 6:
res.CompetitiveAdditional += item.Num //添加竞品数
} }
} }
return res, nil return res, nil

15
internal/logic/bundleExtendLogic.go
View File

@ -37,13 +37,14 @@ func BundleExtend(req *bundle.BundleExtendRequest) (*bundle.BundleExtendResponse
if req.Type == 1 { if req.Type == 1 {
if err := dao.ExtendBundleBalanceByUserId(model.BundleBalanceExtendPo{ if err := dao.ExtendBundleBalanceByUserId(model.BundleBalanceExtendPo{
UserId: int(req.UserId), UserId: int(req.UserId),
VideoNumber: int(req.VideoAdditional), VideoNumber: int(req.VideoAdditional),
ImageNumber: int(req.ImagesAdditional), ImageNumber: int(req.ImagesAdditional),
DataAnalysisNumber: int(req.DataAdditional), DataAnalysisNumber: int(req.DataAdditional),
AccountNumber: int(req.AccountAdditional), AccountNumber: int(req.AccountAdditional),
CompetitiveNumber: int(req.CompetitiveAdditional), CompetitiveNumber: int(req.CompetitiveAdditional),
DurationNumber: durationNumber, DurationNumber: durationNumber,
CompetitiveAdditional: int(req.CompetitiveAdditional),
}); err != nil { }); err != nil {
return nil, errors.New("用户没有余量信息") return nil, errors.New("用户没有余量信息")
} }

15
internal/model/bundle.go
View File

@ -352,13 +352,14 @@ type BundleBalanceUsePo struct {
CompetitiveNumber int CompetitiveNumber int
} }
type BundleBalanceExtendPo struct { type BundleBalanceExtendPo struct {
UserId int UserId int
AccountNumber int AccountNumber int
VideoNumber int VideoNumber int
ImageNumber int ImageNumber int
CompetitiveNumber int CompetitiveNumber int
DataAnalysisNumber int DataAnalysisNumber int
DurationNumber int DurationNumber int
CompetitiveAdditional int
} }
type BundleUsedRecord struct { type BundleUsedRecord struct {

2
pb/bundle.proto
View File

@ -196,6 +196,8 @@ message OrderInfoByOrderNoResp{
int32 duration = 8; int32 duration = 8;
string unit = 9; string unit = 9;
string userName = 10; string userName = 10;
int32 competitiveAdditional = 11;
int32 purchaseType = 12;
} }
message OrderCreateRecord{ message OrderCreateRecord{

48
pb/bundle/bundle.pb.go
View File

@ -768,19 +768,21 @@ func (x *OrderInfoByOrderNoRequest) GetOrderNo() string {
} }
type OrderInfoByOrderNoResp struct { type OrderInfoByOrderNoResp struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type"` Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type"`
UserId uint64 `protobuf:"varint,2,opt,name=userId,proto3" json:"userId"` UserId uint64 `protobuf:"varint,2,opt,name=userId,proto3" json:"userId"`
OrderUUID string `protobuf:"bytes,3,opt,name=orderUUID,proto3" json:"orderUUID"` OrderUUID string `protobuf:"bytes,3,opt,name=orderUUID,proto3" json:"orderUUID"`
AccountNumber int32 `protobuf:"varint,4,opt,name=accountNumber,proto3" json:"accountNumber"` AccountNumber int32 `protobuf:"varint,4,opt,name=accountNumber,proto3" json:"accountNumber"`
VideoNumber int32 `protobuf:"varint,5,opt,name=videoNumber,proto3" json:"videoNumber"` VideoNumber int32 `protobuf:"varint,5,opt,name=videoNumber,proto3" json:"videoNumber"`
ImageNumber int32 `protobuf:"varint,6,opt,name=imageNumber,proto3" json:"imageNumber"` ImageNumber int32 `protobuf:"varint,6,opt,name=imageNumber,proto3" json:"imageNumber"`
DataNumber int32 `protobuf:"varint,7,opt,name=dataNumber,proto3" json:"dataNumber"` DataNumber int32 `protobuf:"varint,7,opt,name=dataNumber,proto3" json:"dataNumber"`
Duration int32 `protobuf:"varint,8,opt,name=duration,proto3" json:"duration"` Duration int32 `protobuf:"varint,8,opt,name=duration,proto3" json:"duration"`
Unit string `protobuf:"bytes,9,opt,name=unit,proto3" json:"unit"` Unit string `protobuf:"bytes,9,opt,name=unit,proto3" json:"unit"`
UserName string `protobuf:"bytes,10,opt,name=userName,proto3" json:"userName"` UserName string `protobuf:"bytes,10,opt,name=userName,proto3" json:"userName"`
unknownFields protoimpl.UnknownFields CompetitiveAdditional int32 `protobuf:"varint,11,opt,name=competitiveAdditional,proto3" json:"competitiveAdditional"`
sizeCache protoimpl.SizeCache PurchaseType int32 `protobuf:"varint,12,opt,name=purchaseType,proto3" json:"purchaseType"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
} }
func (x *OrderInfoByOrderNoResp) Reset() { func (x *OrderInfoByOrderNoResp) Reset() {
@ -883,6 +885,20 @@ func (x *OrderInfoByOrderNoResp) GetUserName() string {
return "" return ""
} }
func (x *OrderInfoByOrderNoResp) GetCompetitiveAdditional() int32 {
if x != nil {
return x.CompetitiveAdditional
}
return 0
}
func (x *OrderInfoByOrderNoResp) GetPurchaseType() int32 {
if x != nil {
return x.PurchaseType
}
return 0
}
type OrderCreateRecord struct { type OrderCreateRecord struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
BundleUuid string `protobuf:"bytes,1,opt,name=bundleUuid,proto3" json:"bundleUuid"` BundleUuid string `protobuf:"bytes,1,opt,name=bundleUuid,proto3" json:"bundleUuid"`
@ -15873,7 +15889,7 @@ const file_pb_bundle_proto_rawDesc = "" +
"\vhandlingFee\x18\x0f \x01(\tR\vhandlingFee\x12\x16\n" + "\vhandlingFee\x18\x0f \x01(\tR\vhandlingFee\x12\x16\n" +
"\x06subNum\x18\x10 \x01(\tR\x06subNum\"5\n" + "\x06subNum\x18\x10 \x01(\tR\x06subNum\"5\n" +
"\x19OrderInfoByOrderNoRequest\x12\x18\n" + "\x19OrderInfoByOrderNoRequest\x12\x18\n" +
"\aorderNo\x18\x01 \x01(\tR\aorderNo\"\xb8\x02\n" + "\aorderNo\x18\x01 \x01(\tR\aorderNo\"\x92\x03\n" +
"\x16OrderInfoByOrderNoResp\x12\x12\n" + "\x16OrderInfoByOrderNoResp\x12\x12\n" +
"\x04type\x18\x01 \x01(\x05R\x04type\x12\x16\n" + "\x04type\x18\x01 \x01(\x05R\x04type\x12\x16\n" +
"\x06userId\x18\x02 \x01(\x04R\x06userId\x12\x1c\n" + "\x06userId\x18\x02 \x01(\x04R\x06userId\x12\x1c\n" +
@ -15887,7 +15903,9 @@ const file_pb_bundle_proto_rawDesc = "" +
"\bduration\x18\b \x01(\x05R\bduration\x12\x12\n" + "\bduration\x18\b \x01(\x05R\bduration\x12\x12\n" +
"\x04unit\x18\t \x01(\tR\x04unit\x12\x1a\n" + "\x04unit\x18\t \x01(\tR\x04unit\x12\x1a\n" +
"\buserName\x18\n" + "\buserName\x18\n" +
" \x01(\tR\buserName\"\xd3\x06\n" + " \x01(\tR\buserName\x124\n" +
"\x15competitiveAdditional\x18\v \x01(\x05R\x15competitiveAdditional\x12\"\n" +
"\fpurchaseType\x18\f \x01(\x05R\fpurchaseType\"\xd3\x06\n" +
"\x11OrderCreateRecord\x12\x1e\n" + "\x11OrderCreateRecord\x12\x1e\n" +
"\n" + "\n" +
"bundleUuid\x18\x01 \x01(\tR\n" + "bundleUuid\x18\x01 \x01(\tR\n" +