解决冲突

internal/dao/bundleMetrics.go

@@ -1775,7 +1775,8 @@ func ExportWorkCastInfo(req *bundle.ExportWorkCastInfoReq) (*bundle.ExportWorkCa
 			cw.work_category,
 			cw.submit_time,
 			cwl_wating.update_time AS waiting_time,
-			cwl_confirm.update_time AS confirm_time
+			cwl_confirm.update_time AS confirm_time,
+			cwe.confirm_type AS confirm_type
 		FROM bundle_balance bb
 		LEFT JOIN bundle_order_records bor 
 			ON bor.uuid = bb.order_uuid AND bor.deleted_at IS NULL

internal/dao/orderRecordsDao.go

@@ -607,6 +607,7 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
 		return nil, errors.New("invalid request")
 	}
 	var addOrder []*model.BundleOrderValueAdd
+	var orderInfo *model.BundleOrderRecords
 	if err := app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}).
 		Where("order_no = ?", req.OrderNo).
 		Find(&addOrder).Error; err != nil {
@@ -615,16 +616,22 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
 	if len(addOrder) == 0 {
 		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:单独购买
 	userID, err := strconv.ParseInt(addOrder[0].CustomerID, 10, 64)
 	if err != nil {
 		return nil, err
 	}
 	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 {
 		switch item.ServiceType {
@@ -639,6 +646,8 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
 		case 5:
 			res.Duration += item.Num
 			res.Unit = item.Unit // 如果有多个duration记录，最后一个unit会覆盖前面的
+		case 6:
+			res.CompetitiveAdditional += item.Num //添加竞品数
 		}
 	}
 	return res, nil

internal/logic/bundleExtendLogic.go

@@ -38,13 +38,14 @@ func BundleExtend(req *bundle.BundleExtendRequest) (*bundle.BundleExtendResponse
 
 	if req.Type == 1 {
 		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 {
 			return nil, errors.New("用户没有余量信息")
 		}

internal/model/bundle.go

@@ -352,13 +352,14 @@ type BundleBalanceUsePo struct {
 	CompetitiveNumber  int
 }
 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 {

pb/bundle.proto

@@ -220,6 +220,8 @@ message OrderInfoByOrderNoResp{
   int32 duration = 8;
   string unit = 9;
   string userName = 10;
+  int32 competitiveAdditional = 11;
+  int32 purchaseType = 12;
 }
 
 message OrderCreateRecord{
@@ -2251,6 +2253,7 @@ message WorkCastInfo{
   string submitTime = 8;
   string waitingTime = 9;
   string confirmTime = 10;
+  int64 confirmType = 11;
 }
 
 message ExportWorkCastInfoReq{

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.5
-// - protoc             v5.26.0
+// - protoc             v6.32.0
 // source: pb/bundle.proto
 
 package bundle