diff --git a/internal/logic/bundleExtendLogic.go b/internal/logic/bundleExtendLogic.go index 51b3de9..b259990 100644 --- a/internal/logic/bundleExtendLogic.go +++ b/internal/logic/bundleExtendLogic.go @@ -431,7 +431,8 @@ func BundleBalanceExport(req *bundle.BundleBalanceExportReq) (*bundle.BundleBala prefixItem := prefixMap[v.UserId] item := &bundle.BundleBalanceExportItem{} copier.Copy(item, v) - item.CustomerNum = prefixItem.CustomNum + item.Month = req.Month + item.CustomerNum = prefixItem.CustomerNum item.PayTime = prefixItem.PayTime item.BundleAmount = prefixItem.BundleAmount item.IncreaseAmount = prefixItem.TotalPayAmount - prefixItem.BundleAmount diff --git a/internal/model/bundle.go b/internal/model/bundle.go index 0986d9d..2a2eaf2 100644 --- a/internal/model/bundle.go +++ b/internal/model/bundle.go @@ -330,7 +330,7 @@ func (BundleUsedRecord) TableName() string { type BundleExportDto struct { UserId int32 Month string - CustomNum string + CustomerNum string Name string PayTime string BundleAmount float32 diff --git a/pb/bundle.proto b/pb/bundle.proto index 302e8b0..53ae83c 100644 --- a/pb/bundle.proto +++ b/pb/bundle.proto @@ -772,7 +772,7 @@ message BundleBalanceItem { message BundleBalanceExportItem { // 基本信息 - int32 month = 1; // 所属月份 + string month = 1; // 所属月份 string customerNum = 2; // 用户编号 string userName = 3; // 名字 string userPhoneNumber = 4; // 手机号 diff --git a/pb/bundle/bundle.pb.go b/pb/bundle/bundle.pb.go index cdac35c..07f30f4 100644 --- a/pb/bundle/bundle.pb.go +++ b/pb/bundle/bundle.pb.go @@ -6428,7 +6428,7 @@ type BundleBalanceExportItem struct { unknownFields protoimpl.UnknownFields // 基本信息 - Month int32 `protobuf:"varint,1,opt,name=month,proto3" json:"month,omitempty"` // 所属月份 + Month string `protobuf:"bytes,1,opt,name=month,proto3" json:"month,omitempty"` // 所属月份 CustomerNum string `protobuf:"bytes,2,opt,name=customerNum,proto3" json:"customerNum,omitempty"` // 用户编号 UserName string `protobuf:"bytes,3,opt,name=userName,proto3" json:"userName,omitempty"` // 名字 UserPhoneNumber string `protobuf:"bytes,4,opt,name=userPhoneNumber,proto3" json:"userPhoneNumber,omitempty"` // 手机号 @@ -6522,11 +6522,11 @@ func (*BundleBalanceExportItem) Descriptor() ([]byte, []int) { return file_pb_bundle_proto_rawDescGZIP(), []int{63} } -func (x *BundleBalanceExportItem) GetMonth() int32 { +func (x *BundleBalanceExportItem) GetMonth() string { if x != nil { return x.Month } - return 0 + return "" } func (x *BundleBalanceExportItem) GetCustomerNum() string { @@ -12080,7 +12080,7 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x8f, 0x1b, 0x0a, 0x17, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x20, 0x0a, 0x0b, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,