Merge branch 'dev-lzh' into dev

internal/logic/bundleExtendLogic.go

@@ -65,6 +65,11 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl
 		copier.Copy(result, &m)
 		loc, _ := time.LoadLocation("Asia/Shanghai")
 		t, _ := time.ParseInLocation(time.DateTime, m.ExpirationTime, loc)
+		if m.OrderUUID != "" {
+			result.Bought = 2
+		} else {
+			result.Bought = 1
+		}
 		result.ExpiredTime = t.UnixMilli()
 		return result
 	})

pb/bundle.proto

@@ -638,6 +638,7 @@ message BundleBalanceItem{
   int32 dataAnalysisNumber = 13;
   int32 dataAnalysisConsumptionNumber = 14;
   int32 expansionPacksNumber = 15;
+  int32 bought = 16;
 }
 
 message GetBundleBalanceListResp{

pb/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.24.0--rc1
+// - protoc             v3.20.3
 // source: pb/bundle.proto
 
 package bundle