internal/dao/orderRecordsDao.go

@@ -280,21 +280,18 @@ func OrderRecordDetail(req *bundle.OrderRecordsDetailRequest) (res *bundle.Order
 	//_ = copier.CopyWithOption(&res, orderRecord, copier.Option{DeepCopy: true})
 
 	addBundles := make([]model.BundleOrderValueAdd, 0)
+	err = app.ModuleClients.BundleDB.Model(model.BundleOrderValueAdd{}).Where("deleted_at is null and source = 1 and order_no = ?", req.OrderNo).Find(&addBundles).Error
+	if err != nil {
+		return res, commonErr.ReturnError(err, "增值订单信息", "获取增值订单信息失败: ")
+	}
 	addInfos := make([]*bundle.AddInfo, 0)
-	if req.OrderNo == "" {
+	for _, addBundle := range addBundles {
-		req.OrderNo = orderRecord.OrderNo
+		addInfo := &bundle.AddInfo{
-		err = app.ModuleClients.BundleDB.Model(model.BundleOrderValueAdd{}).Where("deleted_at is null and source = 1 and order_no = ?", req.OrderNo).Find(&addBundles).Error
+			OrderNo:      addBundle.OrderNo,
-		if err != nil {
+			Num:          addBundle.Num,
-			return res, commonErr.ReturnError(err, "增值订单信息", "获取增值订单信息失败: ")
+			ValueAddUUID: addBundle.ValueAddUUID,
-		}
-		for _, addBundle := range addBundles {
-			addInfo := &bundle.AddInfo{
-				OrderNo:      addBundle.OrderNo,
-				Num:          addBundle.Num,
-				ValueAddUUID: addBundle.ValueAddUUID,
-			}
-			addInfos = append(addInfos, addInfo)
 		}
+		addInfos = append(addInfos, addInfo)
 	}
 
 	res = &bundle.OrderRecord{