Updata:解决冲突

internal/dao/bundleExtend.go

@@ -163,7 +163,7 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (data mod
 	session := app.ModuleClients.BundleDB.Table("`micro-account`.`user` AS u").Unscoped().
 		Select(`bb.*, bor.bundle_name, bor.status,bor.amount AS payment_amount,bor.amount_type AS payment_type,bor.customer_num,
 	        bor.uuid as order_uuid, rn.name as user_name,bc.activate,bor.created_at as pay_time,
-	        u.tel_num as user_phone_number, u.id as user_id`).
+	        u.tel_num as user_phone_number, u.id as user_id,bor.renewal_order_uuid,bor.purchase_type`).
 		Joins("LEFT JOIN `micro-account`.real_name rn ON u.real_name_id = rn.id").
 		Joins("LEFT JOIN (?) as bor ON bor.customer_id = u.id", subQuery).
 		Joins("LEFT JOIN bundle_balance bb ON u.id = bb.user_id AND bb.order_uuid = bor.uuid").

internal/logic/bundleExtendLogic.go

@@ -223,11 +223,23 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.
 	} else {
 		IsExpired = msg.NotExpired //未过期
 	}
+	var payTime time.Time
+	if data.PayTime != "" {
+		loc, _ := time.LoadLocation("Asia/Shanghai")
+		// 按实际格式选一种，或两种都支持
+		if t, err := time.ParseInLocation("2006-01-02 15:04:05", data.PayTime, loc); err == nil {
+			payTime = t
+		} else if t, err := time.ParseInLocation("20060102 15:04:05", data.PayTime, loc); err == nil {
+			payTime = t
+		}
+		// 若解析失败，payTime 为零值
+	}
 	result := &bundle.GetBundleBalanceByUserIdResp{
 		OrderUUID:                           data.OrderUUID,
 		BundleName:                          data.BundleName,
 		BundleStatus:                        IsExpired,
-		PayTime:                             data.StartAt.UnixMilli(),
+		PayTime:                             payTime.UnixMilli(),
+		StartTime:                           data.StartAt.UnixMilli(),
 		ExpiredTime:                         data.ExpiredAt.UnixMilli(),
 		PaymentAmount:                       data.PaymentAmount,
 		PaymentType:                         data.PaymentType,
@@ -255,6 +267,8 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.
 		CompetitiveExtendConsumptionNumber:  int32(data.MonthlyBundleLimitCompetitiveConsumptionNumber) + int32(data.MonthlyIncreaseLimitCompetitiveConsumptionNumber) + int32(data.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber) + int32(data.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber) + int32(data.ManualCompetitiveConsumptionNumber) + int32(data.IncreaseCompetitiveConsumptionNumber) + int32(data.BundleCompetitiveConsumptionNumber),
 		CompetitiveAdditional:               int32(data.ManualCompetitiveNumber),
 		CompetitiveConsumptionNumber:        int32(data.BundleCompetitiveConsumptionNumber) + int32(data.BundleLimitCompetitiveConsumptionNumber) + int32(data.BundleLimitCompetitiveExpiredConsumptionNumber) + int32(data.IncreaseCompetitiveConsumptionNumber) + int32(data.IncreaseLimitCompetitiveConsumptionNumber) + int32(data.IncreaseLimitCompetitiveExpiredConsumptionNumber) + int32(data.ManualCompetitiveConsumptionNumber),
+		PurchaseType:                        int64(data.PurchaseType),
+		RenewalOrderUuid:                    data.RenewalOrderUUID,
 	}
 	return result, nil
 }

internal/model/bundle.go

@@ -159,15 +159,17 @@ type BundleBalancePo struct {
 }
 
 type UserBundleBalancePo struct {
-	OrderUUID     string `json:"orderUUID" gorm:"column:order_uuid"`
+	OrderUUID        string `json:"orderUUID" gorm:"column:order_uuid"`
-	BundleUuid    string `json:"bundleUuid" gorm:"column:bundle_uuid"`
+	BundleUuid       string `json:"bundleUuid" gorm:"column:bundle_uuid"`
-	BundleName    string `json:"bundleName" gorm:"column:bundle_name"`
+	BundleName       string `json:"bundleName" gorm:"column:bundle_name"`
-	BundleStatus  string `json:"bundleStatus" gorm:"column:bundle_status"`
+	BundleStatus     string `json:"bundleStatus" gorm:"column:bundle_status"`
-	PayTime       string `json:"payTime" gorm:"column:pay_time"`
+	PayTime          string `json:"payTime" gorm:"column:pay_time"`
-	ExpiredTime   string `json:"expiredTime" gorm:"column:expired_time"`
+	ExpiredTime      string `json:"expiredTime" gorm:"column:expired_time"`
-	PaymentAmount string `json:"paymentAmount" gorm:"column:payment_amount"`
+	PaymentAmount    string `json:"paymentAmount" gorm:"column:payment_amount"`
-	PaymentType   int32  `json:"paymentType" gorm:"column:payment_type"`
+	PaymentType      int32  `json:"paymentType" gorm:"column:payment_type"`
-	Activate      int    `gorm:"column:activate"`
+	Activate         int    `gorm:"column:activate"`
+	RenewalOrderUUID string `gorm:"column:renewal_order_uuid;type:varchar(1024);comment:续费订单UUID" json:"renewalOrderUUID"`
+	PurchaseType     uint64 `gorm:"column:purchase_type;type:bigint;comment:购买类型 1:新购 2:续费" json:"purchaseType"`
 	BundleBalance
 }
 

pb/bundle.proto

@@ -1164,34 +1164,37 @@ message GetBundleBalanceByUserIdResp{
   string bundleName = 3;     // 套餐名称
   int32 bundleStatus = 4;     // 套餐状态是否过期 1 是 0 否
   int64 payTime = 5;
-  int64 expiredTime = 6;
+  int64 startTime = 6;
-  string paymentAmount = 7;
+  int64 expiredTime = 7;
-  int32 paymentType = 8;
+  string paymentAmount = 8;
-  int32 accountNumber = 9;
+  int32 paymentType = 9;
-  int32 accountExtendNumber = 10;      
+  int32 accountNumber = 10;
-  int32 accountAdditional = 11;      
+  int32 accountExtendNumber = 11;      
-  int32 accountConsumptionNumber = 12;  
+  int32 accountAdditional = 12;      
-  int32 videoNumber = 13;
+  int32 accountConsumptionNumber = 13;  
-  int32 videoExtendNumber = 14;
+  int32 videoNumber = 14;
-  int32 videoExtendConsumptionNumber = 15;
+  int32 videoExtendNumber = 15;
-  int32 videoAdditional = 16;                 
+  int32 videoExtendConsumptionNumber = 16;
-  int32 videoConsumptionNumber = 17;       
+  int32 videoAdditional = 17;                 
-  int32 imageNumber = 18;      
+  int32 videoConsumptionNumber = 18;       
-  int32 imageExtendNumber = 19;
+  int32 imageNumber = 19;      
-  int32 imageExtendConsumptionNumber = 20;
+  int32 imageExtendNumber = 20;
-  int32 imageAdditional = 21;                 
+  int32 imageExtendConsumptionNumber = 21;
-  int32 imageConsumptionNumber = 22; 
+  int32 imageAdditional = 22;                 
-  int32 dataAnalysisNumber = 23;
+  int32 imageConsumptionNumber = 23; 
-  int32 dataAnalysisExtendNumber = 24;
+  int32 dataAnalysisNumber = 24;
-  int32 dataAnalysisExtendConsumptionNumber = 25;
+  int32 dataAnalysisExtendNumber = 25;
-  int32 dataAnalysisAdditional = 26;
+  int32 dataAnalysisExtendConsumptionNumber = 26;
-  int32 dataAnalysisConsumptionNumber = 27;
+  int32 dataAnalysisAdditional = 27;
-  int32 competitiveNumber = 28;
+  int32 dataAnalysisConsumptionNumber = 28;
-  int32 competitiveExtendNumber = 29;
+  int32 competitiveNumber = 29;
-  int32 competitiveExtendConsumptionNumber = 30;
+  int32 competitiveExtendNumber = 30;
-  int32 competitiveAdditional = 31;
+  int32 competitiveExtendConsumptionNumber = 31;
-  int32 competitiveConsumptionNumber = 32;
+  int32 competitiveAdditional = 32;
-  int32 expansionPacksNumber = 33;  
+  int32 competitiveConsumptionNumber = 33;
+  int32 expansionPacksNumber = 34;
+  int64 purchaseType = 35;
+  string renewalOrderUuid = 36;
 }
 
 message OnlyAddValueListByOrderNoRequest{

pb/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/mwitkow/go-proto-validators"
 	_ "google.golang.org/protobuf/types/descriptorpb"
+	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )